From 329e5525e3f7096e6c063aa38043d8d737d72b8c Mon Sep 17 00:00:00 2001 From: stubbfel Date: Mon, 30 Sep 2013 11:01:57 +0200 Subject: [PATCH 01/22] fix #205 --- CampusAppWP8/CampusAppWP8/App.xaml.cs | 9 ++++++++- .../CampusAppWP8/Model/Setting/AppSettings.cs | 15 +++++++++++++++ .../CampusAppWP8/Pages/StartPage.xaml.cs | 7 +++++++ .../CampusAppWP8/Resources/Constants.resx | 6 ++++++ .../Resources/Constants1.Designer.cs | 18 ++++++++++++++++++ 5 files changed, 54 insertions(+), 1 deletion(-) diff --git a/CampusAppWP8/CampusAppWP8/App.xaml.cs b/CampusAppWP8/CampusAppWP8/App.xaml.cs index 23949af1..81f3a560 100644 --- a/CampusAppWP8/CampusAppWP8/App.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/App.xaml.cs @@ -147,7 +147,14 @@ namespace CampusAppWP8 } else { - Settings.AppSetting.DevMode = true; + Settings.AppSetting.DevMode = false; + } + + int appDeploy; + bool parseResult = int.TryParse(Constants.DeploymentNumber, out appDeploy); + if (!parseResult || Settings.AppSetting.DeploymentNumber != appDeploy) + { + Settings.AppSetting.InitApp = false; } this.UserSettingsLoaded(); diff --git a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs index d12e961a..235a0508 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs @@ -109,6 +109,21 @@ namespace CampusAppWP8.Model.Setting } } + /// + /// Gets or sets the DeploymentNumber of the app + /// + public int DeploymentNumber + { + get + { + return App.LoadFromAppState(Constants.AppSetting_DeploymentNumber); + } + set + { + App.SaveToAppState(Constants.AppSetting_DeploymentNumber,value); + } + } + #endregion } } \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs index 9f58635d..fb4dfb53 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs @@ -83,6 +83,13 @@ namespace CampusAppWP8.Pages this.initCourseList.LoadData(); this.ShowOptIns(); Settings.AppSetting.InitApp = true; + + int appDeploy; + bool parseResult = int.TryParse(Constants.DeploymentNumber, out appDeploy); + if (parseResult) + { + Settings.AppSetting.DeploymentNumber = appDeploy; + } } } diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index da484cb4..addf67af 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -552,4 +552,10 @@ SearchPin + + DeploymentNumber + + + 2 + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs index 2ed1f9a6..00e4ee3e 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs @@ -105,6 +105,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die DeploymentNumber ähnelt. + /// + public static string AppSetting_DeploymentNumber { + get { + return ResourceManager.GetString("AppSetting_DeploymentNumber", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die DevMode ähnelt. /// @@ -186,6 +195,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die 2 ähnelt. + /// + public static string DeploymentNumber { + get { + return ResourceManager.GetString("DeploymentNumber", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die +49 ähnelt. /// From c89fb9ab79c09f2bf32e2086ff7120088c38213f Mon Sep 17 00:00:00 2001 From: stubbfel Date: Mon, 30 Sep 2013 11:41:41 +0200 Subject: [PATCH 02/22] refactor backgroundagent --- .../CampusAppWP8/Utility/BackgroundTasks.cs | 43 ++-------- .../Utility/Lui/Tiles/TileCreator.cs | 6 +- .../Resources/AppResources.Designer.cs | 24 +----- .../Resources/AppResources.resx | 10 +-- .../Resources/Constants.resx | 10 +-- .../Resources/Constants1.Designer.cs | 24 +----- .../ScheduledAgent.cs | 86 +++++++++++++------ 7 files changed, 77 insertions(+), 126 deletions(-) diff --git a/CampusAppWP8/CampusAppWP8/Utility/BackgroundTasks.cs b/CampusAppWP8/CampusAppWP8/Utility/BackgroundTasks.cs index 76acf9d1..753d7939 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/BackgroundTasks.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/BackgroundTasks.cs @@ -74,52 +74,21 @@ namespace CampusAppWP8.Utility } /// - /// Method start MensaBackgroundTask + /// Method start BTUCampusAppBackgroundTask /// - public static void StartMensaTask() + public static void StartBTUCampusAppTask() { int campusId = (int)Settings.UserProfil.DefaultCampus; - BackgroundTasks.StartPerodicTask(Constants.BackgroundTask_Mensa, AppResources.BackGroundTaskDesc_Mensa + " - Feed " + campusId); + BackgroundTasks.StartPerodicTask(Constants.BackgroundTask_BTUCampusApp, AppResources.BackGroundTaskDesc_BTUCampusApp + " - Feed " + campusId); } /// - /// Method stop MensaBackgroundTask + /// Method stop BTUCampusAppBackgroundTask /// - public static void StopMensaTask() + public static void StopBTUCampusAppTask() { - BackgroundTasks.StopPerodicTask(Constants.BackgroundTask_Mensa); + BackgroundTasks.StopPerodicTask(Constants.BackgroundTask_BTUCampusApp); } - /// - /// Method start EventBackgroundTask - /// - public static void StartEventTask() - { - BackgroundTasks.StartPerodicTask(Constants.BackgroundTask_Event, AppResources.BackGroundTaskDesc_Event); - } - - /// - /// Method stop EventBackgroundTask - /// - public static void StopEventTask() - { - BackgroundTasks.StopPerodicTask(Constants.BackgroundTask_Event); - } - - /// - /// Method start NewsBackgroundTask - /// - public static void StartNewsTask() - { - BackgroundTasks.StartPerodicTask(Constants.BackgroundTask_News, AppResources.BackGroundTaskDesc_News); - } - - /// - /// Method stop NewsBackgroundTask - /// - public static void StopNewsTask() - { - BackgroundTasks.StopPerodicTask(Constants.BackgroundTask_News); - } } } diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Tiles/TileCreator.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Tiles/TileCreator.cs index f393a002..9bc7c76a 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Lui/Tiles/TileCreator.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Tiles/TileCreator.cs @@ -58,7 +58,7 @@ namespace CampusAppWP8.Utility.Lui.Tiles TileCreator.CreateIconicTile(AppResources.MensaApp_Title, Constants.PathMensa_MensaPage, Icons.Mensa, Icons.Mensa); // create a new task - BackgroundTasks.StartMensaTask(); + BackgroundTasks.StartBTUCampusAppTask(); } /// @@ -77,7 +77,7 @@ namespace CampusAppWP8.Utility.Lui.Tiles TileCreator.CreateIconicTile(AppResources.NewsApp_Title, Constants.PathNews_NewsIndexPage, Icons.News, Icons.News); // create a new Task - BackgroundTasks.StartNewsTask(); + BackgroundTasks.StartBTUCampusAppTask(); } /// @@ -96,7 +96,7 @@ namespace CampusAppWP8.Utility.Lui.Tiles TileCreator.CreateIconicTile(AppResources.EventApp_Title, Constants.PathEvents_EventsIndexPage, Icons.News, Icons.News); // create a new taskk - BackgroundTasks.StartEventTask(); + BackgroundTasks.StartBTUCampusAppTask(); } /// diff --git a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.Designer.cs index e4e6fcca..80a45cb2 100644 --- a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.Designer.cs @@ -61,29 +61,11 @@ namespace CampusAppWP8ScheduledTaskAgent.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die Hintergrunddienst für die BTU-Event-Feed ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die Hintergrunddienst für die BTU-CampusApp ähnelt. /// - public static string BackGroundTaskDesc_Event { + public static string BackGroundTaskDesc_BTUCampusApp { get { - return ResourceManager.GetString("BackGroundTaskDesc_Event", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Hintergrunddienst für die BTU-Mensa ähnelt. - /// - public static string BackGroundTaskDesc_Mensa { - get { - return ResourceManager.GetString("BackGroundTaskDesc_Mensa", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Hintergrunddienst für die BTU-News-Feed ähnelt. - /// - public static string BackGroundTaskDesc_News { - get { - return ResourceManager.GetString("BackGroundTaskDesc_News", resourceCulture); + return ResourceManager.GetString("BackGroundTaskDesc_BTUCampusApp", resourceCulture); } } diff --git a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.resx index eeaa3432..2a55cf88 100644 --- a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.resx @@ -117,14 +117,8 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Hintergrunddienst für die BTU-Mensa - - - Hintergrunddienst für die BTU-Event-Feed - - - Hintergrunddienst für die BTU-News-Feed + + Hintergrunddienst für die BTU-CampusApp Die Mensa ist heute geschlossen diff --git a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/Constants.resx index e71129ca..e360d985 100644 --- a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/Constants.resx @@ -117,13 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - MensaTask - - - EventTask - - - NewsTask + + BTUCampusAppTask \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/Constants1.Designer.cs index e475252a..5935bc3a 100644 --- a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/Constants1.Designer.cs +++ b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/Constants1.Designer.cs @@ -61,29 +61,11 @@ namespace CampusAppWP8ScheduledTaskAgent.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die EventTask ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die BTUCampusAppTask ähnelt. /// - public static string BackgroundTask_Event { + public static string BackgroundTask_BTUCampusApp { get { - return ResourceManager.GetString("BackgroundTask_Event", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die MensaTask ähnelt. - /// - public static string BackgroundTask_Mensa { - get { - return ResourceManager.GetString("BackgroundTask_Mensa", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die NewsTask ähnelt. - /// - public static string BackgroundTask_News { - get { - return ResourceManager.GetString("BackgroundTask_News", resourceCulture); + return ResourceManager.GetString("BackgroundTask_BTUCampusApp", resourceCulture); } } } diff --git a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/ScheduledAgent.cs b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/ScheduledAgent.cs index 597e72cb..08d3aecd 100644 --- a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/ScheduledAgent.cs +++ b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/ScheduledAgent.cs @@ -43,6 +43,11 @@ namespace CampusAppWP8ScheduledTaskAgent /// private RSSViewModel newsModel; + /// + /// Variable for the runnig feeds + /// + private int runningFeeds; + #endregion #region Constructor @@ -70,19 +75,44 @@ namespace CampusAppWP8ScheduledTaskAgent /// the background Task protected override void OnInvoke(ScheduledTask task) { - switch (task.Name) + int notRunningFeeds = 0; + this.runningFeeds = 0; + ShellTile tileToFind = ShellTile.ActiveTiles.FirstOrDefault(x => x.NavigationUri.ToString().Contains(CampusAppWPortalLib8.Resources.Constants.PathNews_NewsIndexPage)); + if (tileToFind != null && tileToFind.NavigationUri.ToString().Contains(CampusAppWPortalLib8.Resources.Constants.PathNews_NewsIndexPage)) { - case "MensaTask": - this.HandleMensaTask(task); - break; + this.runningFeeds++; + this.HandleNewsTask(task); + } + else + { + notRunningFeeds++; + } - case "EventTask": - this.HandleEventTask(task); - break; + tileToFind = ShellTile.ActiveTiles.FirstOrDefault(x => x.NavigationUri.ToString().Contains(CampusAppWPortalLib8.Resources.Constants.PathMensa_MensaPage)); + if (tileToFind != null && tileToFind.NavigationUri.ToString().Contains(CampusAppWPortalLib8.Resources.Constants.PathMensa_MensaPage)) + { + this.runningFeeds++; + this.HandleMensaTask(task); + } + else + { + notRunningFeeds++; + } - case "NewsTask": - this.HandleNewsTask(task); - break; + tileToFind = ShellTile.ActiveTiles.FirstOrDefault(x => x.NavigationUri.ToString().Contains(CampusAppWPortalLib8.Resources.Constants.PathEvents_EventsIndexPage)); + if (tileToFind != null && tileToFind.NavigationUri.ToString().Contains(CampusAppWPortalLib8.Resources.Constants.PathEvents_EventsIndexPage)) + { + this.runningFeeds++; + this.HandleEventTask(task); + } + else + { + notRunningFeeds++; + } + + if (notRunningFeeds == 3) + { + BackgroundTasks.StopPerodicTask(Constants.BackgroundTask_BTUCampusApp); } } @@ -183,15 +213,15 @@ namespace CampusAppWP8ScheduledTaskAgent data.WideContent1 = item.Date; data.WideContent2 = DefaultStringManager.ToShortString(item.Title, 40, "..."); data.WideContent3 = DefaultStringManager.ToShortString(item.Text, 40, "..."); - data.Count = this.newsModel.Channel[0].Item.Count; + //data.Count = this.newsModel.Channel[0].Item.Count; tileToFind.Update(data); - } - else - { - BackgroundTasks.StopPerodicTask(Constants.BackgroundTask_News); + this.runningFeeds--; } - this.NotifyComplete(); + if (this.runningFeeds == 0) + { + this.NotifyComplete(); + } } /// @@ -210,15 +240,15 @@ namespace CampusAppWP8ScheduledTaskAgent data.WideContent1 = item.Date; data.WideContent2 = DefaultStringManager.ToShortString(item.Title, 40, "..."); data.WideContent3 = DefaultStringManager.ToShortString(item.Text, 40, "..."); - data.Count = this.eventModel.Channel[0].Item.Count; + //data.Count = this.eventModel.Channel[0].Item.Count; tileToFind.Update(data); - } - else - { - BackgroundTasks.StopPerodicTask(Constants.BackgroundTask_Event); + this.runningFeeds--; } - this.NotifyComplete(); + if (this.runningFeeds == 0) + { + this.NotifyComplete(); + } } /// @@ -318,18 +348,18 @@ namespace CampusAppWP8ScheduledTaskAgent int randomNumber = random.Next(0, mealCount); MealModel meal = this.mensaModel.Menus[dayIndex].Meals[randomNumber]; data.WideContent3 = meal.MealName + ": " + DefaultStringManager.ToShortString(meal.MealDesc, 30, "..."); - data.Count = this.mensaModel.Menus[dayIndex].Meals.Count; + // data.Count = this.mensaModel.Menus[dayIndex].Meals.Count; } } tileToFind.Update(data); - } - else - { - BackgroundTasks.StopPerodicTask(Constants.BackgroundTask_Mensa); + this.runningFeeds--; } - this.NotifyComplete(); + if (this.runningFeeds == 0) + { + this.NotifyComplete(); + } } /// From 93c9bbe5d12853236e3f88949864714dfac85c62 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Mon, 30 Sep 2013 13:43:58 +0200 Subject: [PATCH 03/22] new offlinemap --- .../File/Campusmap/Offlinemap.xml | 273 ++++++------------ .../CampusAppWP8/Resources/Constants.resx | 2 +- .../Resources/Constants1.Designer.cs | 2 +- 3 files changed, 93 insertions(+), 184 deletions(-) diff --git a/CampusAppWP8/CampusAppWP8/File/Campusmap/Offlinemap.xml b/CampusAppWP8/CampusAppWP8/File/Campusmap/Offlinemap.xml index 54f09f09..9fdfdded 100644 --- a/CampusAppWP8/CampusAppWP8/File/Campusmap/Offlinemap.xml +++ b/CampusAppWP8/CampusAppWP8/File/Campusmap/Offlinemap.xml @@ -506,50 +506,50 @@ Limitierter Zugang Erdgeschoss - MZG Eingang - Haupteingang + Haupteingang + MZG Eingang Zugangsbereich Kein Zugang Erdgeschoss - MZG Eingang - Nebeneingang + Nebeneingang + MZG Eingang Zugangsbereich Kein Zugang Erdgeschoss - MZG Eingang - Nebeneingang + Nebeneingang + MZG Eingang Zugangsbereich Kein Zugang Erdgeschoss - MZG Eingang - Nebeneingang + Nebeneingang + MZG Eingang Zugangsbereich Voller Zugang Erdgeschoss - MZG Aufzug - Aufzug + Aufzug + MZG Aufzug Zugangsbereich Kein Zugang Erdgeschoss - MZG Treppe - Treppe + Treppe + MZG Treppe Zugangsbereich Kein Zugang Erdgeschoss - MZG Treppe - Treppe + Treppe + MZG Treppe Zugangsbereich @@ -583,8 +583,8 @@ Voller Zugang Erdgeschoss - MZG R.105 - Sekretariat + Sekretariat + MZG R.105 Büro @@ -597,43 +597,43 @@ Voller Zugang Erdgeschoss - MZG R.107 - Labor SDB + Labor SDB + MZG R.107 Labor Voller Zugang Erdgeschoss - MZG R.108 - Labor SDB + Labor SDB + MZG R.108 Labor Voller Zugang Erdgeschoss - MZG R.109 - Labor SDB + Labor SDB + MZG R.109 Labor Voller Zugang Erdgeschoss - MZG R.110 - Labor SDB + Labor SDB + MZG R.110 Labor Voller Zugang Erdgeschoss - MZG R.111 - Labor SDB + Labor SDB + MZG R.111 Labor Voller Zugang Erdgeschoss - MZG R.112 - Labor SDB + Labor SDB + MZG R.112 Labor @@ -709,78 +709,78 @@ Voller Zugang Erdgeschoss - MZG R.125 - PC - Labor + PC - Labor + MZG R.125 Labor Voller Zugang Erdgeschoss - MZG R.126 - PC - Labor + PC - Labor + MZG R.126 Labor Voller Zugang Erdgeschoss - MZG R.128 - PC - Labor + PC - Labor + MZG R.128 Labor Voller Zugang Erdgeschoss - MZG R.130 - PC - Labor + PC - Labor + MZG R.130 Labor Voller Zugang Erdgeschoss - MZG R.133 - Herrentoilette + Herrentoilette + MZG R.133 WC Voller Zugang Erdgeschoss - MZG R.134 - CO2 - Labor + CO2 - Labor + MZG R.134 Labor Voller Zugang Erdgeschoss - MZG R.135 - Schulungsraum + Schulungsraum + MZG R.135 Büro Limitierter Zugang Erdgeschoss - MZG R.137 - Herrentoilette + Herrentoilette + MZG R.137 WC Voller Zugang Erdgeschoss - MZG R.138 - Aufenthaltsraum + Aufenthaltsraum + MZG R.138 Mehrzweck Limitierter Zugang Erdgeschoss - MZG R.139 - Damentoilette + Damentoilette + MZG R.139 WC Voller Zugang Erdgeschoss - MZG R.140 - PC - Labor + PC - Labor + MZG R.140 Labor @@ -793,22 +793,22 @@ Voller Zugang Obergeschoss - MZG Aufzug - Aufzug + Aufzug + MZG Aufzug Zugangsbereich Kein Zugang Obergeschoss - MZG Treppe - Treppe + Treppe + MZG Treppe Zugangsbereich Kein Zugang Obergeschoss - MZG Treppe - Treppe + Treppe + MZG Treppe Zugangsbereich @@ -947,8 +947,8 @@ Voller Zugang Obergeschoss - MZG R.222 - Seminarraum + Seminarraum + MZG R.222 Büro @@ -961,8 +961,8 @@ Voller Zugang Obergeschoss - MZG R.224 - Sekretariat + Sekretariat + MZG R.224 Büro @@ -982,82 +982,82 @@ Voller Zugang Obergeschoss - MZG R.227 - PC - Labor + PC - Labor + MZG R.227 Labor Voller Zugang Obergeschoss - MZG R.228 - PC - Labor + PC - Labor + MZG R.228 Labor Voller Zugang Obergeschoss - MZG R.231 - Archiv + Archiv + MZG R.231 Mehrzweck Voller Zugang Obergeschoss - MZG R.233 - Drohnenlabor + Drohnenlabor + MZG R.233 Labor Limitierter Zugang Obergeschoss - MZG R.235 - Herrentoilette + Herrentoilette + MZG R.235 WC Voller Zugang Obergeschoss - MZG R.236 - Aufenthaltsraum + Aufenthaltsraum + MZG R.236 Mehrzweck Voller Zugang Obergeschoss - MZG R.237 - Aufenthaltsraum + Aufenthaltsraum + MZG R.237 Mehrzweck Voller Zugang Obergeschoss - MZG R.238 + MZG R.238 Mehrzweck Voller Zugang Obergeschoss - MZG R.239 + MZG R.239 Mehrzweck Voller Zugang Obergeschoss - MZG R.240 + MZG R.240 Mehrzweck Limitierter Zugang Obergeschoss - MZG R.241 - Herrentoilette + Herrentoilette + MZG R.241 WC Limitierter Zugang Obergeschoss - MZG R.243 - Damentoilette + Damentoilette + MZG R.243 WC @@ -1631,97 +1631,6 @@ Treppe Treppe - - Voller Zugang - 6. Obergeschoss - Carrels - Carrels - Arbeitsplatz - - - Limitierter Zugang - 6. Obergeschoss - Mediathek - Mediathek - Regal - - - Limitierter Zugang - 6. Obergeschoss - Lehrbuchsammlung - Lehrbuchsammlung - Regal - - - Voller Zugang - 6. Obergeschoss - Medienarbeitsplatz, PC Fernsehaufzeichnungen - Medienarbeitsplatz, PC Fernsehaufzeichnungen - Arbeitsplatz - - - Voller Zugang - 6. Obergeschoss - Publikationsarbeitsplatz, sehbehindertengerechter Arbeitsplatz - Publikationsarbeitsplatz, sehbehindertengerechter Arbeitsplatz - Arbeitsplatz - - - Voller Zugang - 6. Obergeschoss - Carrels - Carrels - Arbeitsplatz - - - Limitierter Zugang - 6. Obergeschoss - Bücherregal - Informatik und Kybernetik - Regal - - - Limitierter Zugang - 6. Obergeschoss - Helpdesk - Helpdesk - Information - - - Limitierter Zugang - 6. Obergeschoss - Bücherregal - Optimierung und Stochastik - Regal - - - Limitierter Zugang - 6. Obergeschoss - Zeitschriftenregal - Zeitschriften - Regal - - - Voller Zugang - 6. Obergeschoss - Lesesaal - Lesesaal - Arbeitsplatz - - - Limitierter Zugang - 6. Obergeschoss - Bücherregal - Mathematik - Regal - - - Voller Zugang - 6. Obergeschoss - Fachreferenten - Fachreferenten - Arbeitsplatz - Voller Zugang Erdgeschoss @@ -1739,29 +1648,29 @@ Voller Zugang Erdgeschoss - MZG R.108a - Labor SDB + Labor SDB + MZG R.108a Labor Voller Zugang Erdgeschoss - MZG R.125a - PC - Labor + PC - Labor + MZG R.125a Labor Voller Zugang Erdgeschoss - MZG R.134a - CO2 - Labor + CO2 - Labor + MZG R.134a Labor Voller Zugang Erdgeschoss - MZG R.135a - Technik/ Lager + Technik/ Lager + MZG R.135a Mehrzweck @@ -1774,8 +1683,8 @@ Voller Zugang Obergeschoss - MZG R.242e - Aufenthaltsraum + Aufenthaltsraum + MZG R.242e Mehrzweck diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index addf67af..bf923fb5 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -556,6 +556,6 @@ DeploymentNumber - 2 + 3 \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs index 00e4ee3e..8c29d5cb 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs @@ -196,7 +196,7 @@ namespace CampusAppWP8.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die 2 ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die 3 ähnelt. /// public static string DeploymentNumber { get { From ffa91ee8fdada1db7e1d3e68f6bd2243b80c6f56 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Mon, 30 Sep 2013 15:21:37 +0200 Subject: [PATCH 04/22] add icons --- .../Assets/Icons/DarkTheme/carotte_159.png | Bin 0 -> 3589 bytes .../Assets/Icons/DarkTheme/chicken_159.png | Bin 0 -> 2563 bytes .../Assets/Icons/DarkTheme/fish_159.png | Bin 0 -> 2074 bytes .../Assets/Icons/DarkTheme/frei_159.png | Bin 0 -> 1891 bytes .../Assets/Icons/DarkTheme/lamb_159.png | Bin 0 -> 1974 bytes .../Assets/Icons/DarkTheme/pork_159.png | Bin 0 -> 2448 bytes .../Assets/Icons/DarkTheme/steak_159.png | Bin 0 -> 2921 bytes .../Assets/Icons/DarkTheme/wild dish_159.png | Bin 0 -> 2848 bytes .../Assets/Icons/LightTheme/carotte_159.png | Bin 0 -> 3268 bytes .../Assets/Icons/LightTheme/chicken_159.png | Bin 0 -> 2146 bytes .../Assets/Icons/LightTheme/fish_159.png | Bin 0 -> 1845 bytes .../Assets/Icons/LightTheme/frei_159.png | Bin 0 -> 1599 bytes .../Assets/Icons/LightTheme/lamb_159.png | Bin 0 -> 1612 bytes .../Assets/Icons/LightTheme/pork_159.png | Bin 0 -> 2081 bytes .../Assets/Icons/LightTheme/steak_159.png | Bin 0 -> 2515 bytes .../Assets/Icons/LightTheme/wild dish_159.png | Bin 0 -> 2496 bytes CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 16 ++++++ .../Pages/Mensa/MensaPage.xaml.cs | 49 +++++++++++++++++- CampusAppWP8/CampusAppWP8/Resources/Icons.cs | 18 +++---- .../CampusAppWP8/Resources/Icons.resx | 18 +++---- .../Model/Mensa/MealModel.cs | 33 ++++++++---- .../{beach_chair.png => beach_chair_159.png} | Bin .../{attention.png => attention_159.png} | Bin .../emotions/{happy.png => happy_159.png} | Bin .../{question.png => question_159.png} | Bin .../emotions/{sad.png => sad_159.png} | Bin .../functions/{add.png => add_159.png} | Bin .../{btu_account.png => btu_account_159.png} | Bin .../functions/{call.png => call_159.png} | Bin .../{campusplan.png => campusplan_159.png} | Bin .../functions/{delete.png => delete_159.png} | Bin .../functions/{down.png => down_159.png} | Bin .../functions/{edit.png => edit_159.png} | Bin ...{hausaufgaben.png => hausaufgaben_159.png} | Bin .../functions/{info.png => info_159.png} | Bin .../{infopoint.png => infopoint_159.png} | Bin .../{lehrstuehle.png => lehrstuehle_159.png} | Bin .../functions/{links.png => links_159.png} | Bin .../functions/{mail.png => mail_159.png} | Bin ...{notenspiegel.png => notenspiegel_159.png} | Bin ...{openinghours.png => openinghours_159.png} | Bin .../{personen.png => personen_159.png} | Bin .../functions/{reload.png => reload_159.png} | Bin .../functions/{save.png => save_159.png} | Bin .../functions/{search.png => search_159.png} | Bin .../{stundenplan.png => stundenplan_159.png} | Bin ...enplan_add.png => stundenplan_add_159.png} | Bin .../functions/{survey.png => survey_159.png} | Bin .../{termine.png => termine_159.png} | Bin .../{termine_add.png => termine_add_159.png} | Bin .../functions/{up.png => up_159.png} | Bin .../{vereine.png => vereine_159.png} | Bin ...hnis.png => vorlesungsverzeichnis_159.png} | Bin .../listicons/{exams.png => exams_159.png} | Bin .../listicons/{info.png => info_159.png} | Bin .../listicons/{lab.png => lab_159.png} | Bin .../{lecture.png => lecture_159.png} | Bin .../{practise.png => practise_159.png} | Bin .../{seminar.png => seminar_159.png} | Bin .../optionbuttons/{add.png => add_159.png} | Bin .../{add_contact.png => add_contact_159.png} | Bin .../{add_small.png => add_small_159.png} | Bin .../{delete.png => delete_159.png} | Bin .../optionbuttons/{edit.png => edit_159.png} | Bin .../{prefs.png => prefs_159.png} | Bin .../optionbuttons/{save.png => save_159.png} | Bin .../{search.png => search_159.png} | Bin .../{beach_chair.png => beach_chair_159.png} | Bin .../IconCreator/scripts/IconCreator.pyc | Bin 2248 -> 2248 bytes .../IconCreator/scripts/createspng.py | 28 ++++++---- 70 files changed, 122 insertions(+), 40 deletions(-) create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/carotte_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/chicken_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/fish_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/frei_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lamb_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/pork_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/steak_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/wild dish_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/carotte_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/chicken_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/fish_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/frei_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/lamb_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/pork_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/steak_159.png create mode 100644 CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/wild dish_159.png rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/others/{beach_chair.png => beach_chair_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/{attention.png => attention_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/{happy.png => happy_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/{question.png => question_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/{sad.png => sad_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{add.png => add_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{btu_account.png => btu_account_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{call.png => call_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{campusplan.png => campusplan_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{delete.png => delete_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{down.png => down_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{edit.png => edit_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{hausaufgaben.png => hausaufgaben_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{info.png => info_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{infopoint.png => infopoint_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{lehrstuehle.png => lehrstuehle_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{links.png => links_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{mail.png => mail_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{notenspiegel.png => notenspiegel_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{openinghours.png => openinghours_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{personen.png => personen_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{reload.png => reload_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{save.png => save_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{search.png => search_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{stundenplan.png => stundenplan_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{stundenplan_add.png => stundenplan_add_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{survey.png => survey_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{termine.png => termine_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{termine_add.png => termine_add_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{up.png => up_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{vereine.png => vereine_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/{vorlesungsverzeichnis.png => vorlesungsverzeichnis_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/{exams.png => exams_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/{info.png => info_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/{lab.png => lab_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/{lecture.png => lecture_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/{practise.png => practise_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/{seminar.png => seminar_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/{add.png => add_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/{add_contact.png => add_contact_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/{add_small.png => add_small_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/{delete.png => delete_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/{edit.png => edit_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/{prefs.png => prefs_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/{save.png => save_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/{search.png => search_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/others/{beach_chair.png => beach_chair_159.png} (100%) diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/carotte_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/carotte_159.png new file mode 100644 index 0000000000000000000000000000000000000000..f0627ae44b0614d480ab0bd0821a916d697b929d GIT binary patch literal 3589 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 N22WQ%mvv4FO#lD@?zR8` literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/chicken_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/chicken_159.png new file mode 100644 index 0000000000000000000000000000000000000000..99648eb0508eb0d76052a35245376af34fca66a5 GIT binary patch literal 2563 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 literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/fish_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/fish_159.png new file mode 100644 index 0000000000000000000000000000000000000000..f024b53860c13503dd654305a8d0e990226c3c7e GIT binary patch literal 2074 zcmeAS@N?(olHy`uVBq!ia0y~yV3-fW9Bd2>49}&xA22X5uqAoByD2gXtV>*?8q03yZjXvbj2Xs8&PyZt4nQmSe7as5< z(9>GQRwuK2iM>~qNlU?s1wWXx6|ChAd@nh9ihEhbU%IX0yV9Ul&~yLvEuNS1RdYEN zd%_~>ba{N9GsmfBdR#iLQtNSvGt=1Wl=q}M)t7Rf`*{@Kc+T;UUs3y<*>8Hu+$E<~ z&-%^wb?5WErSa0w^Lv{BpUOG)nYYU99!#B-H)V^@rNYk3C$syP$a_XfJ5^Ye8eLON z5c{Cdc04RW(!jR#?l$H}S>27yXIQT>oj1St#rQzw%>DB0Ijfi1 zs}#x?L@nAipR1<%<9EH;!B0XsADABSJ+QFw-VgheIiDI?b*D*-=re_f#{5@j-k&-7 z^4HL3!IBS(9x>)xmz%Bqd^hRV&h@zrerp!|JFosO@z%}-Z)~(&ZI(q}Pjr@f_~Pz+ znFN*m)z?mxCB${+Zs3uatI*CI@!sJ+Lq1e z|0c0MPmb~2n}xi7Om){?D-R#guFC(LPTEb!W}D1raK%ZCG(|c@Y-BSmDFc2 z?taBSHUDQrw~Flwi=qmf+p23PZ*jZCJn4nPn?q;b_j_C2@a{7eRarY>OQ(g`Zq)}V zM|auoK5dl8q4?(P%=oASrUxF1&0kgP@L4b9fRoz3mQDLI=jz7REn+{L_u!CN?uWDo z`j$y{jxxrP`bRGR$oK#7Eb88ImN4H9?eg9UzS?V<)Z@8Jr)9&| z3ujh2Jm0?eUHY7liARJx(yb%v-O}c27uW218HfJWpe_sBH?%TLtE2 zP1);msb5>GJV2LU@lHq@V`_ZX%A#El{+)S0xxAv>@SDf3rEi?PUf1+iu9`o&WXT#M zBR=mc#m~D|t$n*-mTIP{YJZ4c>1lDNA1fcVp5OGAPcg;%r>5@oEq=9em(He^9k}$q zphY0e`&ZS;qc#`6{OXx>diCVJllG}+M)#GjpY~;L(&eA~z4F$#3WRw^tvr`E_36im z%dao7MPEBp7pZYjQ1i_;#bs!cyl~V z@AB`j+PGlCY-f&}5#r(^+wW;{M#w|(lFkc&dM6d0~E>6cG9eQDDt54H;PxBblgOw&!)7T2y{d+WJdNA&JX z?ElSP74sFazg<7wF2q%Ds9Ze{ARkFnkY7Ma~?V@MULoB_A0++I#hDt5+`5 zudD)=jly*jH$3Jj^Z1@WHPfU)U-gwlY8BrPp4xv${2!D&c)VrCyqhb%_!7K7HD2Kq z$?&M3*RMCPQWALYxX=Gm z($UVB?*mNZr*Dn_D6Rf}T8Y1`pUNt;4|CT`esub3Iq6*JoY#i&m!hxSj)_-!JLOCI z(f4=1UY}EzaH(`(Sckt??cPVu?P+Osv)D7`0%~NAe?C?7x?=am!)a6ilMmE0ZtFCN V>hxy*&A`CG;OXk;vd$@?2>?sh<5&Oy literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/frei_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/frei_159.png new file mode 100644 index 0000000000000000000000000000000000000000..a91223bc9f6cbac3fc77d819de65792a165d02b6 GIT binary patch literal 1891 zcmeAS@N?(olHy`uVBq!ia0y~yV3-fW9Bd2>49}&xA22X5uqAoByDDAl1h2{r01N>@y~CM-r9Zh-Ddsl z_mSDQuRs0XWA&!^T4i0j{r}B+=j*OjsTh+8R!e>0dr-QvIN~_NbjI!jtFA<@actNv1!4Qv&43x1d_KX=89eFqZ`AQp0nUBVEYi8puEATRBkq7!SxxBn195)s(H+? zx-q)#(?4DdyHc~$oEF(mAK$Xwn{M^kAi?&-dBd6ix#!HXTKtqHXI4N%KQs4A<8O@O zjQYMOxIf4g;&M*H)D6%6K~bFV*RkzukiTxeV$UN}#=@oll# zJ-r9Qq0hEzHXL47^Z$(I++DjC%{k6|{!C=W?T-_@_cF|9shj`!d7at9WcvumbNr0| zXKwybcXmp>!D@*Ds}1ZwLi^_1N>x<)JeLc0JQrIma#!wwkWl>8+X4xyA5zv&uA5Oj z`+m=h2h%k^D(h@I__&fQU;4wnO+}&$PYZL~DZk9!yZ+?Pv%Si3)fP%|I%=1+8JBzR zioE1#ocAl(Q{C;z-_~}m3td+jg?{}wa6SLT&a<}4al7|6=$t+iSz)ajDgu?*r#XJJvCv)k8e!*=Xc)S*7$bbq6eB`2Q-UC z?)5h^cb`dAW!h(dr7?JYMfL5wW*g3mvZhy=Z{}UD!z3;`^PrZ4S!PKE*QKSF+g{h- z+1AW-{9MCUuiaM|Kds9B=z1hy^{3{n%{$GM-g(O^t&f_2 zVe;LjrOTIWUAfuhfSBiNCI|>r+ zSyDPF&v)+9WqA`ys$BkPmrjVh`fGzVhegDtFi-bo=Yo{^J*_mAzAfQ1>c92==P#wC z=}WkSpRbsx>M1=tsv@Yl%YTwm(&SC-YO_jWC$GzK&pea3z5k8n;d-CB${STZkGmY% zcE$0V`{Hjklde>sE66OLX?n!hSKnr35|luX`jxXo^(u(F%qeUG-% zwWWN4Ez92hRC#%OC9}$M6cu>4zn3;`3EpkK8?F7x$`3-u1}*pmvR*Wd7Z?2c$gfFTU}1F+IuWnO!}< zc)Q!;?=_P|1nZ}7alASAf9@8Imut3(&b!j|X!4Sd9if*}R~Ao6@Vs_<(;MfIl#3kUFp4Fbn@vpEM`n=ZJ2H{JcxL3Z_C$j_1h;GH)dvYKDc^7 zG-Y-7@(mm{txe$?+u0cR&0O(g-<)6h>$~;lXD^XT%R0Me%HOLeA1OzBtpS{$8WDYY1_xmW{H^ah22v#{B51%CH5-+L<174 eo6Tas<<+nHN^&%2d}Cl>VDNPHb6Mw<&;$Ts5{EJX literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lamb_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lamb_159.png new file mode 100644 index 0000000000000000000000000000000000000000..1aa58f4d8ef05a663341b02005ffc7962b7f153b GIT binary patch literal 1974 zcmeAS@N?(olHy`uVBq!ia0y~yV3-fW9Bd2>49}&xA22X5uqAoByD$C!kqO&ELj zd|-0B*dN96zFF>{S)BIFe$q^GKq>Pa9v$Ys)8~?sS#~g3xTMN&;Iz=U zp5Dv&fN$A0Rtsb6`#WY#mQ^@;FLPhrx+U!muN$UckvwsXrQo8;IJOX#KS&6{~1%<1@1Th_5_OWr3}mPvI}<|aGDpWq8ver@Xd$L2Q~*}lj< zID1p^)un5nY?r>e%(`KHR>>P0xQ1X<{{8)N)t)~13FVF8@zY5Bx2}UVq);@3kd@a-UXM^Y@xhW-OWz!-zxLw-y zMqu;8AK@Y!9Iigx^55EbpDUktmAlKG`LZcfZW;W%w({=L$xC)l%43b2C7Uv(OHaOF z(h}{>#aEt~PFi=C&(ODU%{93X?z*!gc&75p;|C_aQE1Ni^MrYt*R5qAYtnD8W>?v3tn@9N{iXY2_4wyG zeeX{kef@0hs(TG4bu)af-S|{`?(FY{OG0l(ause|b$4=-$+xLYe}XPmZ!Q*L^UPLy z^!%n{)x{H^7(a)ujlXoFhWC5Zs>|!;&hTCGRW{!(__1lp`?Tj8S86=>Gx(k3yX2d! z?*07o@A)gNCSU*cy<^E#!HxRXCrYF&f2wFI#r1S>tF8^*%DL^|9>=S!9=*0K*Kd6C z?dafLb?tVwmbG_dnCC7%>mwynyKmY`73^7c{*T_tb3rqdC*6}3?2WcrIpdQrL)hwH zfARy%rZw3pXI8rWQMNvj(tH1noUW4Ds;Do&*YEV~`c!24;n)2~r_?$X&P4ShP65%ku=Zyr_NnW zu-?qPWm}DGxObJ3wTts#MQexEr>{r4<*Z%ed^1w&#k)5QYxO|N4^PTFb?%};waQ;Z zYnRujuNSUeay})Y-eV5hV2aOX^PJ4`xxX`zy7(+vmv>`zW2lQ zo$MC-&+{y2xXuvmK4Y*RfV z94b$6uGDtFwSv~I!{&EGm=lUZu2SSF`L_g4Bd=dtm9oB2`l!Ixb{QTz>- z2c{{W{(iFMPCjGV*NGpsOVhW=F)R;yyP5Y{z-Oy=ankjxp1q%hmVV#P;gu1sdiFrvbIct z&WF{DPnB1e=}8M8C_J#t@8dtGQo~7+wGFK%6`qmC#DmwT>lwoJ=1pdO&K1DGz`)?? L>gTe~DWM4f06W(b literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/pork_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/pork_159.png new file mode 100644 index 0000000000000000000000000000000000000000..fa8e0dc3a8aa56536366329768c450d4c28cfe01 GIT binary patch literal 2448 zcmeAS@N?(olHy`uVBq!ia0y~yV3-fW9Bd2>49}&xA22X5uqAoByD`T^voH;<_I$Rmh*^q?uc(Ic3_uKYt$I(Vd=H{`}lr z>*BQX`uQo7t#?1SdwynadiuLL#qV||q>&4@1wP4hxUBM)?G2X?`!x-ak)e_PJ!@Def5+X8f>iv&*HAx?g>!Z3(#)Jn7t|Eurh4=gjn+rS#Iq zbG^xolC^dEnOQ5(SuWkLJGo@r65V1s_SeRq>>gDs+C9U!d0din-K+SrZQ6c&-Ipnz zv!B`NT}z(iH+jo0|4#EKmY(l*UfuV+)RlPZPxK}CVtM)3j7!VscK@DHuvTop_7)0=gv~h zjBWiS?opNfE;+;0<5xnf_|Ey~G`8mE9jz7fwsO2Qo?4&6lTz?Vh%6{d&n{?*}#y3_X{7NL_h;EBq#Z(~{bT zn>%kCcEx(#?q@t-E||^!!2Q74N%t;?u0GcI<|O-^V+sCmXPIpg6l9XiS9qp)z;;rd zR_1ZGN4=hrlh<3YTkXp|m{`WTj?s=+hUW~+Irg}`b*0i<&;6`kw{XX726e`Mk6*iN zG8gVwsa)gD!w+|FFAS-rH+-b|+cM3U$H%Pdy%Xa2hMzuNG}_dugy z;qQX_o(^}<=l!d9%qetALes$sw;)%cI{_fDRfu%G$(mfd{H zN@5fD*_uCnIqmr6Hr=ap{x+-aMvTTrjO!T*R0zZe^cwh{-wv;OC;B?(`{JK$nWv1 zYe}xr*2RIAlk@L)J>3_sUg5HaC2z&%{F8G9H?I5gV}{=2((LpHNeL^L%$~AN+tTL} z-^|;grehPYUrlVqmjL*u&zfBVAA1Ef|WzQ^hzI3Ha{SNo;HP2t@`TsZ_Z+7mj z(X|B?j+c(B=IXyJSX$Y&Hh$4HuU|>u*ME6YwDkTJXf@OOx1k?mPKK8X?7e;Ns%`eW??wf> zOFkw&*l@ACKYQ~n@s;Y~pZ11rypt!Ds5rliZ{5!O>$}%UHC#Sv&o(dkZt{(=b2^Z)k{2Y{@uvQX1msOY?Qq4dEYw22gkm-zB)Oz=Kt#j zZ%VA>ukD&JFTjw99o8g3gl#pIzxO4BNw^BmM0A`bm0Ie#yS<4!`>O^G4^)*5!UN7uDi4)_&f! z@AAiGhon5;Yb3p0`|I@EKGyvg7-F2~6ek_5JsK^ii8bB-Ba%Vq;a9yiYdzM#osv|oogjUwxXM5&uR3@O&nDRf&*PKs z-Ll@=V)E;Q$je!`W-fUddDm`wzsr%DrFyfLue9U3od2ECUj1yb%)8{`Gbd)&+@7T8 zEYqTzHlKBw`;jV7cLrN&pY@rhAG{xY>eyjko;+*P+hlX4dDBbGO|2(Nm&LxEC*z)$ zds2EWgPvlopw#8}MTbvTo@0M0n0{0HC2Q2LdU5C5PunRg z-H<7`(dW``k8;gZsj>yE1$izd#^QxOC#(|W1pNbiZk&1X?vnehGd*v2$W@fP)MP5D z$nhM@>D@W=_5bY5-wSxY+Ph1&+bxPHOgtpf^5nPZT;A=bZ?9b{JHL#d*ZIKI1NQ_C z*GDjBJDr?YbCmVo^t4rVwjcO!>`1!SbFtezP0&DF$*-&9Y3-`w2Pyvh4n1As_qZ-P zAc`}w{?ea=aZ${3SkH8H?EkuBU8A|c$#9-$^Jg!7^~oUk{JKz$Kio4U1;w|;bl4^G zx_lCScJVIjqtY|_x%CU&OV==-W8~}V_+1rpe1=It^YcmHlz1okzjQ8L-S}21Y3h=b z2Z~;ut&uxh^I*y%?~_qHm#pOlKN_4}t9SLBz4zv1zGXL$M03_i&Ukx7`lf?w{6nS( z&+M*zo_^_@x^z#q>B`?vHg(*%kP!2leQ9)}>DC>O3(P!j?Ol=Gwd5)9krOm0op5xp$`>!yVQ;f`aG2ZM{ftO9Z6PY~x>f Z!Sf+G(Z3%SF)%PNc)I$ztaD0e0sy`qz@GpB literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/steak_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/steak_159.png new file mode 100644 index 0000000000000000000000000000000000000000..d5a0b3b301296d08d9154f882fbb6627e03a0366 GIT binary patch literal 2921 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 ZvRGz|ox3?7F)%PNc)I$ztaD0e0svw~f)fA$ literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/carotte_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/carotte_159.png new file mode 100644 index 0000000000000000000000000000000000000000..65e38e19f6d1994b45b66cc5c7345df3cc3bcaab GIT binary patch literal 3268 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 JF6*2UngAtD0@(ln literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/lamb_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/lamb_159.png new file mode 100644 index 0000000000000000000000000000000000000000..74098f3d8681c704f540cb0281de056f5b14a934 GIT binary patch literal 1612 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 literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/steak_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/steak_159.png new file mode 100644 index 0000000000000000000000000000000000000000..134e5c778319978d02d16888d7c49b2e4b43bb74 GIT binary patch literal 2515 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 literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/wild dish_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/wild dish_159.png new file mode 100644 index 0000000000000000000000000000000000000000..eaaea78b2bb263d23b031b755ff104ea31aeae4c GIT binary patch literal 2496 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 literal 0 HcmV?d00001 diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index 635ca627..8ebdefec 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -443,35 +443,48 @@ + + + + + + + + + + + + + @@ -486,6 +499,7 @@ + @@ -493,10 +507,12 @@ + + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs index 013edcb0..0f8cddd4 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs @@ -16,9 +16,9 @@ namespace CampusAppWP8.Pages.Mensa using CampusAppWP8.Resources; using CampusAppWP8.Utility; using CampusAppWP8.Utility.Lui.MessageBoxes; + using CampusAppWPortalLib8.Model.Mensa; using Microsoft.Phone.Controls; using Microsoft.Phone.Shell; - using CampusAppWPortalLib8.Model.Mensa; /// /// Class for the MensaPage @@ -231,10 +231,57 @@ namespace CampusAppWP8.Pages.Mensa private void SetupMensaPivot() { this.MensaPivot.Title = AppResources.MensaApp_Title + " (" + this.feed.Title + ")"; + this.CreatesMealIcons(); this.MensaPivot.ItemsSource = this.feed.Model.Menus; this.MensaPivot.SelectedIndex = this.selectedIndex; } + /// + /// Method create the IconsUrl for the meals + /// + private void CreatesMealIcons() + { + foreach (MenuModel menus in this.feed.Model.Menus) + { + foreach (MealModel meal in menus.Meals) + { + switch (meal.IconName) + { + case MealModel.MealIconNameCow: + meal.IconUrl = Icons.Cow; + break; + case MealModel.MealIconNameCowPig: + meal.IconUrl = Icons.CowPig; + break; + case MealModel.MealIconNameFish: + meal.IconUrl = Icons.Fish; + break; + case MealModel.MealIconNameFowl: + meal.IconUrl = Icons.Fowl; + break; + case MealModel.MealIconNameFree: + meal.IconUrl = Icons.Free; + break; + case MealModel.MealIconNameLamb: + meal.IconUrl = Icons.Lamb; + break; + case MealModel.MealIconNamePig: + meal.IconUrl = Icons.Pig; + break; + case MealModel.MealIconNameVegetarian: + meal.IconUrl = Icons.Vegetarian; + break; + case MealModel.MealIconNameWild: + meal.IconUrl = Icons.Wild; + break; + default: + meal.IconUrl = string.Empty; + break; + } + } + } + } + /// /// Method calculate which pivot has to be selected /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/Icons.cs b/CampusAppWP8/CampusAppWP8/Resources/Icons.cs index eea1a597..ede5416b 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Icons.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.cs @@ -62,7 +62,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("info_159.png"); + return Themerize("steak_159.png"); } } @@ -73,7 +73,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("info_159.png"); + return Themerize("pork_159.png"); } } @@ -139,7 +139,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("info_159.png"); + return Themerize("fish_159.png"); } } @@ -150,7 +150,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("info_159.png"); + return Themerize("chicken_159.png"); } } @@ -161,7 +161,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("info_159.png"); + return Themerize("frei_159.png"); } } @@ -205,7 +205,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("info_159.png"); + return Themerize("lamb_159.png"); } } @@ -304,7 +304,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("info_159.png"); + return Themerize("pork_159.png"); } } @@ -414,7 +414,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("info_159.png"); + return Themerize("carotte_159.png"); } } @@ -436,7 +436,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("info_159.png"); + return Themerize("wilddish_159.png"); } } diff --git a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx index 360bc657..509cad32 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx @@ -127,10 +127,10 @@ campus_159.png - info_159.png + steak_159.png - info_159.png + pork_159.png current_position_159.png @@ -148,13 +148,13 @@ favorite_159.png - info_159.png + fish_159.png - info_159.png + chicken_159.png - info_159.png + frei_159.png homework_159.png @@ -166,7 +166,7 @@ lab_159.png - info_159.png + lamb_159.png lecture_159.png @@ -193,7 +193,7 @@ phone_159.png - info_159.png + pork_159.png placeinfo_159.png @@ -223,12 +223,12 @@ update_159.png - info_159.png + carotte_159.png webmail_159.png - info_159.png + wild dish_159.png \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs index bb76fcf7..51d6c551 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs @@ -9,8 +9,8 @@ namespace CampusAppWPortalLib8.Model.Mensa { using System.Xml.Serialization; using CampusAppWPortalLib8.Resources; - using CampusAppWPortalLib8.Utility; - + using CampusAppWPortalLib8.Utility; + /// /// Model for a meal /// @@ -21,47 +21,47 @@ namespace CampusAppWPortalLib8.Model.Mensa /// /// Constant for the vegetarian icon /// - private const string MealIconNameVegetarian = "CARROTTE"; + public const string MealIconNameVegetarian = "CARROTTE"; /// /// Constant for the free icon /// - private const string MealIconNameFree = "FREI"; + public const string MealIconNameFree = "FREI"; /// /// Constant for the pig icon /// - private const string MealIconNamePig = "SCHWEIN"; + public const string MealIconNamePig = "SCHWEIN"; /// /// Constant for the cow icon /// - private const string MealIconNameCow = "RIND"; + public const string MealIconNameCow = "RIND"; /// /// Constant for the fowl icon /// - private const string MealIconNameFowl = "GEFL"; + public const string MealIconNameFowl = "GEFL"; /// /// Constant for the cow-pig icon /// - private const string MealIconNameCowPig = "RINDSCHWEIN"; + public const string MealIconNameCowPig = "RINDSCHWEIN"; /// /// Constant for the fish icon /// - private const string MealIconNameFish = "FISCH"; + public const string MealIconNameFish = "FISCH"; /// /// Constant for the wild icon /// - private const string MealIconNameWild = "WILD"; + public const string MealIconNameWild = "WILD"; /// /// Constant for the lamb icon /// - private const string MealIconNameLamb = "LAMM"; + public const string MealIconNameLamb = "LAMM"; /// /// Variable for the id of the meal @@ -140,6 +140,17 @@ namespace CampusAppWPortalLib8.Model.Mensa } } + /// + /// Gets or sets the icon url + /// + public string IconUrl { get; set; } + + /// + /// Gets or sets the icon name + /// + [XmlAttribute("icon")] + public string IconName { get; set; } + #endregion #region Methods diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/others/beach_chair.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/others/beach_chair_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/others/beach_chair.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/others/beach_chair_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/attention.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/attention_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/attention.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/attention_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/happy.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/happy_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/happy.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/happy_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/question.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/question_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/question.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/question_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/sad.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/sad_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/sad.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/sad_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/add.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/add_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/add.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/add_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/btu_account.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/btu_account_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/btu_account.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/btu_account_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/call.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/call_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/call.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/call_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/campusplan.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/campusplan_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/campusplan.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/campusplan_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/delete.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/delete_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/delete.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/delete_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/down.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/down_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/down.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/down_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/edit.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/edit_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/edit.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/edit_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/hausaufgaben.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/hausaufgaben_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/hausaufgaben.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/hausaufgaben_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/info.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/info_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/info.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/info_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/infopoint.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/infopoint_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/infopoint.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/infopoint_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/lehrstuehle.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/lehrstuehle_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/lehrstuehle.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/lehrstuehle_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/links.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/links_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/links.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/links_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/mail.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/mail_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/mail.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/mail_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/notenspiegel.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/notenspiegel_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/notenspiegel.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/notenspiegel_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/openinghours.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/openinghours_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/openinghours.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/openinghours_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/personen.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/personen_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/personen.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/personen_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/reload.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/reload_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/reload.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/reload_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/save.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/save_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/save.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/save_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/search.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/search_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/search.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/search_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan_add.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan_add_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan_add.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan_add_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/survey.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/survey_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/survey.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/survey_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine_add.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine_add_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine_add.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine_add_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/up.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/up_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/up.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/up_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vereine.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vereine_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vereine.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vereine_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vorlesungsverzeichnis.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vorlesungsverzeichnis_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vorlesungsverzeichnis.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vorlesungsverzeichnis_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/exams.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/exams_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/exams.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/exams_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/info.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/info_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/info.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/info_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lab.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lab_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lab.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lab_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lecture.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lecture_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lecture.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lecture_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/practise.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/practise_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/practise.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/practise_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/seminar.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/seminar_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/seminar.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/seminar_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_contact.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_contact_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_contact.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_contact_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_small.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_small_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_small.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_small_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/delete.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/delete_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/delete.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/delete_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/edit.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/edit_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/edit.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/edit_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/prefs.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/prefs_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/prefs.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/prefs_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/save.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/save_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/save.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/save_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/search.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/search_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/search.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/search_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/others/beach_chair.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/others/beach_chair_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/others/beach_chair.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/others/beach_chair_159.png diff --git a/CampusAppWP8/IconCreator/scripts/IconCreator.pyc b/CampusAppWP8/IconCreator/scripts/IconCreator.pyc index 4517557c2549225eef96e0f7b19078dc6fcbe1bd..0a2c3608a4863269319fcf86bbb3db92b485ea2f 100644 GIT binary patch delta 16 YcmX>hctVh!`7hctVh!`7tL0Q><2jjF^UDM diff --git a/CampusAppWP8/IconCreator/scripts/createspng.py b/CampusAppWP8/IconCreator/scripts/createspng.py index 756f8668..92fa299f 100644 --- a/CampusAppWP8/IconCreator/scripts/createspng.py +++ b/CampusAppWP8/IconCreator/scripts/createspng.py @@ -5,40 +5,48 @@ os.chdir("srcImages/functions") for files in os.listdir("."): if files.endswith(".svg"): fileName, fileExtension = os.path.splitext(files) - IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/LightTheme/functions/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon") - IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/DarkTheme/functions/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon") + IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/LightTheme/functions/"+fileName+"_159.png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon") + IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/DarkTheme/functions/"+fileName+"_159.png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon") os.chdir("../../") os.chdir("srcImages/emotions") for files in os.listdir("."): if files.endswith(".svg"): fileName, fileExtension = os.path.splitext(files) - IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/LightTheme/emotions/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Emotion Speechbubble") - IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/DarkTheme/emotions/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Emotion Speechbubble") + IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/LightTheme/emotions/"+fileName+"_159.png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Emotion Speechbubble") + IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/DarkTheme/emotions/"+fileName+"_159.png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Emotion Speechbubble") os.chdir("../../") os.chdir("srcImages/listicons") for files in os.listdir("."): if files.endswith(".svg"): fileName, fileExtension = os.path.splitext(files) - IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/listicons/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon") - IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/listicons/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon") + IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/listicons/"+fileName+"_159.png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon") + IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/listicons/"+fileName+"_159.png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon") os.chdir("../../") os.chdir("srcImages/optionbuttons") for files in os.listdir("."): if files.endswith(".svg"): fileName, fileExtension = os.path.splitext(files) - IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/optionbuttons/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon") - IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/optionbuttons/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon") + IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/optionbuttons/"+fileName+"_159.png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon") + IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/optionbuttons/"+fileName+"_159.png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon") os.chdir("../../") os.chdir("srcImages/others") for files in os.listdir("."): if files.endswith(".svg"): fileName, fileExtension = os.path.splitext(files) - IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/others/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon") - IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/others/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon") + IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/others/"+fileName+"_159.png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon") + IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/others/"+fileName+"_159.png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon") +os.chdir("../../") + +os.chdir("srcImages/food") +for files in os.listdir("."): + if files.endswith(".svg"): + fileName, fileExtension = os.path.splitext(files) + IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/food/"+fileName+"_159.png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon") + IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/DarkTheme/food/"+fileName+"_159.png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon") os.chdir("../../") From 1753954c33fa3cdd4668481f34a03e19921c7293 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Mon, 30 Sep 2013 16:03:51 +0200 Subject: [PATCH 05/22] finish #190 --- .../Assets/Icons/DarkTheme/add_159.png | Bin 3967 -> 483 bytes .../Assets/Icons/DarkTheme/campus_159.png | Bin 5312 -> 1276 bytes .../Assets/Icons/DarkTheme/delete_159.png | Bin 6256 -> 1537 bytes .../Assets/Icons/DarkTheme/edit_159.png} | Bin .../Assets/Icons/DarkTheme/homework_159.png | Bin 9063 -> 2491 bytes .../Assets/Icons/DarkTheme/info_159.png | Bin 5112 -> 1682 bytes .../Assets/Icons/DarkTheme/lectures_159.png | Bin 7900 -> 2019 bytes .../Assets/Icons/DarkTheme/link_159.png | Bin 8362 -> 2411 bytes .../Assets/Icons/DarkTheme/news_159.png | Bin 7035 -> 1773 bytes .../Assets/Icons/DarkTheme/openhours_159.png | Bin 9439 -> 2634 bytes .../Assets/Icons/DarkTheme/phone_159.png | Bin 6593 -> 1528 bytes .../Assets/Icons/DarkTheme/schedule_159.png | Bin 6812 -> 1136 bytes .../Assets/Icons/DarkTheme/search_159.png | Bin 7471 -> 2169 bytes .../DarkTheme/student_council_159.png.png} | Bin .../Assets/Icons/DarkTheme/webmail_159.png | Bin 6528 -> 1708 bytes .../Assets/Icons/LightTheme/add_159.png | Bin 3899 -> 469 bytes .../Assets/Icons/LightTheme/campus_159.png | Bin 5832 -> 1167 bytes .../Assets/Icons/LightTheme/delete_159.png | Bin 6785 -> 1409 bytes .../Icons/LightTheme/departments_159.png | Bin 5700 -> 864 bytes .../Assets/Icons/LightTheme/homework_159.png | Bin 10752 -> 2329 bytes .../Assets/Icons/LightTheme/info_159.png | Bin 5274 -> 1518 bytes .../Assets/Icons/LightTheme/lectures_159.png | Bin 8749 -> 1850 bytes .../Assets/Icons/LightTheme/link_159.png | Bin 9487 -> 2179 bytes .../Assets/Icons/LightTheme/news_159.png | Bin 7731 -> 1618 bytes .../Assets/Icons/LightTheme/openhours_159.png | Bin 11048 -> 2471 bytes .../Assets/Icons/LightTheme/phone_159.png | Bin 7142 -> 1356 bytes .../Assets/Icons/LightTheme/search_159.png | Bin 8336 -> 1960 bytes .../Assets/Icons/LightTheme/webmail_159.png | Bin 7069 -> 1429 bytes .../Assets/icons/DarkTheme/update_159.png | Bin 6939 -> 1865 bytes .../Assets/icons/LightTheme/update_159.png | Bin 7588 -> 1586 bytes .../Model/Lecture/LectureActivity.cs | 2 +- .../functions/{add.png => add_159.png} | Bin .../{btu_account.png => btu_account_159.png} | Bin .../functions/{call.png => call_159.png} | Bin .../{campusplan.png => campusplan_159.png} | Bin .../functions/{delete.png => delete_159.png} | Bin .../functions/{down.png => down_159.png} | Bin .../edit.png => functions/edit_159.png} | Bin ...{hausaufgaben.png => hausaufgaben_159.png} | Bin .../functions/{info.png => info_159.png} | Bin .../{infopoint.png => infopoint_159.png} | Bin .../functions/{links.png => links_159.png} | Bin .../functions/{mail.png => mail_159.png} | Bin ...{notenspiegel.png => notenspiegel_159.png} | Bin ...{openinghours.png => openinghours_159.png} | Bin .../{personen.png => personen_159.png} | Bin .../functions/{reload.png => reload_159.png} | Bin .../functions/{save.png => save_159.png} | Bin .../functions/{search.png => search_159.png} | Bin .../{stundenplan.png => stundenplan_159.png} | Bin ...enplan_add.png => stundenplan_add_159.png} | Bin .../functions/{survey.png => survey_159.png} | Bin .../{termine.png => termine_159.png} | Bin .../{termine_add.png => termine_add_159.png} | Bin .../functions/{up.png => up_159.png} | Bin .../{vereine.png => vereine_159.png} | Bin ...hnis.png => vorlesungsverzeichnis_159.png} | Bin .../listicons/{exams.png => exams_159.png} | Bin .../listicons/{info.png => info_159.png} | Bin .../listicons/{lab.png => lab_159.png} | Bin .../{lecture.png => lecture_159.png} | Bin .../{practise.png => practise_159.png} | Bin .../{seminar.png => seminar_159.png} | Bin .../optionbuttons/{add.png => add_159.png} | Bin .../{add_contact.png => add_contact_159.png} | Bin .../{add_small.png => add_small_159.png} | Bin .../{delete.png => delete_159.png} | Bin .../{prefs.png => prefs_159.png} | Bin .../optionbuttons/{save.png => save_159.png} | Bin .../{search.png => search_159.png} | Bin 70 files changed, 1 insertion(+), 1 deletion(-) rename CampusAppWP8/{IconCreator/dstImages/wp8/159x159/DarkTheme/functions/edit.png => CampusAppWP8/Assets/Icons/DarkTheme/edit_159.png} (100%) rename CampusAppWP8/{IconCreator/dstImages/wp8/159x159/DarkTheme/functions/lehrstuehle.png => CampusAppWP8/Assets/Icons/DarkTheme/student_council_159.png.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{add.png => add_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{btu_account.png => btu_account_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{call.png => call_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{campusplan.png => campusplan_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{delete.png => delete_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{down.png => down_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/{optionbuttons/edit.png => functions/edit_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{hausaufgaben.png => hausaufgaben_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{info.png => info_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{infopoint.png => infopoint_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{links.png => links_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{mail.png => mail_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{notenspiegel.png => notenspiegel_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{openinghours.png => openinghours_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{personen.png => personen_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{reload.png => reload_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{save.png => save_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{search.png => search_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{stundenplan.png => stundenplan_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{stundenplan_add.png => stundenplan_add_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{survey.png => survey_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{termine.png => termine_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{termine_add.png => termine_add_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{up.png => up_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{vereine.png => vereine_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/{vorlesungsverzeichnis.png => vorlesungsverzeichnis_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/{exams.png => exams_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/{info.png => info_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/{lab.png => lab_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/{lecture.png => lecture_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/{practise.png => practise_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/{seminar.png => seminar_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/{add.png => add_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/{add_contact.png => add_contact_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/{add_small.png => add_small_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/{delete.png => delete_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/{prefs.png => prefs_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/{save.png => save_159.png} (100%) rename CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/{search.png => search_159.png} (100%) diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/add_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/add_159.png index 056c566723eb3af9d839c5b6b7e208511ae70e29..cbe25009e5abd02c566ef8cfeece65345612cda1 100644 GIT binary patch literal 483 zcmeAS@N?(olHy`uVBq!ia0y~yV3-fW9Bd2>49}&xA22X5uqAoByD7*a9k?Onqx(Lj-ghsKi@WahlNoXYsfOXc**piTUW3QJDPKWqanoFT1_%c)`Cs@vlt! zCAP-$uT<+Ee(jHcYBcAslHBf;BkpcBFydLp`lx+p&OFcf_IqaK_Qx@Q=e>`%m|grq zw(tJ=PIUBBNXWdMw(8RInU(hn-@QCjjWgUB7(TGqvd6k*CF!lar3g~y>FVdQ I&MBb@0MOmi`v3p{ literal 3967 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 Jvd$@?2>^lmR)YWl literal 5312 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 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/delete_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/delete_159.png index bbcb20e526cd47468aa325e8dcfcf2cac07b6343..7cd2c9fb13b04b3270de63f95298a8bf32754dd8 100644 GIT binary patch literal 1537 zcmeAS@N?(olHy`uVBq!ia0y~yV3-fW9Bd2>49}&xA22X5uqAoByDBNohyx`mY5}nkN_ZLCse3w{6+MH#b;Iu7qqpCVOCaZBM%L2dBg5r+a5f`f{AR~6oi+aVu3TDE zo?Gs6>CkG4`QI0s7yOv@wQQes?QoFz5G8HG;aH=_OkQF{Dr&@mz*aZQ(|Aidpo&)+BJ4heeYQvb7zU!O8qv@ z4c>OTX3{o>_s7>QPK|FBxOPNuk*;NaN}Wy_qw|KS@a=my1{d+&|8s+t$J4C+!E>2? zGUtVE%R5;J?(W$3WX~CM`5!_NV!NkJ`@?x>{^ga^ZvBuS9vnyj>%_weoE#+1?&wKNa%Lh0gSbWI-`zK?sO;%dk zH0jXr*}D|WWSb|LC}r+l60W+oBi8@6mqpJ%xrFUY@*Dgc&%a8Hzs`4Qjd@T0f?dZ> zAN%$5Ny}#Au-LJBc2^}i0`Zc}e-b_aQ^Vc#}TlCw{O+Q?{!|B_@)z_nf@5j%&dx}j&U|-a$ zxrZNmN4z>+%NKtr=zYz~>-SGQ^lr9}KV)U=%-{DbP5x$B!{_L*4Ja2EftS~2BA<;?ZXUYzl-=IVd_B|TNhu6!S#mTJw) za=v!`M80_TsY3g%r0-toZ_^7>6hF@zY$4oQjo;d03@dhRf9rZ_&W&Tv9FcL?RF3K| z&i~4JePvvh($!tdLtTDkt)U!NhuPcY9l@WF-{l!J~uA9Qi*|qfx*+&&t;uc GLK6VJmF+qJ literal 6256 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 PU|{fc^>bP0l+XkKr*;3{ literal 9063 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 literal 5112 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 literal 9439 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 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/schedule_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/schedule_159.png index 17fa2a85b15f06843d0acf8ce8cb01bf65b92518..79c4c08cd4a72172e308d700b9b82d12a0a27cfd 100644 GIT binary patch literal 1136 zcmeAS@N?(olHy`uVBq!ia0y~yV3-fW9Bd2>49}&xA22X5uqAoByD&P#s;}rYbonUA`N&B^HIgMnuj^M>tM;_nGdmY!NJ z-_bEY`^3RqzE);+>btoeKQguE`bMrkto~BU^S0Lf=<5sq z`FWQ6teL%aZ@*mwOo7nb2k@unVEIpfN)n~pfPQKSHe@XL&(~om6V`muuaZ%=d=qz=p-6Xc+ z%=e|I+6}*Z?Anw6r+3Lzr?btI*1eLRKjBN_!e@1!vwt1C?_IS%pm_a~*Id~K+1vVi zerW&yzbD|aU3_R(+}gm+K`Sfwx}Ck~b#}IC);+D7+TC8?XN2eMhB_5$O$&b}hy0~2 zzj6z6+)cX6a5k_f~rTq%YA6(>5>p{Oj0q)xS|IZmPWev+v{lNp+f6 zawcr4JMyPi@MGRXx#E@F`ycLDQ*K&V_&)2=qI*}5RQ2**b4tGL3iij1vi(y__H0O- z&bIyL`z=)piBqagDkL7VPvtjwbLBx|%j8L3{~sl^huvop{@l{cDx<@2tpyxHAl(q> z3D_-pd8qpg|IK}CH>7!|?z#Pqw{_OqsUKsv+2=)U-s^U@xAo_>S5807zN}MQ_a@di z=Hl*IJGPXU3fZAxD}BX6MpRL=y>XM zHc)Wi|BY{zkisSY_ur{^4@3#>`?hJxUcrx%Wy;yEKW?3z^v(5%^v&L$#oX&ZzumTX z=Z0suPW{Ncz4ZR&Fn+l=8~&CpOp8w3w=P}j(N@m8+P>oV^pY>y2nrtEzb>13+ugFt zqQE9~!F^_xT1tGW=7ydv>t(;WAJM+)>m&7Wc0Ie&ql7Zy%ML%D-To~2F{VuT@}+O- uySHb5h`6lu(^~1?`8+1#vLRSi+LQPf>aW$r9zNg!@jYGrT-G@yGywoHzY)X$ literal 6812 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 G5}E)A8utnS literal 7471 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 AKmY&$ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/lehrstuehle.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/student_council_159.png.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/lehrstuehle.png rename to CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/student_council_159.png.png diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/webmail_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/webmail_159.png index 77f3af27b43bc03454b7174750ba2fdef83863eb..f7f0d37bc381ce6f5334e945a48ec6f7ab2590e2 100644 GIT binary patch literal 1708 zcmeAS@N?(olHy`uVBq!ia0y~yV3-fW9Bd2>49}&xA22X5uqAoByDY?w|bpn6I7=-rIs`+ERy5e<#oaN z!e1suk*m%k6BEA%csXTGi((18B)X_+5qHRivtFAo#q+;*5PUu-(s*}(p!)NYnjvt%fC9S$L z081s{hoC0t#j>J)t6O&U#okDduRRhSI%VjJfF4U?lO~UXDjFOP5$!k z|F-|mml*HLw<@Y+hI`I-x71jz>U;7=UA5=;?*=k^H@RL~n!CrZSoN>fv3=`aztiB+ z^nBi1++a7YB;Z+{-jppXFI9Xw$3H1;>qn`x;asmH=DqvF@g?kK@;>EbKkqI)AU%mM zf9vFq3a%NPHIbo-wx2W$l3doD%v@u#teS0xh2Q46t2EY#d-30w)2-Xj|6$pZ%h7K& zl*}d^+OwwXP*nn}fvu9=$;>q+ma$wuFET@IL#loh{mWKoJgqwS`l>{i9F}v8d8}7b zb3>~HEUcC4a<2vidFYyfAKc?HG5{=Ewz_oPxmjr>v!pq z+3$*dpOp=csMy{(cyQ0c-oNK3d`X>M8@Ho(FPE zFKqjBTj^2m1C2|QV(e>q=LiT!zIRc5>$S?zdQJ0!FCR*+mhI%K@VnHfYu)if&_Z~} z?0-GX<`bH}$N43D{$^UweDkt?^P(>wN|Wt2I9+-Y#;cr^?V_VJH?r=1qVMU(NWqW3 ze#xHg46hreUG{8V@#RD5@4P&-4N;foMb35AVfACPd%x-aMIE+h?nm-1dsStfx#F(5 z{8G@etqGmsH;dcGV)@4tPd`K?gu4Fy&l@8sc-`g5wK=>~p6Om^s16Nrp6JCNANn~W zxUqCn->Fw7cO8q^GG%V`_8!>NQDIWfy!7X(r%QgGcGI@43B4s9q586A&awZJ>~Wlb zt~%D=XI$=n#CxZ-$1au%t{V%R|FQYKe7L%bt)4%K;dz?4z(<1uElr=Db}F_nHrtgm zdtPVmH$HGW^{tj|&E5^%ADS**&Wlt^k}crL{99^syTQHjvGSwMb85A9r{871(>?w4 zDaDr)`>yjx-Bx>fi!aM6`cm}bH`z;BX(qxIy(Qnb2G;#}HKQsc+f=1}3G0%lyY8;K zl`cF*Zr`pq%xk8U#B8^ov_+s|mSW`A4EL80R~KI@<;vu_aWUk?37LCu4+tHr-<6Xw zRc_xdU#4lERSrSllsml63$JI*JGNRZSFnj*6}Cl#T_L{BX0I`Pb;d^j+DK3et_PORlfYU^bk(@XOrnVo&}bZ#;jU=w7=- zd{^G&M#J|XUr)C8++Mzx>6*)t4K?34%%lR4{Lk?0jLPwQHPaOs7#J8lUHx3vIVCg! E0Ooo{!2kdN literal 6528 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 literal 3899 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 PYs}#3>gTe~DWM4fDLXwq diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/campus_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/campus_159.png index e7fa38b8a6b43e851e944b254bf89a15f0dafaa7..1d08c9a60ce5eb9b23d5b7a5bc6bedc392ff3d70 100644 GIT binary patch literal 1167 zcmeAS@N?(olHy`uVBq!ia0y~yV3-fW9Bd2>49}&xA22X5uqAoByD>hWu4`JhnlIdy#N=qT`?GAJu0hrdm!Dk}lJU zjOd6^NKW)jN>=`uZhFK?Nob;C$Eg{Dyh+QlKCUQ^%6;B<`?KA9+vmSM^JZ0FzHQeX zKmYr@=eD-&DxQ-FqASjy4>&$Zeh{0GpJyr6mEHLGz^7Tq@6L2BeY@oi6U%|O2fmfY z?cZLas4BT{*IIFpOz&78oe%d@%j?qurTQWtsLy(^cTTk5_n5NR8yR%A&67W;wM69b za+5ayOrH34nGcp-`}}l`laa)}Ps=**c5iP?J|MmG>65~~kYi;J!jwwN8PcCm3uZrj zeXeE#{|5dYycX##-+8ibn$|?;&wEkuok3jndXVYi?WXIL%9Q08^kg4Dzwy&#l6FIT zr`~q$ozpr~e)ygJd0_F8=N8Q7YKO~2I)&~vA#Ew$s}>dNg0&s}#8KG1t);;Y)8ZMPTn zeYLH5XBM)i|KV*;n`1wA^Ge2)sb6?{KzYY)gFrRQn&*P6Ej)n_?OYQ>c_2pjByIXS-N)c|tsTzekgzLEH#@{yH} z_Tt&=gSB5t9yXu#?M0fo;jYLR55C{{xn<$h$+CO`)n~Q~s9WpgeN$U|{=?sT?*r9G zPV#N-%UhN9W81O!CW~iV&boN^lIA~|>9M^}HD34UZE1V>`dYck;@PoB1V2xoUGsl| z)%>CuUK{r_qWg3A{^LBm_xe1)72eF7ny;ESS{`XQ^nBCo*A^e@$^;{M=3kQ7w~Oah z!{HB_y$@G+&-K?j2w|OG7t%z5z}2JY)Tbu=m~!mH)uXB5S_eOX1TrO-b==n2!}Q0e zIQ5e9f%F632c~9TU3s1F5=-9V1|J~}sjJ(Kn2Rj)6ElrjFgZkDj@Yt6(RQG4;^TN8zP=8Zi^Mcy_z?_*$K OVDNPHb6Mw<&;$VEsXI;p literal 5832 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 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/delete_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/delete_159.png index dbd6125333fea614c890da3d4bca3f6021a800c8..786581b04160137465036461e49b5778e2d16696 100644 GIT binary patch delta 1390 zcmZoPZRDPyQqPv;?e4?$5KG`o(E_^&XQ{Jn^HfvmS34OYY=7 zxXL#DyIjGFgHJVsXE(fWXk~jXvY~Vaztc-eX1hf{*SNaiQoHg!dZsR+A-H`3KB~XpPc+~wYhvXgQ`KzSDyO< z68oy!@;P|o_fD0G$Z(jKweouX7Hh7U-Ca+A%2n|m4qw0jb1s{o`HnyCoQ*cDGVJ@< z>y~XeyLbHwgT@EbR;e{e*Ejrb*xhE+XW!TyD$AhO{^z$TOEky(yLAqqH;2tyqkQ1? z0n@i@*mzG%d{FsdnOLt^wt;Qs}wsJbbC7_VN?1F5Tyo&-fpabKuTPFMTd;t@`{!?{PT??@cqC<`@5{FZwg( zhRTQPH;x&Vk6X(5lin{k4XtM^H{aEEW!2pS+mG;{%gW}uarwipivlsMdw6|>?OmF$ z2|jRr&~@y3S6i0y2a$)LcNibx4~w14zK`V|)4R-c(-QZU!ra${{G#6|`Y7CBeWT)| z6Jg(Szh2D3^M?9gMvIuMBHI7gcocc@-mhPp!<@%rCU91&tb&qX(jVMQf2%xv;5aE{PR_Y$@rTqBWIyD;Xe_mj?wfK(_}1W+C;m{-`qhZl0^3m{(@KV#Hd#aF~bv*l2 zp?z1Z+aG$*c=&oj(4qS2ztYUViu5wGT+|DdV^)$t)#S3vGL>!q5F zXD7bAK5NO3lr=|~9yVXs^eVk`T1&NN!n?ZoX}_xj!hQtZ%{Qu%^w|1&>90kRVV)1Y zzj|)@oO<9xsgLJF@6yfLKa3`1J@*Fb(yS@l*Qcpjv$9O!@br4d!`BT}Ti;i_VO$fi zN?%IXi0O^;KUH3~m7WR3(%R02HvT(UGT$V`u6ou`&N)3QG;JN*J(ZlUWcJ*`vrOy_ z*0-u(yy^;kAo!s6km|Z5mUlKEG(QLx#O~(b9_=;Lr)p;zBR>Pbklt)l#+=-OpU*k3 z7h7}5utoA~f*t6qEh!{~ce3F?X+w>ib%+z$D>bK-{hZR>vBj68JmP3EDmwdaMJ qO4qCkZpl+8P)b3|uqiA4Gfa`F`q#eLGKztLfx*+&&t;ucLK6UJny)7S literal 6785 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 literal 5700 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 Cde<2M diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/homework_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/homework_159.png index 708f6cba711aa47b38fd78af14a5efe0d74ce3ab..471ec1ff73f72a4783ab815f4b9d3a60fb0b0c47 100644 GIT binary patch delta 2318 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 Bexm>Y diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/info_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/info_159.png index f95a93ca980802bffe59c4f3f461628d0f8d9192..eb67e90fd148605b0e12eaffab3c5338dc33bfe9 100644 GIT binary patch delta 1500 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 literal 8749 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 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/link_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/link_159.png index c61292b9f4b878389b12a8c77439dcdf788555e3..fe7fa20e4e0a6f786e8a0c02a1006919a03bb0ee 100644 GIT binary patch delta 2166 zcmeD8Y8ITJQqPv;?e4z5GjSo@w~JwrKTw$f3J*fg60^#IM4 zZ&=s)ZZkDX`@+0`(Vio#_3OHQs zi}L~b4F5-0PpuDR`ZmY$f#0hgd0k_xKbO>$8 z=4CpaQ9tSF)YV?Mt1@RZTG@ZpI$-wT!K81Fim^YBm^0Y0o%vYvU%!!kLv+g2`nLOD znJ2&gXUieOB*P`c8N*O>XyIDV1Dyx*ZIY+*88y_if0BFfh~w@4H#gq>IbgPwxkc@s z>%>Pp&Tf3WbK9l`$OE<=k<*FA*bydpRe9uf7*ya=cxThF~;wed$!NK+qeF{+{WCK z1&rSo{)iK`ySL;X$Iue<5$X0 zUwpLhd|UW?cc3i8pWY2ecAGA~ zXZPk@bN*cO7NFxdbeFag=-Jg%O*w7*I2ji`K_ZDBIX^_QO{#3gcmEh&~*Y0!n zZ9}gg)^de<{xZqoGo5ebZoa-DZ>G&@+1E8KUxZ8cHQtwhVB7iljnv^AYxVCRiRPEN z=47oc^Qxxf%l(S!kN%&nudII*vHQ^R2Hzj*_uL-b5W8Kq?x@xL18!2wO{Ar#KHkjl z)^J$(xb?GIjvxI0I=74d*y3DWpSSQ_YD&E3^p`$|*nI9xu()TK&-L!`k=LjBa;9{5 zFFO40{l;@|Z8q)~^glGs|MOk`(-)2usyjzqZ+Ooqe=tAD|DNpR^i_pVce3s7Ev;YS zemgRa>HV`KAt7-oUsO~y4d!i_s8W4WPU>n`+T?xV48Nc5SU~{=`^T$$ue?0mHuLwp4_q4z7W`dq^s0K=v$>ZN>UHe%E6x`<@FX}Nxp$^x>D5nS z1tAGMw$IrP3BBKS;9LFmfcwQy`Ws&>S35j^&QzadAu~Jt(Qf{GN2lEtW#{Jf-V?2K zBw+ui14WEfukx&l&G8`*H5*S60Kb#W~-Z55#l7I-_09 z8PB-zc}>fP-Sy)AllJki*7&HkBR2Ov|C+po=k|O$dm#6f<=>W4rS(gG%+cA_x}_}t zYqst+^NAlyXV**Yi`@IX=ui2Ns0Rm*eB9NewsT4AuV0+6&#y_~uNUOkf3W>M`s`_oKkvfVDgS-ZqyNaR?}NAH*ZS6TJ*yMuK3vIe zUeddA$NLYx2ik>?TT1UQY+3&Nilo*56w#mMF-s2c+$rDXe?PJ#@z1V?ZI}KyohVJ5 zf9#V`LBN%@Zye>1)-GROqP4ANmVc9pwBa2uao@N||2-FtY~QlnDf=^*GkJDvZS_x; z6GfZeZ;5#s8NYUq@2}v#b)`mm_15+!2OL)WF_>8&3)9Zt_|#e|*6l{mZrzO7y(`)Z ze=~@wc4(&jxwHSIor<2qn|WXP9`*1}v3maKn_^5@k!q(=@2Hg!pC)pg=Z#kV zC3Q!$q}NMLW_A8&^nFaOi(8jJ+*TA4wo~(4 z+o_E3$KM*~i0=H$|Hyt(n(?={)1ImvN}GMxZ@S&0eUs-M4m4riIPvvowNE|=(^kqp z|9Efhftxq7Rz!v+Zs$u+IPY%F<^4tTYEi=7^Iy5^#rF1{Wv#rStX4S1oW*u^jaks{ z$qoB0w#8~kH=cLtTKv4^(udidNA)FDj~#jL_=a=hW}ADvd4JeU+hKIw@&;2yB-uF*C!u`YJ8!4}RuUdT**|T2$_p;qg`#rB%Z|J+1ZhKE# zHj6LuuAt^AzejWHv%T0~GS6G`m-E`1H%#X=b6+og`|U7a`dhy(Yx4J8*cz6?GlT0- z^EdUFwLKS(Eid%03T`yrV*jx$`TVP?a>krLl;3*qiEUY{qndmtgJZT_Zxqo(_6L{ff___7YNfyEDdubeF^d|nnS85kHCJYD@<);T3K0RWxI BP?Z1x literal 9487 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 jH`M|+gTe~DWM4fWjJ{& diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/news_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/news_159.png index ea0f843acd4fd43924d5b7512dc17d1b5da741ac..9d7650bdda5ea3823d79181207e4e70832eb5b79 100644 GIT binary patch delta 1601 zcmdmNbBSkyN|LT$-jz zdsNJ{?#;bYSQYX7N{?}IUiJIU=d3>eJ&=_4Vb1?Q&wnJpudn@fFI{(nisvN4$TTPA z4V#dO$$Y@)~OPw8CjgM_Y3(d)SUKb2?sa+y&}J7U$X1v`rTol+!*dp)U9}``#{$BU2JEx z)3*mxkDsq_b1c2#S@-ZYtC-pL+NH13KJmusfA9?c-_%kOw`%{-&MP_GZR__-vR;|P z(WAd0?-NgaeK6Om>QKkh$!R}+SqBE(O=i97JL}==_YRDv=b2+!ulUY;_&UFs(R4e5 zE$bEExK|Hn^PH(az44yfp;)cTTQic^-aPO~=Cx+CWlM49?}qCQuZvdvwE8*su{Dp+ zi5urt5>z)V4*C4K=j)WoML$kG*4ex|A85`Ieb{^P$;A3}I-L!?v zib@K9{OVIaaC_Z4Ip2p!bKVQfx_`Hi;hkbk+v{};zb!BQ!>bjb`|!2(t_E`s_IF!%Z2vN+s_yu2 zhjiYp>sjMi{;k-&?_sv!*S7WVZ!p>T?FijBiSxkh11Gh7wB7#-3*a?`EEUq_RP*g8xVT!b6X(8h1BDb54I~)wsWLZ_C|Z^F`-XGb_I6 zpZGWEcGV%p7Nygho=WGuQJk}B<~-+o;l`&2zRjtQneCi^%JJSq?S8oj(g}iz;gPHP z4$W>aJutJW%D6^%(TWdWW!X8R4@Zjrn&D(2_$ONU*T-j9#4h%H_$qt5ap?hzLpiM7 z9M9`NXZ?-ImwWs;CeAYT+M5qkk2`A3=g=#vnQ~hDI+NScJcYnujd#Z`XH_Zxy?1A6 zU3j-p+K)?*r}<36}SpeWrZUJ0CM z=c})unJk{zbgFX6{(~9O!W@n{j;?*9pu-XTdJ}J!Vsazv0rn*yBkyy!gz8Uc zzApZuN@J4WA(y+WIX8D55!Q4p}cLoFTA^Q?Ns!>;xF+ti^M+2d=O(UU#VU1 zb^hlDPuo?#w%#0v~SBVSll?<>;83X)|=BVg^Q=GJM@9qWTpY*`5TwcyT7if ztK{n6c|hvH${^oNkJAmcJT~duJ8w;2RzJg_`bzy#(>_M-;&j{>#ko7`jfSs#?l zR^+wqJUGkO1< zdJw(Z`GEC-tD#vvN;2|%VUJB7nytz*ZJXM6gLlh}$d;{l^aSpy%vrMUXP-3(qxSyb pcY0SXrzZDLvLamUdP=>BKRNx6Sdi1%a|{d&44$rjF6*2UngG4C4?_R| literal 7731 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 gzFVdQ&MBb@0C=axGynhq diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/openhours_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/openhours_159.png index caddfb56a2216177cccb7eabc8f07acd2b100906..afa467af20a605dd9337216520fd04b61af5c911 100644 GIT binary patch delta 2461 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 BK-B;M diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/phone_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/phone_159.png index 731f36f8b57e6cee882a974f38bbd01e6aa355f5..48301ab8fea78e552df1eb61a065da13bd3da22f 100644 GIT binary patch delta 1337 zcmaE6euis;NNr6L=;|N#hn()0GQ`VI<>S#B`aX6YcDX?fCJkqqrLHR6)*6s|E zpy-g>uBS`&_gd)K?9SP3ot}2?&6&@C5B$G+sQ6#{kB?{U>Wzz^HK=$_A_A?N-?vIy zfI*!xxPkFOe^<5Vu@6hjtqOPxBsWM{NLy@t`hGuiJmc-g>5a83r9(E);kv{7MyX~u zZ`um;M%I_nVRv;|%^3HlaNjxcidl}e&-3=aSIdO!BN*SP#XoRcEqmZhNpRrY7+=eU z*=ubj9JWSqGdev9XXUjcT2=8Eip;-H(EsG%{?3;_} z&NJ+GOLkq@daW*@YUkyvDFreg41Vg*7Kwd*YR;Bb+Xa3!y=pd#`pU3;ig{^hrfEUP zD`&GX+kk6NLVN3PF450rn{5pTDE^ne;K5%)lHS* zS!yU-G4++RNc7$VYYz2yd0l6%aj{%jG5bSJTo=PSjb8^=#5`wU*RbQL=Ijq)%+Y!H zIr_E62b%)7iR^AqqgYCUa|CvA{x|o_luY+Mn9LI@|AEP1`3B`h^(xZ@u6c`yw!}T) zbgRFU>Dc&~N9f(_eQa~Wk2D5Eg)_Bl>hVNN{=c1G&-nNYvwq@>tZc!fw!NRs3#^5s zJHGmy+jx&r@2p{dXb#^8@%eFZ;iRjYHTS3e`B{6w>kvP0=8T(1Y|k29{IoViD)`Oi z(~qyJS48_h-qH7{xm?0L^dd_M!~4LTAJ^38HfH7OeGos&l3%a?@avXKEwSEzl0Gi9 z^131Jd@6_cXWd`B+51vWPsX;qE{<&euKe!9VkRB7eag{4!on`Dn6;Ao#=#@?DL?L| zimsZx!TWJV^enyAs~k=5>pajr#NFt|mLJ_(yRx@Lu~052QDcO==vk8SpONK0_urap71j(43=E#GelF{r5}E*dVSoAn literal 7142 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 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/search_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/search_159.png index 2b8797caa0119e7275a0d9556fc7ada9cc9be9c4..10b07a49734c4b58ac3349bd465466996465ad4d 100644 GIT binary patch delta 1946 zcmbQ>xPpIzN9RK)!ieJ|3XE)N8 zq*$iiWYP_DiQKZ6BZ_B{gLajmZp4MQ1z}&*JQg*TRS7y)&xjI?42s;=khU^&X6}xq zky&O@=WcWxKRtBj&i~qZ#qTV?+wJF+)%rqQRXmY}quU~z89{}8TF&%B@Ue)+bkI|}XM*YD@uVR%Aau~mw7&4O=E8OQ(1 z*s=5+om(&S<=wNrd@RQpwlf+x*uSc{|MtLNJ3EHXWQh&4Zdug{7O)pY$iBbd^P97l zv3$!K)#FdB?!_xva+G&!=cns4=&^tMFehE(gUVLXhhOJy_Ha0RVEL2R4@wX4w#a{x z^KS^N`$aBvCHEK=pf7Lcp9Em*xiU zI2h^8eotI8*}si>f70pyAxnBL^_O_TkublRLg0D+~O8Hi9v`KyI7<<(3G>qmuo( z5veI_8ceIEzxg{$UUx3T2eX@VO^l;<-J09{_Jz4p*a5fe;5dhom__t)chqB#;PMdqhYsrUOJl31H_Bdy|t2&d=5A5{;<-o89(l@Q7p=@gZ5 zW7)!U6~P+&98>%^{oB@|&=~nGu>hh_N84`d-xch6QEAiuHZAw?i0sM_{vh%&*Cgk1 zfcN^P0X4O}x3{qR3(iZG|HbNGKXHOc*L(fLW}z=cPTS>h&Qns<6q)~2eJhu}`?T5( zHGOqt4+g8Kv_6V<{&wD1^w@r#-xEqjmjnfA?Bh$QJZ8oo z@Najm?$PhT5VsuAy*D@2=YvS%+~ga}7UpUBF8#63ET_2ag#aV3dUa>d*B$k@k4d>{ z9W}qb;jHS8*9THfu5CCQbEmd8XhYha$b8YXwQtvP{^)yCyW29%;i636wFpMmb;quG zsvqZySnPk|-g5m#ONAM}9sG7V`e^0u?Z>$^tZmxYZa(#4|NPRUO=ou;xAsUmzG!Qd z$|CWNrMIG&7>8`x-Myif_ziNV&Qs103c=P(Rt(@lKF9&uRWwIB< zF6oKQJb3o%hLr!Zx992wZK&O7pSyy2hq~9P*sYJ`7N(xuBfCS*%ggZOZmGY`M`C;H zmMT6zms>MsNmAI+=LK(Sj?9ZF2s^nj%U|KuD%&uJu$6&R=k2`~JKN1v%`-Gebe`4B ztIr;tn^v#tm|Ayl-Bw-Jz7;=(CoO0TSf}25{ZbgS`p;hnj;wDyV0}b)!i8MncS3Vj zR&aj*(Gb;Uaq7~xhi!!_f$0zYG?K(m)#q}*t1K|K-5bYlaP#(Z)qAGQlQ*nQlizeU z;rOXVdmGek_Ieq9PwOAorahW>Nrf}}VC=Ri zryWhV8Em?96+f>ous?2h?|bp7{YB1)C3t;UpC#_zxq10ErtpI4jI~A2ETqjf@3=GS zDOdBp4$6R*iiO)>^&g0xoqJI9(mC#sZI8qFBKlsx_<3OZ4#o#nJxA`=+AcYFoiU<& z_oGiU+pkYzD`fakFId;t5Z$2N-K(FvUHn_6R^(dd9h-0b2rBbE!2H9Sv1&$%da&mr zwSfPf7wX@JewxqW*}Pk1yV&M_ra8UUZL>RWuDr24I&EufhTeuJCOqbI9xrAHPmpF1 z|9Rix5AV?&mUH@M`=-RoKT!Q6@*wQaQ(M8!wkPd#x9pyFYDtx*jhAU3_|13-rF~r(N;;)jxfLOYb4um3!tf zy~+Ex(PP=c9W%?eiq+rOJnBA8>!$P!zki2rH$+#tEYaIrD17I$$bIF&NnWYG$IL`F zGu^Nca$C8f@XMa2>roGWWV~GR$&E>W^XsH%Z+EbsYd^+y)gyarNA$y0TR*=~J+P`H hlDO(D=#&0xVf~{MPfd98je&uI!PC{xWt~$(695p8uR;I- literal 8336 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 diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/webmail_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/webmail_159.png index e740483601c0b179ab42958e79bfaa3e58dcc232..6bda291e6eaa746d7ae2961456bd539cb0cfcc6c 100644 GIT binary patch literal 1429 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 literal 6939 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 diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/LightTheme/update_159.png b/CampusAppWP8/CampusAppWP8/Assets/icons/LightTheme/update_159.png index 24875146bf0b1fa4153f905e8f0279311f805984..dcd9a800cc452f0ae4d0068daf4cc22cb26588c3 100644 GIT binary patch delta 1569 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 Date: Mon, 30 Sep 2013 16:04:36 +0200 Subject: [PATCH 06/22] add svgs --- .../DarkTheme/emotions/attention_159.png | Bin 0 -> 3994 bytes .../159x159/DarkTheme/emotions/happy_159.png | Bin 0 -> 4632 bytes .../DarkTheme/emotions/question_159.png | Bin 0 -> 4583 bytes .../159x159/DarkTheme/emotions/sad_159.png | Bin 0 -> 4676 bytes .../159x159/DarkTheme/food/carotte_159.png | Bin 0 -> 3589 bytes .../159x159/DarkTheme/food/chicken_159.png | Bin 0 -> 2563 bytes .../wp8/159x159/DarkTheme/food/fish_159.png | Bin 0 -> 2074 bytes .../wp8/159x159/DarkTheme/food/frei_159.png | Bin 0 -> 1891 bytes .../wp8/159x159/DarkTheme/food/lamb_159.png | Bin 0 -> 1974 bytes .../wp8/159x159/DarkTheme/food/pork_159.png | Bin 0 -> 2448 bytes .../wp8/159x159/DarkTheme/food/steak_159.png | Bin 0 -> 2921 bytes .../159x159/DarkTheme/food/wild dish_159.png | Bin 0 -> 2848 bytes .../DarkTheme/functions/lehrstuehle_159.png | Bin 0 -> 979 bytes .../DarkTheme/optionbuttons/edit_159.png | Bin 0 -> 1975 bytes .../159x159/LightTheme/food/carotte_159.png | Bin 0 -> 3268 bytes .../159x159/LightTheme/food/chicken_159.png | Bin 0 -> 2146 bytes .../wp8/159x159/LightTheme/food/fish_159.png | Bin 0 -> 1845 bytes .../wp8/159x159/LightTheme/food/frei_159.png | Bin 0 -> 1599 bytes .../wp8/159x159/LightTheme/food/lamb_159.png | Bin 0 -> 1612 bytes .../wp8/159x159/LightTheme/food/pork_159.png | Bin 0 -> 2081 bytes .../wp8/159x159/LightTheme/food/steak_159.png | Bin 0 -> 2515 bytes .../159x159/LightTheme/food/wild dish_159.png | Bin 0 -> 2496 bytes .../IconCreator/srcImages/food/carotte.svg | 172 ++++++++++++++++++ .../IconCreator/srcImages/food/chicken.svg | 64 +++++++ .../IconCreator/srcImages/food/fish.svg | 64 +++++++ .../IconCreator/srcImages/food/frei.svg | 63 +++++++ .../IconCreator/srcImages/food/lamb.svg | 64 +++++++ .../IconCreator/srcImages/food/pork.svg | 63 +++++++ .../IconCreator/srcImages/food/steak.svg | 83 +++++++++ .../IconCreator/srcImages/food/wild dish.svg | 64 +++++++ 30 files changed, 637 insertions(+) create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/attention_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/happy_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/question_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/sad_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/carotte_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/chicken_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/fish_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/frei_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/lamb_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/pork_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/steak_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/wild dish_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/lehrstuehle_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/edit_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/carotte_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/chicken_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/fish_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/frei_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/lamb_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/pork_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/steak_159.png create mode 100644 CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/wild dish_159.png create mode 100644 CampusAppWP8/IconCreator/srcImages/food/carotte.svg create mode 100644 CampusAppWP8/IconCreator/srcImages/food/chicken.svg create mode 100644 CampusAppWP8/IconCreator/srcImages/food/fish.svg create mode 100644 CampusAppWP8/IconCreator/srcImages/food/frei.svg create mode 100644 CampusAppWP8/IconCreator/srcImages/food/lamb.svg create mode 100644 CampusAppWP8/IconCreator/srcImages/food/pork.svg create mode 100644 CampusAppWP8/IconCreator/srcImages/food/steak.svg create mode 100644 CampusAppWP8/IconCreator/srcImages/food/wild dish.svg diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/attention_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/attention_159.png new file mode 100644 index 0000000000000000000000000000000000000000..8a744ee0dc78fec2a32961efb864acd847f72d55 GIT binary patch literal 3994 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 Z|3Yo-pS*|$UIqpR22WQ%mvv4FO#o(g%Vhun literal 0 HcmV?d00001 diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/happy_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/happy_159.png new file mode 100644 index 0000000000000000000000000000000000000000..1a434f91131545bae4afc49c2445e9d2704b888d GIT binary patch literal 4632 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 XHZ;{}JN7X!Ffe$!`njxgN@xNAuE-t? literal 0 HcmV?d00001 diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/carotte_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/carotte_159.png new file mode 100644 index 0000000000000000000000000000000000000000..f0627ae44b0614d480ab0bd0821a916d697b929d GIT binary patch literal 3589 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 N22WQ%mvv4FO#lD@?zR8` literal 0 HcmV?d00001 diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/chicken_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/chicken_159.png new file mode 100644 index 0000000000000000000000000000000000000000..99648eb0508eb0d76052a35245376af34fca66a5 GIT binary patch literal 2563 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 literal 0 HcmV?d00001 diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/fish_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/fish_159.png new file mode 100644 index 0000000000000000000000000000000000000000..f024b53860c13503dd654305a8d0e990226c3c7e GIT binary patch literal 2074 zcmeAS@N?(olHy`uVBq!ia0y~yV3-fW9Bd2>49}&xA22X5uqAoByD2gXtV>*?8q03yZjXvbj2Xs8&PyZt4nQmSe7as5< z(9>GQRwuK2iM>~qNlU?s1wWXx6|ChAd@nh9ihEhbU%IX0yV9Ul&~yLvEuNS1RdYEN zd%_~>ba{N9GsmfBdR#iLQtNSvGt=1Wl=q}M)t7Rf`*{@Kc+T;UUs3y<*>8Hu+$E<~ z&-%^wb?5WErSa0w^Lv{BpUOG)nYYU99!#B-H)V^@rNYk3C$syP$a_XfJ5^Ye8eLON z5c{Cdc04RW(!jR#?l$H}S>27yXIQT>oj1St#rQzw%>DB0Ijfi1 zs}#x?L@nAipR1<%<9EH;!B0XsADABSJ+QFw-VgheIiDI?b*D*-=re_f#{5@j-k&-7 z^4HL3!IBS(9x>)xmz%Bqd^hRV&h@zrerp!|JFosO@z%}-Z)~(&ZI(q}Pjr@f_~Pz+ znFN*m)z?mxCB${+Zs3uatI*CI@!sJ+Lq1e z|0c0MPmb~2n}xi7Om){?D-R#guFC(LPTEb!W}D1raK%ZCG(|c@Y-BSmDFc2 z?taBSHUDQrw~Flwi=qmf+p23PZ*jZCJn4nPn?q;b_j_C2@a{7eRarY>OQ(g`Zq)}V zM|auoK5dl8q4?(P%=oASrUxF1&0kgP@L4b9fRoz3mQDLI=jz7REn+{L_u!CN?uWDo z`j$y{jxxrP`bRGR$oK#7Eb88ImN4H9?eg9UzS?V<)Z@8Jr)9&| z3ujh2Jm0?eUHY7liARJx(yb%v-O}c27uW218HfJWpe_sBH?%TLtE2 zP1);msb5>GJV2LU@lHq@V`_ZX%A#El{+)S0xxAv>@SDf3rEi?PUf1+iu9`o&WXT#M zBR=mc#m~D|t$n*-mTIP{YJZ4c>1lDNA1fcVp5OGAPcg;%r>5@oEq=9em(He^9k}$q zphY0e`&ZS;qc#`6{OXx>diCVJllG}+M)#GjpY~;L(&eA~z4F$#3WRw^tvr`E_36im z%dao7MPEBp7pZYjQ1i_;#bs!cyl~V z@AB`j+PGlCY-f&}5#r(^+wW;{M#w|(lFkc&dM6d0~E>6cG9eQDDt54H;PxBblgOw&!)7T2y{d+WJdNA&JX z?ElSP74sFazg<7wF2q%Ds9Ze{ARkFnkY7Ma~?V@MULoB_A0++I#hDt5+`5 zudD)=jly*jH$3Jj^Z1@WHPfU)U-gwlY8BrPp4xv${2!D&c)VrCyqhb%_!7K7HD2Kq z$?&M3*RMCPQWALYxX=Gm z($UVB?*mNZr*Dn_D6Rf}T8Y1`pUNt;4|CT`esub3Iq6*JoY#i&m!hxSj)_-!JLOCI z(f4=1UY}EzaH(`(Sckt??cPVu?P+Osv)D7`0%~NAe?C?7x?=am!)a6ilMmE0ZtFCN V>hxy*&A`CG;OXk;vd$@?2>?sh<5&Oy literal 0 HcmV?d00001 diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/frei_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/frei_159.png new file mode 100644 index 0000000000000000000000000000000000000000..a91223bc9f6cbac3fc77d819de65792a165d02b6 GIT binary patch literal 1891 zcmeAS@N?(olHy`uVBq!ia0y~yV3-fW9Bd2>49}&xA22X5uqAoByDDAl1h2{r01N>@y~CM-r9Zh-Ddsl z_mSDQuRs0XWA&!^T4i0j{r}B+=j*OjsTh+8R!e>0dr-QvIN~_NbjI!jtFA<@actNv1!4Qv&43x1d_KX=89eFqZ`AQp0nUBVEYi8puEATRBkq7!SxxBn195)s(H+? zx-q)#(?4DdyHc~$oEF(mAK$Xwn{M^kAi?&-dBd6ix#!HXTKtqHXI4N%KQs4A<8O@O zjQYMOxIf4g;&M*H)D6%6K~bFV*RkzukiTxeV$UN}#=@oll# zJ-r9Qq0hEzHXL47^Z$(I++DjC%{k6|{!C=W?T-_@_cF|9shj`!d7at9WcvumbNr0| zXKwybcXmp>!D@*Ds}1ZwLi^_1N>x<)JeLc0JQrIma#!wwkWl>8+X4xyA5zv&uA5Oj z`+m=h2h%k^D(h@I__&fQU;4wnO+}&$PYZL~DZk9!yZ+?Pv%Si3)fP%|I%=1+8JBzR zioE1#ocAl(Q{C;z-_~}m3td+jg?{}wa6SLT&a<}4al7|6=$t+iSz)ajDgu?*r#XJJvCv)k8e!*=Xc)S*7$bbq6eB`2Q-UC z?)5h^cb`dAW!h(dr7?JYMfL5wW*g3mvZhy=Z{}UD!z3;`^PrZ4S!PKE*QKSF+g{h- z+1AW-{9MCUuiaM|Kds9B=z1hy^{3{n%{$GM-g(O^t&f_2 zVe;LjrOTIWUAfuhfSBiNCI|>r+ zSyDPF&v)+9WqA`ys$BkPmrjVh`fGzVhegDtFi-bo=Yo{^J*_mAzAfQ1>c92==P#wC z=}WkSpRbsx>M1=tsv@Yl%YTwm(&SC-YO_jWC$GzK&pea3z5k8n;d-CB${STZkGmY% zcE$0V`{Hjklde>sE66OLX?n!hSKnr35|luX`jxXo^(u(F%qeUG-% zwWWN4Ez92hRC#%OC9}$M6cu>4zn3;`3EpkK8?F7x$`3-u1}*pmvR*Wd7Z?2c$gfFTU}1F+IuWnO!}< zc)Q!;?=_P|1nZ}7alASAf9@8Imut3(&b!j|X!4Sd9if*}R~Ao6@Vs_<(;MfIl#3kUFp4Fbn@vpEM`n=ZJ2H{JcxL3Z_C$j_1h;GH)dvYKDc^7 zG-Y-7@(mm{txe$?+u0cR&0O(g-<)6h>$~;lXD^XT%R0Me%HOLeA1OzBtpS{$8WDYY1_xmW{H^ah22v#{B51%CH5-+L<174 eo6Tas<<+nHN^&%2d}Cl>VDNPHb6Mw<&;$Ts5{EJX literal 0 HcmV?d00001 diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/lamb_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/lamb_159.png new file mode 100644 index 0000000000000000000000000000000000000000..1aa58f4d8ef05a663341b02005ffc7962b7f153b GIT binary patch literal 1974 zcmeAS@N?(olHy`uVBq!ia0y~yV3-fW9Bd2>49}&xA22X5uqAoByD$C!kqO&ELj zd|-0B*dN96zFF>{S)BIFe$q^GKq>Pa9v$Ys)8~?sS#~g3xTMN&;Iz=U zp5Dv&fN$A0Rtsb6`#WY#mQ^@;FLPhrx+U!muN$UckvwsXrQo8;IJOX#KS&6{~1%<1@1Th_5_OWr3}mPvI}<|aGDpWq8ver@Xd$L2Q~*}lj< zID1p^)un5nY?r>e%(`KHR>>P0xQ1X<{{8)N)t)~13FVF8@zY5Bx2}UVq);@3kd@a-UXM^Y@xhW-OWz!-zxLw-y zMqu;8AK@Y!9Iigx^55EbpDUktmAlKG`LZcfZW;W%w({=L$xC)l%43b2C7Uv(OHaOF z(h}{>#aEt~PFi=C&(ODU%{93X?z*!gc&75p;|C_aQE1Ni^MrYt*R5qAYtnD8W>?v3tn@9N{iXY2_4wyG zeeX{kef@0hs(TG4bu)af-S|{`?(FY{OG0l(ause|b$4=-$+xLYe}XPmZ!Q*L^UPLy z^!%n{)x{H^7(a)ujlXoFhWC5Zs>|!;&hTCGRW{!(__1lp`?Tj8S86=>Gx(k3yX2d! z?*07o@A)gNCSU*cy<^E#!HxRXCrYF&f2wFI#r1S>tF8^*%DL^|9>=S!9=*0K*Kd6C z?dafLb?tVwmbG_dnCC7%>mwynyKmY`73^7c{*T_tb3rqdC*6}3?2WcrIpdQrL)hwH zfARy%rZw3pXI8rWQMNvj(tH1noUW4Ds;Do&*YEV~`c!24;n)2~r_?$X&P4ShP65%ku=Zyr_NnW zu-?qPWm}DGxObJ3wTts#MQexEr>{r4<*Z%ed^1w&#k)5QYxO|N4^PTFb?%};waQ;Z zYnRujuNSUeay})Y-eV5hV2aOX^PJ4`xxX`zy7(+vmv>`zW2lQ zo$MC-&+{y2xXuvmK4Y*RfV z94b$6uGDtFwSv~I!{&EGm=lUZu2SSF`L_g4Bd=dtm9oB2`l!Ixb{QTz>- z2c{{W{(iFMPCjGV*NGpsOVhW=F)R;yyP5Y{z-Oy=ankjxp1q%hmVV#P;gu1sdiFrvbIct z&WF{DPnB1e=}8M8C_J#t@8dtGQo~7+wGFK%6`qmC#DmwT>lwoJ=1pdO&K1DGz`)?? L>gTe~DWM4f06W(b literal 0 HcmV?d00001 diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/pork_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/pork_159.png new file mode 100644 index 0000000000000000000000000000000000000000..fa8e0dc3a8aa56536366329768c450d4c28cfe01 GIT binary patch literal 2448 zcmeAS@N?(olHy`uVBq!ia0y~yV3-fW9Bd2>49}&xA22X5uqAoByD`T^voH;<_I$Rmh*^q?uc(Ic3_uKYt$I(Vd=H{`}lr z>*BQX`uQo7t#?1SdwynadiuLL#qV||q>&4@1wP4hxUBM)?G2X?`!x-ak)e_PJ!@Def5+X8f>iv&*HAx?g>!Z3(#)Jn7t|Eurh4=gjn+rS#Iq zbG^xolC^dEnOQ5(SuWkLJGo@r65V1s_SeRq>>gDs+C9U!d0din-K+SrZQ6c&-Ipnz zv!B`NT}z(iH+jo0|4#EKmY(l*UfuV+)RlPZPxK}CVtM)3j7!VscK@DHuvTop_7)0=gv~h zjBWiS?opNfE;+;0<5xnf_|Ey~G`8mE9jz7fwsO2Qo?4&6lTz?Vh%6{d&n{?*}#y3_X{7NL_h;EBq#Z(~{bT zn>%kCcEx(#?q@t-E||^!!2Q74N%t;?u0GcI<|O-^V+sCmXPIpg6l9XiS9qp)z;;rd zR_1ZGN4=hrlh<3YTkXp|m{`WTj?s=+hUW~+Irg}`b*0i<&;6`kw{XX726e`Mk6*iN zG8gVwsa)gD!w+|FFAS-rH+-b|+cM3U$H%Pdy%Xa2hMzuNG}_dugy z;qQX_o(^}<=l!d9%qetALes$sw;)%cI{_fDRfu%G$(mfd{H zN@5fD*_uCnIqmr6Hr=ap{x+-aMvTTrjO!T*R0zZe^cwh{-wv;OC;B?(`{JK$nWv1 zYe}xr*2RIAlk@L)J>3_sUg5HaC2z&%{F8G9H?I5gV}{=2((LpHNeL^L%$~AN+tTL} z-^|;grehPYUrlVqmjL*u&zfBVAA1Ef|WzQ^hzI3Ha{SNo;HP2t@`TsZ_Z+7mj z(X|B?j+c(B=IXyJSX$Y&Hh$4HuU|>u*ME6YwDkTJXf@OOx1k?mPKK8X?7e;Ns%`eW??wf> zOFkw&*l@ACKYQ~n@s;Y~pZ11rypt!Ds5rliZ{5!O>$}%UHC#Sv&o(dkZt{(=b2^Z)k{2Y{@uvQX1msOY?Qq4dEYw22gkm-zB)Oz=Kt#j zZ%VA>ukD&JFTjw99o8g3gl#pIzxO4BNw^BmM0A`bm0Ie#yS<4!`>O^G4^)*5!UN7uDi4)_&f! z@AAiGhon5;Yb3p0`|I@EKGyvg7-F2~6ek_5JsK^ii8bB-Ba%Vq;a9yiYdzM#osv|oogjUwxXM5&uR3@O&nDRf&*PKs z-Ll@=V)E;Q$je!`W-fUddDm`wzsr%DrFyfLue9U3od2ECUj1yb%)8{`Gbd)&+@7T8 zEYqTzHlKBw`;jV7cLrN&pY@rhAG{xY>eyjko;+*P+hlX4dDBbGO|2(Nm&LxEC*z)$ zds2EWgPvlopw#8}MTbvTo@0M0n0{0HC2Q2LdU5C5PunRg z-H<7`(dW``k8;gZsj>yE1$izd#^QxOC#(|W1pNbiZk&1X?vnehGd*v2$W@fP)MP5D z$nhM@>D@W=_5bY5-wSxY+Ph1&+bxPHOgtpf^5nPZT;A=bZ?9b{JHL#d*ZIKI1NQ_C z*GDjBJDr?YbCmVo^t4rVwjcO!>`1!SbFtezP0&DF$*-&9Y3-`w2Pyvh4n1As_qZ-P zAc`}w{?ea=aZ${3SkH8H?EkuBU8A|c$#9-$^Jg!7^~oUk{JKz$Kio4U1;w|;bl4^G zx_lCScJVIjqtY|_x%CU&OV==-W8~}V_+1rpe1=It^YcmHlz1okzjQ8L-S}21Y3h=b z2Z~;ut&uxh^I*y%?~_qHm#pOlKN_4}t9SLBz4zv1zGXL$M03_i&Ukx7`lf?w{6nS( z&+M*zo_^_@x^z#q>B`?vHg(*%kP!2leQ9)}>DC>O3(P!j?Ol=Gwd5)9krOm0op5xp$`>!yVQ;f`aG2ZM{ftO9Z6PY~x>f Z!Sf+G(Z3%SF)%PNc)I$ztaD0e0sy`qz@GpB literal 0 HcmV?d00001 diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/steak_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/steak_159.png new file mode 100644 index 0000000000000000000000000000000000000000..d5a0b3b301296d08d9154f882fbb6627e03a0366 GIT binary patch literal 2921 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 ZvRGz|ox3?7F)%PNc)I$ztaD0e0svw~f)fA$ literal 0 HcmV?d00001 diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/lehrstuehle_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/lehrstuehle_159.png new file mode 100644 index 0000000000000000000000000000000000000000..02d15bff1fa214f2cab17d1d9766eb81ad96283d GIT binary patch literal 979 zcmeAS@N?(olHy`uVBq!ia0y~yV3-fW9Bd2>49}&xA22X5uqAoByDwwz^!&V{IgIl%< zs$>W!D|eV}>uPOkRav{B)x*RsP(XEJiv-W9ryFN5m+q~Yz4vx)df7bxojD)R-6{S( zd#+@fu;(NdqR^#F%-h1wFPO+E$8e8Lk5RqB)?xKLZ*Q&}OmCR`Hg7xMxV%C4>gFs@ z26N{2hT!myyi4W>jP*{=k}S|K;Mrl2S~7Vb^E~!#q50ix3>hWI^W~YRr}yMtI)C8w zfp4$g2JRhUFuk>#clelpSHAi?Ae`}rTY1y>&6jG-&KD;5f32I_zI3M;=bed9cB=TR z@7!83r_y5LlY&Y7QQ0BVM~DVL_qCMkc{ z^s@S78J|xDA1y-tR4Y|aMz7s!zq)U<+WQsUp?%z`1;3-b4zSzJn4+7ytdYJkJE?k z^DoH?%Vn?q8)kdv|I5;v%M9;4Kb3x!;r^C9iT`@#`I{>4(b@Jo3G-&gMB6r`eM-%K z>+n@Ty43e8gOvW`U`f1a=Ei#w1$uYq9=N>2_TCOF@#Nn3m#^KrmwAsv#_!XmInO0k zr^ik;v?BpYzCOFeobj^V>6^P}JWna$Z(s6z?xy;G7N^dstQYSMep)i=yIS1u649}&xA22X5uqAoByDBMcbrUWKjc;qUUbj4Lf*Xg2b zh(u6Aijd>QzRHVju`VsHZjK+e#kfSab^grynYDgr-R_EW4+`(iEPf`F{%of4^Y1%r z=RcqMy#9~zW1G)9X-cGkNwW`>voA4B*fCQ!E$y$Pz?)BZxjxsIQ{GP(ck^S0tK;Hp?M&7u8~a)Zsr^;Dr{g4kR8uKaV>cAAC{F18$b!9I`e z*piH7t_}NopF{__^aKSR5O`4b;ClgUlRoW@3#qxp*dW~4FFfg~`-3fNU+?EA{*=?!($i#2$T(H>xv==lA~VKx^A+av zzVzSs-qh{m#k)h`2mANlQpJLl$)D5(>}NmCe=vvb>pY){74MmwH}wa3v0HREG9R{X z5H+co^5_`D{Z7w$r3Y@bSS1(cpZ2`=VA%t2bB1-te2e=xvsbWM=q-HrAZn6ZEz6O0 zTN&fLcZBh4w&gELYG9bb{b#}i3G0UT#)F)t(~n>2oV$|eOpoSnJB0QtF^gh>PKpmx~0Q@ zcAmJvVIXxQB0P=1YUT?&O(Fd)@)e>I*B7jHJg{lTF7M=1_vAD`SFCIF+PP&y#n-CF zoxZnfEQ8YJCr)pR+G$#vYR2IFsXuCua^)M{wW*#bo22_X{S1ECEQ=|z$uIjiu{&H+ zCGG`tg3BS(V@&&9PsIxdzw5qrzl=HjiTvJ*$%&6z?U?!ecU()A+2g1D?p?X=yVl3c z{wx;HFY?%PVYkW|qr?Z?C$`M6iw!-auMqd(pZv8`DQClU{dT-7c<_8z(dn+fSR1AN z)^U699$@9XK0i1-kDIeUbLEUCA^k7BC;RXJN}S55FBfFUsvh@ZUCX|hu;0Ji4PG|Y`JJo=XSoi0+F>l_6D3v5jHsb{k;`A3bx+UBVhu}m|rINc1~G4+4t zi`BO8mP#`me^gewpMCrOj~)-a9=u~KeRkpB%rwuk2}P$(R&pd1IvITt-n=+Hc5k(@ z&mOyks)>c&={ridU3{zd%J$Ndf6Ov_IFqe^HAcD~)lqf){CL4Okm@D9kq6{+)$Y|F zxaxXTTa{^z-$aGgL0gQO$~Sl|-mJT*jPbgt;PNRv1y*^+$4tbQPh>$S=hNrn@++r!HCqQ;e`ClOknB0O zR)_m7`>8E=f@)T(dQaOXbaMv#j{SNcgZ65AAARU|^WN0LPqk9Ta|=El+-vvf4cpv` zd54*drKc6nW0&RNhWbX!eaTZM z9h#duaqHb3n=i4=sn$+POFM9-XYxAn3Yi%%tj#nnAGG#NdRKkNv+vgDh*^i%9===0 z!MR<&{K_BIeaRE~nxki5?33Mbc^CVfN4l3p@{a$IkM`Mhzwvj&#eKi^WqXcYp1tVW zgRrHgcdJrPGH%%9c_?#*%O-Z2{@JBM>Bf00Qkve^d9glBlXd^PV4=`SVFR8U5#AQO zQ#}eBDrF?JX1>{NKWVR#|H@lwY0KFhH=HbYcOea^to_gEm)5mkUN?Lv0|Nttr>mdK II;Vst04(^IuK)l5 literal 0 HcmV?d00001 diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/carotte_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/carotte_159.png new file mode 100644 index 0000000000000000000000000000000000000000..65e38e19f6d1994b45b66cc5c7345df3cc3bcaab GIT binary patch literal 3268 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 JF6*2UngAtD0@(ln literal 0 HcmV?d00001 diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/lamb_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/lamb_159.png new file mode 100644 index 0000000000000000000000000000000000000000..74098f3d8681c704f540cb0281de056f5b14a934 GIT binary patch literal 1612 zcmeAS@N?(olHy`uVBq!ia0y~yV3-fW9Bd2>49}&xA22X5uqAoByDXI#v)>~>dIkciUmNtpKa(1cJ)avTt z(z=z=*p;!Im5b}|goUg@6E7{&RcmSuoHkJ^ZP~YnUxTjqeV=2To;Gi$<$rmb_;v*r9X%lup5}^SexED`ex4$wq(tMnvkYd{Syy}AGm%%CgHr< z`un0kdcU#$FfWic2=KU;)uJpBWg^|MyMgm?PO<&l?tFu1jJw6BRNt2poa^AXjCua{ zA3wbwSUtEaw%?i~!teRwTl`Dzer?ySD>o<*DzGrJgB{=b>#H#_%J zpMT@&hQOWwzjJ-%m@9f9=s{2d&j+9O+fQUqd&HNlR$O*DmhsQcr?0y^e!qC{J*W4R z-AC4|xi*0w-YZI$3IKDwnO<^1$_!;hp_W@Ze(MK4NdUAH_U9z3mLZO5^Ioo*A( zsV(l-^!{>n>yu^kGT$=I5uEG7Ry}!H^~z&u0`^_0y~$h|{8KX+BD`x9Q#t$pN0Pb#xY=XTmK*vQOn*)*FcN2yNawd%R^dqYEZFg~z+)V=)rk6x4K z0j7p*6^%a*oz$LY@FyoH^hn(S_aovy_dar+omqI#!?d(^$S=ZBQU^x)Z{PIuS8edla-P~z^pR$hbFlK01}FLr8FPWU0X z^2`k$nW^5VSE~PJknYs)*z{QYRrS}j4y*TN&o9hpe;Di`zl(p7@XK&eRjkC4{OyVj~`1^CJm-)tyw%ETbngkETJhI--_fg4o_TQkV?|&X+@MjcvQ4bQn z?0LL_d$Dk4)Amkz-&bPMD=)ThU3K_N#ihfMt7gSd&1LapwCnU+GI!Ozz1sw*^PSGJ z`5^Z4V%(_=kxZ`2FYDH<+c;xOPDhnN_m-B3lJska&mO7nn0J<8pW;5_*Am4>Teg>N z(Eecaac<=H8%%R%F5G+dP-V%t7g~?+M>x-_SuG>uS+y&mWcfACXOF_ecg}2ycPW?N zo|2Wh)r75L?hn7U-Z_UPFYJ_Jn5VWc`Lz&t;rH3ACmvXRq&z3~(Vd*LYvxL_*Z9;N zzos}X=&twbt)&VdxIfN~Zs(ByJ1gw3wr9UcX!Yhr!WpZMcgjbul6&aykpC+3yvn7! zdB5G&gA(nTtKHNtY`ObxLFs{~OZ<04-4>YZ5Zuk5VD}-TL`Za-kyWFbxcmX%1Jf^h zhFn?nf@M}*&FqGoOG@9GT-o!2<=0W$BlBa!H0zezhZV1F**InQwbNFYY(-Xk*PPFL zH1Xc7;JdRp|F{;)?&8`ZYtgf?-PpKMz40sSzH;-A>;|UA+FF~VPwqE1&;P&s@$Eg| z-z{PP>{LRbc$`QQgee?~!dW+*hw?%N(BRW+itz zIdplqNAS)~w|Y%>7C)-5Gn@G3%9)c(I)&6HT}wRqD*Qp#1K&$0mM55B`0cT2&5;^@ zHQR3sZzo@iZ*cZL6D%viAa)`8V{ClYwE~$Bwc?idBquDkDiC-%L)ZJ^TE(|U$}$W( z`IGM_%#oSA$jWf`JMMhrkN%AJySGUFEvP)V{Ac)vtoNx_`g`OXHz!^CGk@ZNsY|4r zu1)gOnKmIz!?r(5|If;|Ws5gUUx-(k+vv5^O6!f%8Nj0dqw0wL+mZP WhPj7NbTKe6FnGH9xvX49}&xA22X5uqAoByDKQMb$)#X*!Sw5(;-F`7?W9QBO8{fa($kQ$G6BS+XtETyvRGhWl zbdB@tt8>hG|1|9I$~qD2|CcwP?FawGK;8{Z7E_Xb&u(1owT_?n#OoLJlh`G%tDV|r z_0%r9(OdHDa(Cry&ca8p@(NBy%+|PXDfxXbcSWdY>Ef>1`M;#2(`6X?{HA<-Cu5nX zKF@sh!Z^p8!u7j1mUe#@e)`AboXmM9a|Z72@TsS^wf&O5S@Ut8i>1HzjMs(_yb>HQ zas^wSQ~Lj)!STo{mq_&&_g>C1t>d2)z2;V1yzoD!^~-LSw;flHJI}yBb;9SZ2j(}v zXH=guAz$O_-5+9~{wsT3nxVMw#D0DY{tD9%k&kwV-dtw=ufE!|Qk)^2A-ci;;eyu2 zYW17;o3P>2GobS~YhPuD2pEhH6_#HkS|DSbJ zFWy{YFF3nVJmrL~=N*YD7diC2p3G(XHhqe@uMEpRPMPTs_iDFldzLdTYYcyOV!ljg zjLIZ`^|;`mb89xT|6t;Ku77sBXZT0^Q#0!YH<&*)teX2pS=iD(&>;R|1XFNV_82>6=iR@FZkI@k0~x@L0?vJ%70(2&1?Rvy-~4B z{(OreCMeZ07ismBFyPDr(-)J!1~vN6wEKjWLHM+8fQ&*Sz<6^~yJXQqgYPzveGr1~k@Q7YJwR zm|T$5pX+{+DwlTZTx>;c)hjttm8*t9yqMB zY5Bcc>__P9uSU=6zDt{nf4Q$Rf0xw##woYwp8CW6b4g*`xxaNxZ}Rs3(|G)MgMGg2 zx6tsV@80j{6o}=jRDbBhs9pT-_uOms;=-rb_ijEV_x9@5ADeo1pSC{q*yxjO-z}FC zHD{Ye(%%cqcK^;diV2(WZ`%LBP33L!uJ2ows*j4Ul{vq#GT8EU$CEoxCl;98)Ozq% z^7H*khV|C-6ztY1ip^j1`^a_K*P7qv?%udb=R<}3X4!pzYYd$4o%>Oubbc=DCmv@T z=0B^w|1?*q)n&F>$y;Tg42!(~YI1&4Mc&NvfA8xaxUP*ko%yY2*P@TfQU>ii&NZ@r zXUadZ;cuwR(O7?-Q}E7sDDZxVYxOmu2|MZ}Nvko}M|oR_h;A471Gajr*n+ z@SKgDm?gd0`|i3Nhf1qteZyZ%Ho3<>e&K(mJ}JH9k9(?B!2EUo z1Ib0vOW!_Zo06_>ShwN6NuX!}*Vp@@e#X_QmW!Wll403*?9Tj@fYx_Q?g{Tx44ig4 zTj#jcC0|_$NneSz8+Sc>tgg-}I&;mG>t&BDzj!@3DAi|wP3`1=nQc8gECQ!hvsc_X zd_+F(BI9PQ7gnz_E81twy}5P5izTv03g4@X*@rXx1fGw5X4`2r$G+k5TjgsLSAIS@ zY1a>i=KPv?PnrL-y85?HoFTrNEy^LLlkMh@Nx{tZQ5Oxr32JluObhf}b#A6ee7tJz zo7A#3w^R)Mx4%hVllsk_#grv4#h_RJ=Fy;UuYz}X^nX+hp&OWrng3Z;qkn}89#h^JFMTzsy?Y{*jd{qm2|q(QZ&?LpS@b&<=5X!E+64b z%3E(PqWnzf(Z}GMz3XkeQkz~dot&I3zAd{}FHI4;|J#wtsH#-M%Y)_;;j^yHm1Y?(JNa zy8UbW3~Q5DzAO&D9Od7w@i>`SYyWKx|D3 eu2Y5nv(`IhZ#^#dFq(mZfx*+&&t;ucLK6U}`|?Qu literal 0 HcmV?d00001 diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/steak_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/steak_159.png new file mode 100644 index 0000000000000000000000000000000000000000..134e5c778319978d02d16888d7c49b2e4b43bb74 GIT binary patch literal 2515 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 literal 0 HcmV?d00001 diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/wild dish_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/wild dish_159.png new file mode 100644 index 0000000000000000000000000000000000000000..eaaea78b2bb263d23b031b755ff104ea31aeae4c GIT binary patch literal 2496 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 literal 0 HcmV?d00001 diff --git a/CampusAppWP8/IconCreator/srcImages/food/carotte.svg b/CampusAppWP8/IconCreator/srcImages/food/carotte.svg new file mode 100644 index 00000000..ae2d87ce --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/food/carotte.svg @@ -0,0 +1,172 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CampusAppWP8/IconCreator/srcImages/food/chicken.svg b/CampusAppWP8/IconCreator/srcImages/food/chicken.svg new file mode 100644 index 00000000..d11621f7 --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/food/chicken.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/CampusAppWP8/IconCreator/srcImages/food/fish.svg b/CampusAppWP8/IconCreator/srcImages/food/fish.svg new file mode 100644 index 00000000..88d93253 --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/food/fish.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/CampusAppWP8/IconCreator/srcImages/food/frei.svg b/CampusAppWP8/IconCreator/srcImages/food/frei.svg new file mode 100644 index 00000000..49f0ebd5 --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/food/frei.svg @@ -0,0 +1,63 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/CampusAppWP8/IconCreator/srcImages/food/lamb.svg b/CampusAppWP8/IconCreator/srcImages/food/lamb.svg new file mode 100644 index 00000000..24678b61 --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/food/lamb.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/CampusAppWP8/IconCreator/srcImages/food/pork.svg b/CampusAppWP8/IconCreator/srcImages/food/pork.svg new file mode 100644 index 00000000..3ae39ccf --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/food/pork.svg @@ -0,0 +1,63 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/CampusAppWP8/IconCreator/srcImages/food/steak.svg b/CampusAppWP8/IconCreator/srcImages/food/steak.svg new file mode 100644 index 00000000..52c59ba9 --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/food/steak.svg @@ -0,0 +1,83 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/CampusAppWP8/IconCreator/srcImages/food/wild dish.svg b/CampusAppWP8/IconCreator/srcImages/food/wild dish.svg new file mode 100644 index 00000000..1be0be02 --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/food/wild dish.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + + + + + + + + + + From 8527f657fc179fbacf98aadff22b9047482d1be2 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Mon, 30 Sep 2013 18:43:40 +0200 Subject: [PATCH 07/22] end day --- .../CampusAppDLL/Model/Campusmap/MapModel.cs | 3 + .../CampusAppWP8/Api/GeoApi/PisApi.cs | 6 +- .../CampusAppWP8/Api/GeoApi/PssApi.cs | 4 +- .../CampusAppWP8/Api/GeoApi/SpsApi.cs | 3 +- .../CampusAppWP8/Api/Lecture/LectureApi.cs | 1 + .../Api/Person/PersonSearchApi.cs | 1 + .../Feed/Departments/DepartmentFeed.cs | 1 + .../CampusAppWP8/Feed/Events/EventFeed.cs | 1 + .../CampusAppWP8/Feed/Exams/ExamFeed.cs | 1 + .../CampusAppWP8/Feed/Link/ClubLinkFeed.cs | 1 + .../CampusAppWP8/Feed/Link/CommonLinkFeed.cs | 1 + .../CampusAppWP8/Feed/Mensa/MensaFeed.cs | 1 + .../CampusAppWP8/Feed/News/NewsFeed.cs | 1 + .../Feed/Openinghours/OpeninghoursFeed.cs | 1 + .../Feed/StudentCouncil/StudentCouncilFeed.cs | 1 + .../Departments/DepartmentFavoriteFile.cs | 1 + .../CampusAppWP8/File/Exams/ExamFile.cs | 4 +- .../CampusAppWP8/File/Places/PlacesFile.cs | 2 +- .../CampusAppWP8/Model/BinaryModel.cs | 5 +- CampusAppWP8/CampusAppWP8/Model/MainModel.cs | 60 ++++--------------- CampusAppWP8/CampusAppWP8/Model/XmlModel.cs | 15 +++-- CampusAppWP8/CampusAppWP8/Utility/File.cs | 17 ++---- .../CampusAppWP8/Utility/Utilities.cs | 7 ++- .../CampusAppWPortalLib8.csproj | 5 ++ .../CampusAppWPortalLib8/Model/ForcesTypes.cs | 21 +++++++ .../CampusAppWPortalLib8/Model/IMainModel.cs | 48 +++++++++++++++ .../CampusAppWPortalLib8/Model/IXmlModel.cs | 27 +++++++++ .../CampusAppWPortalLib8/Model/ModelTypes.cs | 34 +++++++++++ .../Utility/AbstractFile.cs | 52 ++++++++++++++++ 29 files changed, 243 insertions(+), 82 deletions(-) create mode 100644 CampusAppWP8/CampusAppWPortalLib8/Model/ForcesTypes.cs create mode 100644 CampusAppWP8/CampusAppWPortalLib8/Model/IMainModel.cs create mode 100644 CampusAppWP8/CampusAppWPortalLib8/Model/IXmlModel.cs create mode 100644 CampusAppWP8/CampusAppWPortalLib8/Model/ModelTypes.cs create mode 100644 CampusAppWP8/CampusAppWPortalLib8/Utility/AbstractFile.cs diff --git a/CampusAppWP8/CampusAppDLL/Model/Campusmap/MapModel.cs b/CampusAppWP8/CampusAppDLL/Model/Campusmap/MapModel.cs index 50edaf3c..c540c414 100644 --- a/CampusAppWP8/CampusAppDLL/Model/Campusmap/MapModel.cs +++ b/CampusAppWP8/CampusAppDLL/Model/Campusmap/MapModel.cs @@ -8,6 +8,7 @@ namespace CampusAppDLL.Model.Campusmap { using CampusAppDLL.Model.GeoDb; + using CampusAppDLL.Utility; using System; /// @@ -41,6 +42,8 @@ namespace CampusAppDLL.Model.Campusmap /// Stubbfel, 19.08.2013. protected virtual void LoadSpatials(string xmlFilePath) { + SpsModel model = XmlManager.DeserializationFileToModel(xmlFilePath); + this.Spatial = model; } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs index 958ea718..ed6af279 100644 --- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs @@ -8,12 +8,12 @@ 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; + using System.Collections.Generic; /// Pis api. /// Stubbfel, 09.09.2013. diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs index 7ff2444c..a018a069 100644 --- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs @@ -8,12 +8,12 @@ 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; + using System.Collections.Generic; /// Pss api. /// Stubbfel, 09.09.2013. diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs index 2a0988ef..02a90600 100644 --- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs @@ -13,7 +13,8 @@ namespace CampusAppWP8.Api.GeoApi using CampusAppWP8.Model.Utility; using CampusAppWP8.Resources; using CampusAppWP8.Utility; - using CampusAppWPortalLib8.Model.Utility; + using CampusAppWPortalLib8.Model.Utility; + using CampusAppWPortalLib8.Model; /// /// Class for SPSAPI diff --git a/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs b/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs index bf49bb08..3a13bb3d 100644 --- a/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs @@ -10,6 +10,7 @@ namespace CampusAppWP8.Api.Lecture using CampusAppWP8.Model; using CampusAppWP8.Model.Lecture; using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model; /// /// Class for the feed of the Lecture diff --git a/CampusAppWP8/CampusAppWP8/Api/Person/PersonSearchApi.cs b/CampusAppWP8/CampusAppWP8/Api/Person/PersonSearchApi.cs index 50ab4ef2..a982fb99 100644 --- a/CampusAppWP8/CampusAppWP8/Api/Person/PersonSearchApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/Person/PersonSearchApi.cs @@ -11,6 +11,7 @@ namespace CampusAppWP8.Api.Person using CampusAppWP8.Model; using CampusAppWP8.Model.Person; using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model; /// Person search api. /// Stubbfel, 05.09.2013. diff --git a/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFeed.cs index 40733f3a..0aca15ba 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFeed.cs @@ -13,6 +13,7 @@ namespace CampusAppWP8.Feed.Departments using CampusAppWP8.Model.Departments; using CampusAppWP8.Resources; using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Model; /// /// Feed class for the department information. diff --git a/CampusAppWP8/CampusAppWP8/Feed/Events/EventFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Events/EventFeed.cs index f132c4f2..4e98bba6 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Events/EventFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Events/EventFeed.cs @@ -13,6 +13,7 @@ namespace CampusAppWP8.Feed.Events using CampusAppWP8.Resources; using CampusAppWP8.Utility; using CampusAppWPortalLib8.Model.RSS; + using CampusAppWPortalLib8.Model; /// /// Event Feed. diff --git a/CampusAppWP8/CampusAppWP8/Feed/Exams/ExamFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Exams/ExamFeed.cs index 474b74f2..3d98da26 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Exams/ExamFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Exams/ExamFeed.cs @@ -12,6 +12,7 @@ namespace CampusAppWP8.Feed.Exams using CampusAppWP8.Model.Exams; using CampusAppWP8.Resources; using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Model; /// Exam feed. /// Stubbfel, 02.09.2013. diff --git a/CampusAppWP8/CampusAppWP8/Feed/Link/ClubLinkFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Link/ClubLinkFeed.cs index 98d1c57c..d48aa593 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Link/ClubLinkFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Link/ClubLinkFeed.cs @@ -13,6 +13,7 @@ namespace CampusAppWP8.Feed.Link using CampusAppWP8.Model.Link; using CampusAppWP8.Resources; using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Model; /// /// This Class is for ClubLinkFeeds diff --git a/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs index dbdc8e3d..20fd7b67 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs @@ -13,6 +13,7 @@ namespace CampusAppWP8.Feed.Link using CampusAppWP8.Model.Link; using CampusAppWP8.Resources; using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Model; /// /// This Class is for CommonLinkFeeds diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs index ff79851f..6f117f4a 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs @@ -11,6 +11,7 @@ namespace CampusAppWP8.Feed.Mensa using System.IO; using CampusAppWP8.Model; using CampusAppWPortalLib8.Model.Mensa; + using CampusAppWPortalLib8.Model; /// /// This Class is for MensaFeeds diff --git a/CampusAppWP8/CampusAppWP8/Feed/News/NewsFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/News/NewsFeed.cs index 89a5ae4a..2c1edf66 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/News/NewsFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/News/NewsFeed.cs @@ -13,6 +13,7 @@ namespace CampusAppWP8.Feed.News using CampusAppWP8.Resources; using CampusAppWP8.Utility; using CampusAppWPortalLib8.Model.RSS; + using CampusAppWPortalLib8.Model; /// /// News Feed. diff --git a/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs index b84ebc33..9ee3a87c 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs @@ -13,6 +13,7 @@ namespace CampusAppWP8.Feed.Openinghours using CampusAppWP8.Model.Openinghours; using CampusAppWP8.Resources; using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Model; /// /// This Class is for MesaFeeds diff --git a/CampusAppWP8/CampusAppWP8/Feed/StudentCouncil/StudentCouncilFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/StudentCouncil/StudentCouncilFeed.cs index 91d3fe4c..abd7d900 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/StudentCouncil/StudentCouncilFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/StudentCouncil/StudentCouncilFeed.cs @@ -13,6 +13,7 @@ namespace CampusAppWP8.Feed.StudentCouncil using CampusAppWP8.Model.StudentCouncil; using CampusAppWP8.Resources; using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Model; /// /// This Class is for StudentCouncilFeed diff --git a/CampusAppWP8/CampusAppWP8/File/Departments/DepartmentFavoriteFile.cs b/CampusAppWP8/CampusAppWP8/File/Departments/DepartmentFavoriteFile.cs index 7d7e3861..ea7d1511 100644 --- a/CampusAppWP8/CampusAppWP8/File/Departments/DepartmentFavoriteFile.cs +++ b/CampusAppWP8/CampusAppWP8/File/Departments/DepartmentFavoriteFile.cs @@ -11,6 +11,7 @@ namespace CampusAppWP8.File.Departments using CampusAppWP8.Model; using CampusAppWP8.Model.Departments; using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model; /// /// Feed object to handle favorite department feeds. diff --git a/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs b/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs index a247b587..2e7e84b0 100644 --- a/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs +++ b/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs @@ -30,7 +30,7 @@ namespace CampusAppWP8.File.Exams /// Filename of the file. /// URL of the document. public ExamFile(string fileName, string url) - : base(ModelType.FileAndFeed, fileName, url) + : base(CampusAppWPortalLib8.Model.ModelType.FileAndFeed, fileName, url) { this.IsFileUpToDateOnLoad += new IsFileUpToDate(this.CheckIsFileUpToDate); this.IsModelUpToDateOnLoad += new IsModelUpToDate(this.CheckIsModelUpToDate); @@ -50,7 +50,7 @@ namespace CampusAppWP8.File.Exams { if (this.storageFile == null) { - this.storageFile = await this.file.AsStorageFile(); + this.storageFile = await ((CampusAppWP8.Utility.File)(this.file)).AsStorageFile(); } if (this.storageFile != null) diff --git a/CampusAppWP8/CampusAppWP8/File/Places/PlacesFile.cs b/CampusAppWP8/CampusAppWP8/File/Places/PlacesFile.cs index 58991d42..e6d2945a 100644 --- a/CampusAppWP8/CampusAppWP8/File/Places/PlacesFile.cs +++ b/CampusAppWP8/CampusAppWP8/File/Places/PlacesFile.cs @@ -22,7 +22,7 @@ namespace CampusAppWP8.File.Places /// Initializes a new instance of the PlacesFile class. /// Stubbfel, 09.09.2013. public PlacesFile() - : base(ModelType.File, Constants.FilePlace_AllPlaces) + : base(CampusAppWPortalLib8.Model.ModelType.File, Constants.FilePlace_AllPlaces) { this.OnFailedFile += new OnFailed(this.FallBackLoad); this.IsFileUpToDateOnLoad += new IsFileUpToDate(this.CheckIsFileUpToDate); diff --git a/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs b/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs index a372e9d9..24a2e809 100644 --- a/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs @@ -6,6 +6,7 @@ // 03.09.2013 //---------------------------------------------------------------------- +using CampusAppWPortalLib8.Model; namespace CampusAppWP8.Model { /// Binary model. @@ -41,7 +42,7 @@ namespace CampusAppWP8.Model /// Stubbfel, 03.09.2013. /// Information describing the model. /// true if it succeeds, false if it fails. - protected override bool DeserializeModel(byte[] modelData) + public override bool DeserializeModel(byte[] modelData) { bool retValue = true; @@ -60,7 +61,7 @@ namespace CampusAppWP8.Model /// Gets the serialize model. /// Stubbfel, 03.09.2013. /// an byte Array. - protected override byte[] SerializeModel() + public override byte[] SerializeModel() { return this.Model; } diff --git a/CampusAppWP8/CampusAppWP8/Model/MainModel.cs b/CampusAppWP8/CampusAppWP8/Model/MainModel.cs index fb55ccf4..c87bf18c 100644 --- a/CampusAppWP8/CampusAppWP8/Model/MainModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/MainModel.cs @@ -8,7 +8,9 @@ namespace CampusAppWP8 { using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Model; using CampusAppWPortalLib8.Model.Utility; + using CampusAppWPortalLib8.Utility; using System; using System.Collections.Generic; using System.IO; @@ -18,7 +20,7 @@ namespace CampusAppWP8 /// Base model io handling class. /// /// model type - public abstract class MainModel + public abstract class MainModel : IMainModel { #region Member @@ -182,53 +184,11 @@ namespace CampusAppWP8 /// Callback pointer, for checking if model is up to date at saving. /// (currently unused) /// + #pragma warning disable 0067 public event IsModelUpToDate IsModelUpToDateOnSave = null; #endregion - #region Enum - - /// - /// Specifies the I/O type of the model. - /// - public enum ModelType - { - /// - /// Invalid/unset state. - /// - INVALID = 0, - - /// - /// File only (01). - /// - File = 1, - - /// - /// Feed only (10). - /// - Feed = 2, - - /// - /// File and feed (11). - /// - FileAndFeed = 3 - } - - /// Values that represent ForceType for load function. - public enum ForceType - { - /// An enumeration constant representing the invalid/default/unset option. - INVALID = 0, - - /// An enumeration constant representing the force file option. - FORCE_FILE = 1, - - /// An enumeration constant representing the force web option. - FORCE_WEB = 2 - } - - #endregion - #region Property /// @@ -436,22 +396,22 @@ namespace CampusAppWP8 this.paramizedUri = null; } - #endregion - - #region protected - /// /// Abstract declaration of the model deserialize function. /// /// model data as byte array /// true, is succeeded - protected abstract bool DeserializeModel(byte[] modelData); + public abstract bool DeserializeModel(byte[] modelData); /// /// Abstract declaration of the model serialize function. /// /// model data as byte array - protected abstract byte[] SerializeModel(); + public abstract byte[] SerializeModel(); + + #endregion + + #region protected /// /// Check if the model io type is file. diff --git a/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs b/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs index 27d6108a..83c936ad 100644 --- a/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs @@ -9,12 +9,13 @@ namespace CampusAppWP8.Model { using System.Text; using CampusAppWPortalLib8.Utility; + using CampusAppWPortalLib8.Model; /// /// Xml model io handler class. /// /// model type - public abstract class XmlModel : MainModel + public abstract class XmlModel : MainModel, IXmlModel { #region Constructor @@ -44,19 +45,23 @@ namespace CampusAppWP8.Model #endregion - #region Method + #region Property /// /// Gets or sets for the name of the root-tag /// - protected string ValidRootName { get; set; } + public string ValidRootName { get; set; } + + #endregion + + #region Method /// /// Create the model from a xml byte array. /// /// model data /// true, if succeeded - protected override bool DeserializeModel(byte[] modelData) + public override bool DeserializeModel(byte[] modelData) { bool retValue = true; @@ -79,7 +84,7 @@ namespace CampusAppWP8.Model /// Serializes the model to a byte array. /// /// model data - protected override byte[] SerializeModel() + public override byte[] SerializeModel() { byte[] retValue = null; diff --git a/CampusAppWP8/CampusAppWP8/Utility/File.cs b/CampusAppWP8/CampusAppWP8/Utility/File.cs index d49ee632..7b816090 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/File.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/File.cs @@ -17,7 +17,7 @@ namespace CampusAppWP8.Utility /// /// File class. /// - public class File + public class File : AbstractFile { #region Member @@ -45,15 +45,6 @@ namespace CampusAppWP8.Utility #endregion - #region Events - - /// - /// Delegation of the write callback function prototype. - /// - public delegate void WriteCallbackFunc(); - - #endregion - #region Method #region public @@ -61,7 +52,7 @@ namespace CampusAppWP8.Utility /// Read data from file to a string. /// Stubbfel, 03.09.2013. /// data string. - public byte[] ReadFile() + public override byte[] ReadFile() { byte[] retValue = null; @@ -78,7 +69,7 @@ namespace CampusAppWP8.Utility /// data byte array. /// callback function, called after writing is done. /// callback function, called when writing failed. - public void WriteFile(byte[] data, WriteCallbackFunc onSavedCallback, WriteCallbackFunc onFailedCallback) + public override void WriteFile(byte[] data, WriteCallbackFunc onSavedCallback, WriteCallbackFunc onFailedCallback) { Thread th = new Thread(delegate() { this.WriteAsync(data, onSavedCallback, onFailedCallback); }); th.Start(); @@ -98,7 +89,7 @@ namespace CampusAppWP8.Utility /// Check if a file is existing. /// /// true, if file exists, otherwise false - public bool Exist() + public override bool Exist() { return this.GetFileInfo().Exists; } diff --git a/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs b/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs index 7d86ac7a..d786d7a8 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs @@ -18,6 +18,7 @@ namespace CampusAppWP8.Utility using CampusAppWP8.Resources; using Microsoft.Phone.Net.NetworkInformation; using CampusAppWPortalLib8.Utility; + using CampusAppWPortalLib8.Model; /// /// Collection of utility functions. @@ -347,15 +348,15 @@ namespace CampusAppWP8.Utility /// Stubbfel, 27.08.2013. /// Generic type parameter. /// The load modus< t> - public static MainModel.ForceType GetLoadModus() + public static ForceType GetLoadModus() { if (Settings.AppSetting.OnlyWifi && !Settings.AppSetting.WifiEnable) { - return MainModel.ForceType.FORCE_FILE; + return ForceType.FORCE_FILE; } else { - return MainModel.ForceType.INVALID; + return ForceType.INVALID; } } diff --git a/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj b/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj index 409d1953..5e82722f 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj +++ b/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj @@ -33,14 +33,18 @@ 4 + + + + AppResources.resx @@ -54,6 +58,7 @@ + diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/ForcesTypes.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/ForcesTypes.cs new file mode 100644 index 00000000..5bfd2377 --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/ForcesTypes.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CampusAppWPortalLib8.Model +{ + /// Values that represent ForceType for load function. + public enum ForceType + { + /// An enumeration constant representing the invalid/default/unset option. + INVALID = 0, + + /// An enumeration constant representing the force file option. + FORCE_FILE = 1, + + /// An enumeration constant representing the force web option. + FORCE_WEB = 2 + } +} diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/IMainModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/IMainModel.cs new file mode 100644 index 00000000..154af71c --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/IMainModel.cs @@ -0,0 +1,48 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 05.07.2013 +//----------------------------------------------------------------------------- +using CampusAppWPortalLib8.Model; +namespace CampusAppWPortalLib8.Utility +{ + /// + /// Base model io handling class. + /// + /// model type + public interface IMainModel + { + /// + /// Gets or sets the Model. + /// + T Model { get; set; } + + /// + /// Load the data if necessary, from web or from file, regarding if + /// the file data is up to date. + /// + /// if set/not invalid/not default, force to load from web or file + void LoadData(ForceType force = ForceType.INVALID); + + /// + /// Save the model data if necessary. + /// + /// force saving. DEFAULT: false + void SaveData(bool force = false); + + /// + /// Abstract declaration of the model deserialize function. + /// + /// model data as byte array + /// true, is succeeded + bool DeserializeModel(byte[] modelData); + + /// + /// Abstract declaration of the model serialize function. + /// + /// model data as byte array + byte[] SerializeModel(); + } +} \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/IXmlModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/IXmlModel.cs new file mode 100644 index 00000000..2543b356 --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/IXmlModel.cs @@ -0,0 +1,27 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 05.07.2013 +//----------------------------------------------------------------------------- +namespace CampusAppWPortalLib8.Model +{ + using CampusAppWPortalLib8.Utility; + + /// + /// Xml model io handler class. + /// + /// model type + public interface IXmlModel + { + #region Property + + /// + /// Gets or sets for the name of the root-tag + /// + string ValidRootName { get; set; } + + #endregion + } +} \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/ModelTypes.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/ModelTypes.cs new file mode 100644 index 00000000..9964b4e3 --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/ModelTypes.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CampusAppWPortalLib8.Model +{ + /// + /// Specifies the I/O type of the model. + /// + public enum ModelType + { + /// + /// Invalid/unset state. + /// + INVALID = 0, + + /// + /// File only (01). + /// + File = 1, + + /// + /// Feed only (10). + /// + Feed = 2, + + /// + /// File and feed (11). + /// + FileAndFeed = 3 + } +} diff --git a/CampusAppWP8/CampusAppWPortalLib8/Utility/AbstractFile.cs b/CampusAppWP8/CampusAppWPortalLib8/Utility/AbstractFile.cs new file mode 100644 index 00000000..0724f50e --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Utility/AbstractFile.cs @@ -0,0 +1,52 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 03.05.2013 +//----------------------------------------------------------------------------- +namespace CampusAppWPortalLib8.Utility +{ + /// + /// File class. + /// + public abstract class AbstractFile + { + #region Events + + /// + /// Delegation of the write callback function prototype. + /// + public delegate void WriteCallbackFunc(); + + #endregion + + #region Method + + #region public + + /// Read data from file to a string. + /// Stubbfel, 03.09.2013. + /// data string. + public abstract byte[] ReadFile(); + + /// Write bytes to the file. + /// Stubbfel, 03.09.2013. + /// data byte array. + /// callback function, called after writing is done. + /// callback function, called when writing failed. + public abstract void WriteFile(byte[] data, WriteCallbackFunc onSavedCallback, WriteCallbackFunc onFailedCallback); + + /// + /// Check if a file is existing. + /// + /// true, if file exists, otherwise false + public abstract bool Exist(); + + + #endregion + + + #endregion + } +} \ No newline at end of file From ca9eab8bd57073d98859e9f1b3cabbe53b25db8a Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 1 Oct 2013 11:36:50 +0200 Subject: [PATCH 08/22] add abstractMainModel --- .../CampusAppWP8/File/Exams/ExamFile.cs | 4 +- .../CampusAppWP8/Model/BinaryModel.cs | 4 +- CampusAppWP8/CampusAppWP8/Model/MainModel.cs | 556 +++-------------- CampusAppWP8/CampusAppWP8/Model/XmlModel.cs | 4 +- .../DepartmentFavoritePage.xaml.cs | 8 +- .../Departments/DepartmentIndexPage.xaml.cs | 6 +- .../Pages/Departments/DepartmentPage.xaml.cs | 12 +- .../Pages/Events/EventPage.xaml.cs | 6 +- .../CampusAppWP8/Pages/News/NewsPage.xaml.cs | 6 +- .../Openinghours/OpeninghoursPage.xaml.cs | 4 +- CampusAppWP8/CampusAppWP8/Utility/File.cs | 10 +- .../CampusAppWP8/Utility/HttpRequest.cs | 36 +- .../CampusAppWPortalLib8.csproj | 2 +- .../Model/AbstractMainModel.cs | 577 ++++++++++++++++++ .../CampusAppWPortalLib8/Model/IMainModel.cs | 48 -- .../CampusAppWPortalLib8/Settings.StyleCop | 1 + 16 files changed, 711 insertions(+), 573 deletions(-) create mode 100644 CampusAppWP8/CampusAppWPortalLib8/Model/AbstractMainModel.cs delete mode 100644 CampusAppWP8/CampusAppWPortalLib8/Model/IMainModel.cs diff --git a/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs b/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs index 2e7e84b0..d5334565 100644 --- a/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs +++ b/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs @@ -50,7 +50,7 @@ namespace CampusAppWP8.File.Exams { if (this.storageFile == null) { - this.storageFile = await ((CampusAppWP8.Utility.File)(this.file)).AsStorageFile(); + this.storageFile = await ((CampusAppWP8.Utility.File)(this.File)).AsStorageFile(); } if (this.storageFile != null) @@ -66,7 +66,7 @@ namespace CampusAppWP8.File.Exams /// Stubbfel, 03.09.2013. public void SaveAndLaunchFile() { - if (this.file.Exist()) + if (this.File.Exist()) { this.LaunchFile(); } diff --git a/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs b/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs index 24a2e809..9aa6e9b3 100644 --- a/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs @@ -42,7 +42,7 @@ namespace CampusAppWP8.Model /// Stubbfel, 03.09.2013. /// Information describing the model. /// true if it succeeds, false if it fails. - public override bool DeserializeModel(byte[] modelData) + protected override bool DeserializeModel(byte[] modelData) { bool retValue = true; @@ -61,7 +61,7 @@ namespace CampusAppWP8.Model /// Gets the serialize model. /// Stubbfel, 03.09.2013. /// an byte Array. - public override byte[] SerializeModel() + protected override byte[] SerializeModel() { return this.Model; } diff --git a/CampusAppWP8/CampusAppWP8/Model/MainModel.cs b/CampusAppWP8/CampusAppWP8/Model/MainModel.cs index c87bf18c..74abbcac 100644 --- a/CampusAppWP8/CampusAppWP8/Model/MainModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/MainModel.cs @@ -5,62 +5,20 @@ // fiedlchr // 05.07.2013 //----------------------------------------------------------------------------- -namespace CampusAppWP8 +namespace CampusAppWP8.Model { - using CampusAppWP8.Utility; - using CampusAppWPortalLib8.Model; - using CampusAppWPortalLib8.Model.Utility; - using CampusAppWPortalLib8.Utility; using System; - using System.Collections.Generic; using System.IO; using System.Net; - + using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Model; + /// /// Base model io handling class. /// /// model type - public abstract class MainModel : IMainModel + public abstract class MainModel : AbstractMainModel { - #region Member - - /// - /// File object. - /// - protected CampusAppWP8.Utility.File file = null; - - /// - /// Model io type. - /// - private ModelType modelType; - - /// - /// Model object. - /// - private T model = default(T); - - /// - /// Web object. - /// - private HttpRequest api = null; - - /// - /// Filename of saved data. - /// - private string fileName = string.Empty; - - /// - /// Url of the feed data. - /// - private Uri httpApiUri = null; - - /// - /// Parameterized uri of the feed. - /// - private Uri paramizedUri = null; - - #endregion - #region Constructor /// @@ -70,8 +28,8 @@ namespace CampusAppWP8 /// name of the file /// url of the feed public MainModel(ModelType modelType, string fileName, string url) + : base(modelType, fileName, url) { - this.Init(modelType, fileName, url); } /// @@ -80,42 +38,14 @@ namespace CampusAppWP8 /// Model IO type /// name of the file or the url of the feed public MainModel(ModelType modelType, string sourceName) + : base(modelType, sourceName) { - if (modelType == ModelType.File) - { - this.Init(modelType, sourceName, string.Empty); - } - else if (modelType == ModelType.Feed) - { - this.Init(modelType, string.Empty, sourceName); - } - else - { - throw new NotSupportedException("Wrong constructor was called for Feed and File support."); - } } #endregion #region Events - /// - /// Delegate of the OnIO callback function. - /// - public delegate void OnIO(); - - /// - /// Delegate of the OnFailed(File/Web) callback function. - /// - public delegate void OnFailed(); - - /// - /// Delegate of the IsModelUpToDate callback function. - /// - /// data model - /// true, model is up to date - public delegate bool IsModelUpToDate(T model); - /// /// Delegate of the IsFileUpToDate callback function. /// @@ -124,47 +54,6 @@ namespace CampusAppWP8 /// true, is file is up to date public delegate bool IsFileUpToDate(T model, FileInfo fileInfo); - /// - /// Callback pointer, called before loading. - /// - public event OnIO OnLoading = null; - - /// - /// Callback pointer, called after loading. - /// - public event OnIO OnLoaded = null; - - /// - /// Callback pointer, called before saving. - /// - public event OnIO OnSaving = null; - - /// - /// Callback pointer, called after saving. - /// - public event OnIO OnSaved = null; - - /// - /// Callback pointer, called after failed file loading. - /// - public event OnFailed OnFailedFile = null; - - /// - /// Callback pointer, called after failed web loading. - /// - public event OnFailed OnFailedWeb = null; - - /// - /// Callback pointer, called after failed file or web loading, if there - /// is no specialized onFailed callback set. - /// - public event OnFailed OnFailedLoad = null; - - /// - /// Callback pointer, called after failed saving data to file. - /// - public event OnFailed OnFailedSave = null; - /// /// Callback pointer, for checking if file is up to date at loading. /// @@ -175,272 +64,123 @@ namespace CampusAppWP8 /// public event IsFileUpToDate IsFileUpToDateOnSave = null; - /// - /// Callback pointer, for checking if model is up to date at loading. - /// - public event IsModelUpToDate IsModelUpToDateOnLoad = null; - - /// - /// Callback pointer, for checking if model is up to date at saving. - /// (currently unused) - /// - #pragma warning disable 0067 - public event IsModelUpToDate IsModelUpToDateOnSave = null; - #endregion - #region Property + #region property /// - /// Gets or sets the Model. + /// Gets or sets the file /// - public T Model + public new CampusAppWP8.Utility.File File { get { - return this.model; + return (CampusAppWP8.Utility.File)base.File; } - set + protected set { - this.model = value; + base.File = value; } } + /// + /// Gets or sets the api + /// + public new HttpRequest Api + { + get + { + return (HttpRequest)base.Api; + } + + protected set + { + base.Api = value; + } + } #endregion #region Method - #region public - - /// - /// Forces a update from web. - /// - public void ForceWebUpdate() - { - this.LoadData(ForceType.FORCE_WEB); - } - - /// - /// Forces a update from file. - /// - public void ForceReadFile() - { - this.LoadData(ForceType.FORCE_FILE); - } - - /// - /// Load the data if necessary, from web or from file, regarding if - /// the file data is up to date. - /// - /// if set/not invalid/not default, force to load from web or file - public void LoadData(ForceType force = ForceType.INVALID) - { - this.RunOnIOCallback(this.OnLoading); - - // check which source is used for loading the data - if (force == ForceType.INVALID) - { - // if the model is not up to date - if (this.CheckIsNotUpToDate(this.IsModelUpToDateOnLoad) == true) - { - force = ForceType.FORCE_FILE; - - if (this.file != null) - { - // if the file does not exist or is size of 0 or is not - // up to date, then load from web - if ((this.file.Exist() == false) - || (this.file.GetFileInfo().Length == 0) - || (this.CheckIsNotUpToDate(this.IsFileUpToDateOnLoad) == true)) - { - force = ForceType.FORCE_WEB; - } - } - else - { - // if the file object does not exist, load from web - force = ForceType.FORCE_WEB; - } - - // if the web object does not exist, load from file - if (this.api == null) - { - force = ForceType.FORCE_FILE; - } - } - else - { - // if it is up to date, nothing has to be loaded - this.RunOnIOCallback(this.OnLoaded); - } - } - - // load from web - if (force == ForceType.FORCE_WEB) - { - if (this.api != null) - { - if (this.paramizedUri != null) - { - this.api.HttpGet(this.paramizedUri, this.OnLoadDataComplete); - } - else - { - this.api.HttpGet(this.httpApiUri, this.OnLoadDataComplete); - } - } - else - { - // if web object does not exist, call OnFailed callbacks - this.RunOnFailedCallback(this.OnFailedWeb, this.OnFailedLoad); - } - } - - // load from file - if (force == ForceType.FORCE_FILE) - { - if (this.file != null) - { - byte[] data = this.file.ReadFile(); - - if (data == null) - { - this.RunOnFailedCallback(this.OnFailedFile, this.OnFailedLoad); - } - else - { - if (data.Length > 0) - { - this.DeserializeModel(data); - } - - this.RunOnIOCallback(this.OnLoaded); - } - } - else - { - // if file object does not exist, call OnFailed callbacks - this.RunOnFailedCallback(this.OnFailedFile, this.OnFailedLoad); - } - } - } - - /// - /// Save the model data if necessary. - /// - /// force saving. DEFAULT: false - public void SaveData(bool force = false) - { - if ((this.file != null) - && ((this.CheckIsNotUpToDate(this.IsFileUpToDateOnSave) == true) || (force == true))) - { - this.RunOnIOCallback(this.OnSaving); - - byte[] data = this.SerializeModel(); - - if ((this.OnSaved != null) && (this.OnFailedSave != null)) - { - this.file.WriteFile(data, delegate { this.OnSaved(); }, delegate { this.OnFailedSave(); }); - } - else if (this.OnSaved != null) - { - this.file.WriteFile(data, delegate { this.OnSaved(); }, null); - } - else if (this.OnFailedSave != null) - { - this.file.WriteFile(data, null, delegate { this.OnFailedSave(); }); - } - else - { - this.file.WriteFile(data, null, null); - } - } - } - - /// - /// Return the model io type. - /// - /// model io type - public ModelType GetModelType() - { - return this.modelType; - } - - /// - /// Return the model. - /// - /// model object - public T GetModel() - { - return this.model; - } - - /// - /// Create the parameterized uri. - /// - /// uri parameter list - public void SetUriParams(List parameters) - { - if (this.api != null) - { - this.paramizedUri = this.api.CreateGetUrl(parameters); - } - } - - /// - /// Clear the parameterized uri. - /// - public void ClearUriParams() - { - this.paramizedUri = null; - } - - /// - /// Abstract declaration of the model deserialize function. - /// - /// model data as byte array - /// true, is succeeded - public abstract bool DeserializeModel(byte[] modelData); - - /// - /// Abstract declaration of the model serialize function. - /// - /// model data as byte array - public abstract byte[] SerializeModel(); - - #endregion - #region protected /// - /// Check if the model io type is file. + /// Method overrides the base CheckLoadFileIsNotUpToDate Method /// - /// true, if the model io type has file. - protected bool IsFile() + /// true if it is not up-to-date, otherwise false + protected override bool CheckLoadFileIsNotUpToDate() { - bool retValue = false; - - if ((this.modelType & ModelType.File) != 0) - { - retValue = true; - } - - return retValue; + return this.CheckIsNotUpToDate(this.IsFileUpToDateOnLoad); } /// - /// Check if the model io type is feed. + /// Method overrides the base CheckSaveFileIsNotUpToDate Method /// - /// true if the model io type has feed. - protected bool IsHttpApi() + /// true if it is not up-to-date, otherwise false + protected override bool CheckSaveFileIsNotUpToDate() + { + return this.CheckIsNotUpToDate(this.IsFileUpToDateOnSave); + } + + /// + /// Method overrides the base SendHttpGet Method + /// + /// the url + protected override void SendHttpGet(Uri url) + { + ((HttpRequest)this.Api).HttpGet(url, this.OnLoadDataComplete); + } + + /// + /// Initializes the file object. + /// + protected override void InitFile() + { + if ((this.IsFile() == true) + && (this.File == null)) + { + this.File = new CampusAppWP8.Utility.File(this.FileName); + } + } + + /// + /// Initializes the web object. + /// + protected override void InitHttpApi() + { + if ((this.IsHttpApi() == true) + && (this.Api == null)) + { + this.Api = new HttpRequest(this.HttpApiUri); + } + } + + /// Check if model or file is not up to date. + /// The check function. + /// true if model or file is not up to date, false if it is. + protected override bool CheckIsNotUpToDate(object checkFunc) { bool retValue = false; - if ((this.modelType & ModelType.Feed) != 0) + // if there is no check function, the model or file is not up to date + if (checkFunc == null) { retValue = true; } + else + { + Type funcType = checkFunc.GetType(); + + if (funcType.Equals(typeof(IsFileUpToDate))) + { + retValue = !(checkFunc as IsFileUpToDate)(this.Model, this.File.GetFileInfo()); + } + else if (funcType.Equals(typeof(IsModelUpToDate))) + { + retValue = !(checkFunc as IsModelUpToDate)(this.Model); + } + } return retValue; } @@ -449,60 +189,6 @@ namespace CampusAppWP8 #region private - /// - /// Initialize the class. Is called by the constructors. - /// - /// model IO type - /// name of the data file - /// url of the feed data - private void Init(ModelType modelType, string fileName, string url) - { - this.modelType = modelType; - - if ((url != null) && (url.Equals(string.Empty) == false)) - { - this.httpApiUri = new Uri(url, UriKind.Absolute); - } - - this.fileName = fileName; - - if ((this.IsFile() == true) - && (fileName.Equals(string.Empty) == false)) - { - this.InitFile(); - } - - if ((this.IsHttpApi() == true) - && (url.Equals(string.Empty) == false)) - { - this.InitHttpApi(); - } - } - - /// - /// Initializes the file object. - /// - private void InitFile() - { - if ((this.IsFile() == true) - && (this.file == null)) - { - this.file = new CampusAppWP8.Utility.File(this.fileName); - } - } - - /// - /// Initializes the web object. - /// - private void InitHttpApi() - { - if ((this.IsHttpApi() == true) - && (this.api == null)) - { - this.api = new HttpRequest(this.httpApiUri); - } - } - /// /// Is called after the loading from web is complete. /// @@ -513,7 +199,7 @@ namespace CampusAppWP8 Exception downloadError = e.Error; if (downloadError != null) { - this.RunOnFailedCallback(this.OnFailedWeb, this.OnFailedLoad); + this.FireLoadFailEvents(); } else { @@ -529,66 +215,10 @@ namespace CampusAppWP8 this.DeserializeModel(data); } - this.RunOnIOCallback(this.OnLoaded); + this.FireLoadCompletedEvents(); } } - /// - /// Executes the on i/o callback operation. - /// - /// The callback function. - private void RunOnIOCallback(OnIO callbackFunc) - { - if (callbackFunc != null) - { - callbackFunc(); - } - } - - /// Executes the on failed callback operation. - /// The special function. - /// The default function. - private void RunOnFailedCallback(OnFailed specialFunc, OnFailed defaultFunc) - { - if (specialFunc != null) - { - specialFunc(); - } - else if (defaultFunc != null) - { - defaultFunc(); - } - } - - /// Check if model or file is not up to date. - /// The check function. - /// true if model or file is not up to date, false if it is. - private bool CheckIsNotUpToDate(object checkFunc) - { - bool retValue = false; - - // if there is no check function, the model or file is not up to date - if (checkFunc == null) - { - retValue = true; - } - else - { - Type funcType = checkFunc.GetType(); - - if (funcType.Equals(typeof(IsFileUpToDate))) - { - retValue = !(checkFunc as IsFileUpToDate)(this.model, this.file.GetFileInfo()); - } - else if (funcType.Equals(typeof(IsModelUpToDate))) - { - retValue = !(checkFunc as IsModelUpToDate)(this.model); - } - } - - return retValue; - } - #endregion #endregion diff --git a/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs b/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs index 83c936ad..972c8f9c 100644 --- a/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs @@ -61,7 +61,7 @@ namespace CampusAppWP8.Model /// /// model data /// true, if succeeded - public override bool DeserializeModel(byte[] modelData) + protected override bool DeserializeModel(byte[] modelData) { bool retValue = true; @@ -84,7 +84,7 @@ namespace CampusAppWP8.Model /// Serializes the model to a byte array. /// /// model data - public override byte[] SerializeModel() + protected override byte[] SerializeModel() { byte[] retValue = null; diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs index 0dd73ecd..c6e21ac6 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs @@ -70,7 +70,7 @@ namespace CampusAppWP8.Pages.Departments if (this.isNewInstance) { - if ((DepartmentIndexPage.FavoriteFile == null) || (DepartmentIndexPage.FavoriteFile.GetModel() == null)) + if ((DepartmentIndexPage.FavoriteFile == null) || (DepartmentIndexPage.FavoriteFile.Model == null)) { DepartmentModel tempModel = null; @@ -91,7 +91,7 @@ namespace CampusAppWP8.Pages.Departments if (this.isSourceSet == false) { - this.ContentPanel.ItemsSource = DepartmentIndexPage.GetFavoriteFile().GetModel().Faculties[0].Chairs; + this.ContentPanel.ItemsSource = DepartmentIndexPage.GetFavoriteFile().Model.Faculties[0].Chairs; this.isSourceSet = true; } @@ -108,7 +108,7 @@ namespace CampusAppWP8.Pages.Departments if (e.NavigationMode != System.Windows.Navigation.NavigationMode.Back) { - App.SaveToIsolatedStorage(Constants.IsolatedStorage_DepartmentFavoriteModel, DepartmentIndexPage.FavoriteFile.GetModel()); + App.SaveToIsolatedStorage(Constants.IsolatedStorage_DepartmentFavoriteModel, DepartmentIndexPage.FavoriteFile.Model); } } @@ -159,7 +159,7 @@ namespace CampusAppWP8.Pages.Departments Button btn = this.lastClickedBtn as Button; TextBlock btnText = btn.Content as TextBlock; - if (DepartmentIndexPage.GetFavoriteFile().GetModel().Faculties[0].RemoveChair(btnText.Text) == true) + if (DepartmentIndexPage.GetFavoriteFile().Model.Faculties[0].RemoveChair(btnText.Text) == true) { MessageBox.Show(AppResources.DeleteSucceeded); } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs index d161e280..a07fcc3b 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs @@ -184,7 +184,7 @@ namespace CampusAppWP8.Pages.Departments /// private void SetupFacultyList() { - this.FacultyList.ItemsSource = DepartmentIndexPage.feed.GetModel().Faculties; + this.FacultyList.ItemsSource = DepartmentIndexPage.feed.Model.Faculties; this.progressBar.Visibility = Visibility.Collapsed; } @@ -193,12 +193,12 @@ namespace CampusAppWP8.Pages.Departments /// private void CheckFavoriteFeed() { - if (DepartmentIndexPage.favorite.GetModel() == null) + if (DepartmentIndexPage.favorite.Model == null) { DepartmentIndexPage.favorite.Model = new 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")); } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs index d03b97db..95b27075 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs @@ -70,7 +70,7 @@ namespace CampusAppWP8.Pages.Departments if (this.isNewInstance) { - if ((DepartmentIndexPage.Feed == null) || (DepartmentIndexPage.Feed.GetModel() == null)) + if ((DepartmentIndexPage.Feed == null) || (DepartmentIndexPage.Feed.Model == null)) { DepartmentModel tempModel = null; @@ -91,7 +91,7 @@ namespace CampusAppWP8.Pages.Departments if (this.isSourceSet == false) { - this.DepartmentPivot.ItemsSource = DepartmentIndexPage.GetFeed().GetModel().Faculties; + this.DepartmentPivot.ItemsSource = DepartmentIndexPage.GetFeed().Model.Faculties; this.isSourceSet = true; } @@ -103,7 +103,7 @@ namespace CampusAppWP8.Pages.Departments int pivotIndexInt = int.Parse(pivotIndex) - 1; // if the index is in the range of the array - if ((pivotIndexInt >= 0) && (pivotIndexInt < DepartmentIndexPage.GetFeed().GetModel().Faculties.Count())) + if ((pivotIndexInt >= 0) && (pivotIndexInt < DepartmentIndexPage.GetFeed().Model.Faculties.Count())) { DepartmentPivot.SelectedIndex = pivotIndexInt; } @@ -126,7 +126,7 @@ namespace CampusAppWP8.Pages.Departments if (e.NavigationMode != System.Windows.Navigation.NavigationMode.Back) { - App.SaveToIsolatedStorage(Constants.IsolatedStorage_DepartmentModel, DepartmentIndexPage.Feed.GetModel()); + App.SaveToIsolatedStorage(Constants.IsolatedStorage_DepartmentModel, DepartmentIndexPage.Feed.Model); } } @@ -186,11 +186,11 @@ namespace CampusAppWP8.Pages.Departments Button btn = this.lastClickedBtn as Button; TextBlock btnText = btn.Content as TextBlock; - Model.Departments.ChairModel tempModel = DepartmentIndexPage.GetFeed().GetModel().Faculties[this.DepartmentPivot.SelectedIndex].GetChairModel(btnText.Text); + Model.Departments.ChairModel tempModel = DepartmentIndexPage.GetFeed().Model.Faculties[this.DepartmentPivot.SelectedIndex].GetChairModel(btnText.Text); if (tempModel != null) { - DepartmentIndexPage.GetFavoriteFile().GetModel().Faculties[0].AddChair(tempModel); + DepartmentIndexPage.GetFavoriteFile().Model.Faculties[0].AddChair(tempModel); } } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs index 685568fa..c2b20c99 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs @@ -96,7 +96,7 @@ namespace CampusAppWP8.Pages.Events if (this.isNewInstance) { - if ((EventIndexPage.GetEventFeed() == null) || (EventIndexPage.GetEventFeed().GetModel() == null)) + if ((EventIndexPage.GetEventFeed() == null) || (EventIndexPage.GetEventFeed().Model == null)) { RSSViewModel tempModel = null; @@ -160,7 +160,7 @@ namespace CampusAppWP8.Pages.Events if (e.NavigationMode != System.Windows.Navigation.NavigationMode.Back) { - App.SaveToIsolatedStorage(Constants.IsolatedStorage_EventRSSModel, EventIndexPage.GetEventFeed().GetModel()); + App.SaveToIsolatedStorage(Constants.IsolatedStorage_EventRSSModel, EventIndexPage.GetEventFeed().Model); } if (this.synth != null) @@ -222,7 +222,7 @@ namespace CampusAppWP8.Pages.Events { string ssmlPrompt = ""; - ssmlPrompt += EventIndexPage.GetEventFeed().GetModel().Channel[0].Item[this.EventPivot.SelectedIndex].Text; + ssmlPrompt += EventIndexPage.GetEventFeed().Model.Channel[0].Item[this.EventPivot.SelectedIndex].Text; ssmlPrompt += ""; this.isInSpeech = true; diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs index d6ab0753..1c5556d2 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs @@ -84,7 +84,7 @@ namespace CampusAppWP8.Pages.News if (this.isNewInstance) { - if ((NewsIndexPage.Feed == null) || (NewsIndexPage.Feed.GetModel() == null)) + if ((NewsIndexPage.Feed == null) || (NewsIndexPage.Feed.Model == null)) { RSSViewModel tempModel = null; @@ -141,7 +141,7 @@ namespace CampusAppWP8.Pages.News if (e.NavigationMode != System.Windows.Navigation.NavigationMode.Back) { - App.SaveToIsolatedStorage(Constants.IsolatedStorage_NewsRSSModel, NewsIndexPage.GetNewsFeed().GetModel()); + App.SaveToIsolatedStorage(Constants.IsolatedStorage_NewsRSSModel, NewsIndexPage.GetNewsFeed().Model); } if (this.synth != null) @@ -199,7 +199,7 @@ namespace CampusAppWP8.Pages.News { string ssmlPrompt = ""; - ssmlPrompt += NewsIndexPage.GetNewsFeed().GetModel().Channel[0].Item[this.NewsPivot.SelectedIndex].Text; + ssmlPrompt += NewsIndexPage.GetNewsFeed().Model.Channel[0].Item[this.NewsPivot.SelectedIndex].Text; ssmlPrompt += ""; this.isInSpeech = true; diff --git a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs index 725f7d2f..d8147b93 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs @@ -79,7 +79,7 @@ namespace CampusAppWP8.Pages.Openinghours */ if (this.isNewInstance) { - if ((this.feed == null) || (this.feed.GetModel() == null)) + if ((this.feed == null) || (this.feed.Model == null)) { OpeninghoursModel tempModel = null; @@ -104,7 +104,7 @@ namespace CampusAppWP8.Pages.Openinghours if (e.NavigationMode != System.Windows.Navigation.NavigationMode.Back) { - App.SaveToIsolatedStorage(Constants.IsolatedStorage_OpeninghoursModel, this.feed.GetModel()); + App.SaveToIsolatedStorage(Constants.IsolatedStorage_OpeninghoursModel, this.feed.Model); } } diff --git a/CampusAppWP8/CampusAppWP8/Utility/File.cs b/CampusAppWP8/CampusAppWP8/Utility/File.cs index 7b816090..b247c0e7 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/File.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/File.cs @@ -91,7 +91,15 @@ namespace CampusAppWP8.Utility /// true, if file exists, otherwise false public override bool Exist() { - return this.GetFileInfo().Exists; + FileInfo info = this.GetFileInfo(); + if (info.Exists && info.Length > 0) + { + return true; + } + else + { + return false; + } } /// Converts this object to a storage file. diff --git a/CampusAppWP8/CampusAppWP8/Utility/HttpRequest.cs b/CampusAppWP8/CampusAppWP8/Utility/HttpRequest.cs index 2d3b73c1..3d1b2ae5 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/HttpRequest.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/HttpRequest.cs @@ -12,20 +12,13 @@ namespace CampusAppWP8.Utility using System.Net; using CampusAppWP8.Model.Utility; using CampusAppWPortalLib8.Model.Utility; + using CampusAppWPortalLib8.Utility; /// /// Class realize the access of restful HttpRequest /// - public class HttpRequest + public class HttpRequest : AbstractHttpRequest { - #region Member - - /// - /// BaseAddress of the webClient - /// - private string baseAddress; - #endregion - #region Constructor /// @@ -41,7 +34,7 @@ namespace CampusAppWP8.Utility /// the url of the HttpRequest base address public HttpRequest(Uri apiBaseAddress) { - this.baseAddress = apiBaseAddress.AbsoluteUri; + this.BaseAddress = apiBaseAddress.AbsoluteUri; } #endregion @@ -72,29 +65,6 @@ namespace CampusAppWP8.Utility client.OpenReadAsync(url); } - /// - /// Method create the Url for the http-get-method - /// - /// list of parameters - /// absolute API-Url include GetParameter - public Uri CreateGetUrl(List parameters) - { - string paramterStr = string.Empty; - string seperator = string.Empty; - foreach (UrlParamModel parameter in parameters) - { - if (string.Empty.Equals(seperator)) - { - seperator = parameter.ParamToken; - } - - paramterStr += parameter.ToString(); - } - - string getUrlStr = this.baseAddress + seperator + paramterStr; - return new Uri(getUrlStr, UriKind.Absolute); - } - /// /// Method realize the http-delete-method /// diff --git a/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj b/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj index 5e82722f..908175e7 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj +++ b/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj @@ -33,7 +33,6 @@ 4 - @@ -43,6 +42,7 @@ + diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/AbstractMainModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/AbstractMainModel.cs new file mode 100644 index 00000000..d43496b5 --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/AbstractMainModel.cs @@ -0,0 +1,577 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 05.07.2013 +//----------------------------------------------------------------------------- +namespace CampusAppWPortalLib8.Model +{ + using System; + using System.Collections.Generic; + using CampusAppWPortalLib8.Model.Utility; + using CampusAppWPortalLib8.Utility; + + /// + /// abstract Base model io handling class. + /// + /// model type + public abstract class AbstractMainModel + { + #region Member + + /// + /// File object. + /// + private AbstractFile file = null; + + /// + /// Model io type. + /// + private ModelType modelType; + + /// + /// Model object. + /// + private T model = default(T); + + /// + /// Web object. + /// + private AbstractHttpRequest api = null; + + /// + /// Filename of saved data. + /// + private string fileName = string.Empty; + + /// + /// Url of the feed data. + /// + private Uri httpApiUri = null; + + /// + /// Parameterized uri of the feed. + /// + private Uri paramizedUri = null; + + #endregion + + #region Constructor + + /// + /// Initializes a new instance of the class. + /// + /// Model IO type + /// name of the file + /// url of the feed + public AbstractMainModel(ModelType modelType, string fileName, string url) + { + this.Init(modelType, fileName, url); + } + + /// + /// Initializes a new instance of the class. + /// + /// Model IO type + /// name of the file or the url of the feed + public AbstractMainModel(ModelType modelType, string sourceName) + { + if (modelType == ModelType.File) + { + this.Init(modelType, sourceName, string.Empty); + } + else if (modelType == ModelType.Feed) + { + this.Init(modelType, string.Empty, sourceName); + } + else + { + throw new NotSupportedException("Wrong constructor was called for Feed and File support."); + } + } + + #endregion + + #region Events + + /// + /// Delegate of the OnIO callback function. + /// + public delegate void OnIO(); + + /// + /// Delegate of the OnFailed(File/Web) callback function. + /// + public delegate void OnFailed(); + + /// + /// Delegate of the IsModelUpToDate callback function. + /// + /// data model + /// true, model is up to date + public delegate bool IsModelUpToDate(T model); + + /// + /// Callback pointer, called before loading. + /// + public event OnIO OnLoading = null; + + /// + /// Callback pointer, called after loading. + /// + public event OnIO OnLoaded = null; + + /// + /// Callback pointer, called before saving. + /// + public event OnIO OnSaving = null; + + /// + /// Callback pointer, called after saving. + /// + public event OnIO OnSaved = null; + + /// + /// Callback pointer, called after failed file loading. + /// + public event OnFailed OnFailedFile = null; + + /// + /// Callback pointer, called after failed web loading. + /// + public event OnFailed OnFailedWeb = null; + + /// + /// Callback pointer, called after failed file or web loading, if there + /// is no specialized onFailed callback set. + /// + public event OnFailed OnFailedLoad = null; + + /// + /// Callback pointer, called after failed saving data to file. + /// + public event OnFailed OnFailedSave = null; + + /// + /// Callback pointer, for checking if model is up to date at loading. + /// + public event IsModelUpToDate IsModelUpToDateOnLoad = null; + + /// + /// Callback pointer, for checking if model is up to date at saving. + /// (currently unused) + /// +#pragma warning disable 0067 + public event IsModelUpToDate IsModelUpToDateOnSave = null; + + #endregion + + #region Property + + /// + /// Gets or sets the Model. + /// + public T Model + { + get + { + return this.model; + } + + set + { + this.model = value; + } + } + + /// + /// Gets or sets the File. + /// + public AbstractFile File + { + get { return this.file; } + protected set { this.file = value; } + } + + /// + /// Gets or sets the ModelType. + /// + public ModelType ModelType + { + get { return this.modelType; } + protected set { this.modelType = value; } + } + + /// + /// Gets or sets the Api. + /// + public AbstractHttpRequest Api + { + get { return this.api; } + protected set { this.api = value; } + } + + /// + /// Gets or sets the ApiUrl. + /// + public Uri HttpApiUri + { + get { return this.httpApiUri; } + protected set { this.httpApiUri = value; } + } + + /// + /// Gets or sets the FileName. + /// + public string FileName + { + get { return this.fileName; } + protected set { this.fileName = value; } + } + + #endregion + + #region Method + + #region public + + /// + /// Method Fire all Events for fail load + /// + public void FireLoadFailEvents() + { + this.RunOnFailedCallback(this.OnFailedWeb, this.OnFailedLoad); + } + + /// + /// Method Fire all Events for load is complete + /// + public void FireLoadCompletedEvents() + { + this.RunOnIOCallback(this.OnLoaded); + } + + /// + /// Forces a update from web. + /// + public void ForceWebUpdate() + { + this.LoadData(ForceType.FORCE_WEB); + } + + /// + /// Forces a update from file. + /// + public void ForceReadFile() + { + this.LoadData(ForceType.FORCE_FILE); + } + + /// + /// Load the data if necessary, from web or from file, regarding if + /// the file data is up to date. + /// + /// if set/not invalid/not default, force to load from web or file + public void LoadData(ForceType force = ForceType.INVALID) + { + this.RunOnIOCallback(this.OnLoading); + + // check which source is used for loading the data + if (force == ForceType.INVALID) + { + // if the model is not up to date + if (this.CheckIsNotUpToDate(this.IsModelUpToDateOnLoad) == true) + { + force = ForceType.FORCE_FILE; + + if (this.file != null) + { + // if the file does not exist or is size of 0 or is not + // up to date, then load from web + if ((this.file.Exist() == false) + || (this.CheckLoadFileIsNotUpToDate() == true)) + { + force = ForceType.FORCE_WEB; + } + } + else + { + // if the file object does not exist, load from web + force = ForceType.FORCE_WEB; + } + + // if the web object does not exist, load from file + if (this.api == null) + { + force = ForceType.FORCE_FILE; + } + } + else + { + // if it is up to date, nothing has to be loaded + this.RunOnIOCallback(this.OnLoaded); + } + } + + // load from web + if (force == ForceType.FORCE_WEB) + { + if (this.api != null) + { + if (this.paramizedUri != null) + { + this.SendHttpGet(this.paramizedUri); + } + else + { + this.SendHttpGet(this.httpApiUri); + } + } + else + { + // if web object does not exist, call OnFailed callbacks + this.RunOnFailedCallback(this.OnFailedWeb, this.OnFailedLoad); + } + } + + // load from file + if (force == ForceType.FORCE_FILE) + { + if (this.file != null) + { + byte[] data = this.file.ReadFile(); + + if (data == null) + { + this.RunOnFailedCallback(this.OnFailedFile, this.OnFailedLoad); + } + else + { + if (data.Length > 0) + { + this.DeserializeModel(data); + } + + this.RunOnIOCallback(this.OnLoaded); + } + } + else + { + // if file object does not exist, call OnFailed callbacks + this.RunOnFailedCallback(this.OnFailedFile, this.OnFailedLoad); + } + } + } + + /// + /// Save the model data if necessary. + /// + /// force saving. DEFAULT: false + public void SaveData(bool force = false) + { + if ((this.file != null) + && ((this.CheckSaveFileIsNotUpToDate() == true) || (force == true))) + { + this.RunOnIOCallback(this.OnSaving); + + byte[] data = this.SerializeModel(); + + if ((this.OnSaved != null) && (this.OnFailedSave != null)) + { + this.file.WriteFile(data, delegate { this.OnSaved(); }, delegate { this.OnFailedSave(); }); + } + else if (this.OnSaved != null) + { + this.file.WriteFile(data, delegate { this.OnSaved(); }, null); + } + else if (this.OnFailedSave != null) + { + this.file.WriteFile(data, null, delegate { this.OnFailedSave(); }); + } + else + { + this.file.WriteFile(data, null, null); + } + } + } + + /// + /// Return the model io type. + /// + /// model io type + public ModelType GetModelType() + { + return this.modelType; + } + + /// + /// Create the parameterized uri. + /// + /// uri parameter list + public void SetUriParams(List parameters) + { + if (this.api != null) + { + this.paramizedUri = this.api.CreateGetUrl(parameters); + } + } + + /// + /// Clear the parameterized uri. + /// + public void ClearUriParams() + { + this.paramizedUri = null; + } + + #endregion + + #region protected + + /// + /// Abstract declaration of the model deserialize function. + /// + /// model data as byte array + /// true, is succeeded + protected abstract bool DeserializeModel(byte[] modelData); + + /// + /// Abstract declaration of the model serialize function. + /// + /// model data as byte array + protected abstract byte[] SerializeModel(); + + /// + /// Method send a HttpGet + /// + /// the url + protected abstract void SendHttpGet(Uri url); + + /// + /// Method check if model or file is Not up-to-date + /// + /// the check function + /// true if it is not up-to-date, otherwise false + protected abstract bool CheckIsNotUpToDate(object checkFunc); + + /// + /// Method check if file is Not up-to-date for load process + /// + /// true if it is not up-to-date, otherwise false + protected abstract bool CheckLoadFileIsNotUpToDate(); + + /// + /// Method check if file is Not up-to-date for load process + /// + /// true if it is not up-to-date, otherwise false + protected abstract bool CheckSaveFileIsNotUpToDate(); + + /// + /// Initializes the file object. + /// + protected abstract void InitFile(); + + /// + /// Initializes the web object. + /// + protected abstract void InitHttpApi(); + + /// + /// Check if the model io type is file. + /// + /// true, if the model io type has file. + protected bool IsFile() + { + bool retValue = false; + + if ((this.modelType & ModelType.File) != 0) + { + retValue = true; + } + + return retValue; + } + + /// + /// Check if the model io type is feed. + /// + /// true if the model io type has feed. + protected bool IsHttpApi() + { + bool retValue = false; + + if ((this.modelType & ModelType.Feed) != 0) + { + retValue = true; + } + + return retValue; + } + + #endregion + + #region private + + /// + /// Initialize the class. Is called by the constructors. + /// + /// model IO type + /// name of the data file + /// url of the feed data + private void Init(ModelType modelType, string fileName, string url) + { + this.modelType = modelType; + + if ((url != null) && (url.Equals(string.Empty) == false)) + { + this.httpApiUri = new Uri(url, UriKind.Absolute); + } + + this.fileName = fileName; + + if ((this.IsFile() == true) + && (fileName.Equals(string.Empty) == false)) + { + this.InitFile(); + } + + if ((this.IsHttpApi() == true) + && (url.Equals(string.Empty) == false)) + { + this.InitHttpApi(); + } + } + + /// + /// Executes the on i/o callback operation. + /// + /// The callback function. + private void RunOnIOCallback(OnIO callbackFunc) + { + if (callbackFunc != null) + { + callbackFunc(); + } + } + + /// Executes the on failed callback operation. + /// The special function. + /// The default function. + private void RunOnFailedCallback(OnFailed specialFunc, OnFailed defaultFunc) + { + if (specialFunc != null) + { + specialFunc(); + } + else if (defaultFunc != null) + { + defaultFunc(); + } + } + + #endregion + + #endregion + } +} \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/IMainModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/IMainModel.cs deleted file mode 100644 index 154af71c..00000000 --- a/CampusAppWP8/CampusAppWPortalLib8/Model/IMainModel.cs +++ /dev/null @@ -1,48 +0,0 @@ -//----------------------------------------------------------------------------- -// -// Company copyright tag. -// -// fiedlchr -// 05.07.2013 -//----------------------------------------------------------------------------- -using CampusAppWPortalLib8.Model; -namespace CampusAppWPortalLib8.Utility -{ - /// - /// Base model io handling class. - /// - /// model type - public interface IMainModel - { - /// - /// Gets or sets the Model. - /// - T Model { get; set; } - - /// - /// Load the data if necessary, from web or from file, regarding if - /// the file data is up to date. - /// - /// if set/not invalid/not default, force to load from web or file - void LoadData(ForceType force = ForceType.INVALID); - - /// - /// Save the model data if necessary. - /// - /// force saving. DEFAULT: false - void SaveData(bool force = false); - - /// - /// Abstract declaration of the model deserialize function. - /// - /// model data as byte array - /// true, is succeeded - bool DeserializeModel(byte[] modelData); - - /// - /// Abstract declaration of the model serialize function. - /// - /// model data as byte array - byte[] SerializeModel(); - } -} \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop b/CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop index 54487d17..e1e8289d 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop +++ b/CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop @@ -1,6 +1,7 @@ + api nfc param qr From 7b879319b2edc4c66db7f52a7706ea51c29d1d0b Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 1 Oct 2013 11:54:50 +0200 Subject: [PATCH 09/22] set sylechecks --- CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs | 2 +- CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs | 2 +- CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs | 7 +++---- CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs | 2 +- CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs | 3 ++- CampusAppWP8/CampusAppWP8/Model/XmlModel.cs | 5 +++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs index ed6af279..a35d987b 100644 --- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs @@ -8,12 +8,12 @@ namespace CampusAppWP8.Api.GeoApi { + using System.Collections.Generic; using CampusAppWP8.Model; using CampusAppWP8.Model.GeoDb; using CampusAppWP8.Resources; using CampusAppWPortalLib8.Model; using CampusAppWPortalLib8.Model.Utility; - using System.Collections.Generic; /// Pis api. /// Stubbfel, 09.09.2013. diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs index a018a069..77e91e24 100644 --- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs @@ -8,12 +8,12 @@ namespace CampusAppWP8.Api.GeoApi { + using System.Collections.Generic; using CampusAppWP8.Model; using CampusAppWP8.Model.GeoDb; using CampusAppWP8.Resources; using CampusAppWPortalLib8.Model; using CampusAppWPortalLib8.Model.Utility; - using System.Collections.Generic; /// Pss api. /// Stubbfel, 09.09.2013. diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs index 02a90600..6c00b9ee 100644 --- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs @@ -7,14 +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; + using CampusAppWPortalLib8.Model.Utility; /// /// Class for SPSAPI diff --git a/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs b/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs index d5334565..e4f71f58 100644 --- a/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs +++ b/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs @@ -50,7 +50,7 @@ namespace CampusAppWP8.File.Exams { if (this.storageFile == null) { - this.storageFile = await ((CampusAppWP8.Utility.File)(this.File)).AsStorageFile(); + this.storageFile = await this.File.AsStorageFile(); } if (this.storageFile != null) diff --git a/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs b/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs index 9aa6e9b3..bcb8b39b 100644 --- a/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs @@ -6,9 +6,10 @@ // 03.09.2013 //---------------------------------------------------------------------- -using CampusAppWPortalLib8.Model; namespace CampusAppWP8.Model { + using CampusAppWPortalLib8.Model; + /// Binary model. /// Stubbfel, 03.09.2013. public abstract class BinaryModel : MainModel diff --git a/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs b/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs index 972c8f9c..c0a24f9d 100644 --- a/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs @@ -10,6 +10,7 @@ namespace CampusAppWP8.Model using System.Text; using CampusAppWPortalLib8.Utility; using CampusAppWPortalLib8.Model; + using CampusAppWPortalLib8.Resources; /// /// Xml model io handler class. @@ -28,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; } /// @@ -40,7 +41,7 @@ namespace CampusAppWP8.Model public XmlModel(ModelType modelType, string sourceName) : base(modelType, sourceName) { - this.ValidRootName = CampusAppWPortalLib8.Resources.Constants.XMLRootElementName; + this.ValidRootName = Constants.XMLRootElementName; } #endregion From 71d113f81914e6ea9f9c7a1eeb3e160a34c612cd Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 1 Oct 2013 12:04:21 +0200 Subject: [PATCH 10/22] mv linkModels --- CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 2 -- CampusAppWP8/CampusAppWP8/Feed/Link/ClubLinkFeed.cs | 2 +- CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs | 2 +- CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs | 4 ++-- CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj | 2 ++ .../Model/Link/LinkListModel.cs | 2 +- .../Model/Link/LinkModel.cs | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Link/LinkListModel.cs (97%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Link/LinkModel.cs (98%) diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index 8ebdefec..c28f0ff9 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -200,8 +200,6 @@ - - diff --git a/CampusAppWP8/CampusAppWP8/Feed/Link/ClubLinkFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Link/ClubLinkFeed.cs index d48aa593..5e8237e7 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Link/ClubLinkFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Link/ClubLinkFeed.cs @@ -10,7 +10,7 @@ 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; diff --git a/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs index 20fd7b67..4be0b0d5 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs @@ -10,7 +10,7 @@ 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; diff --git a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs index 779eef46..5aaeedc8 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs @@ -67,8 +67,8 @@ namespace CampusAppWP8.Pages.Links this.InitializeFeeds(); this.ProgressBar.Visibility = System.Windows.Visibility.Visible; this.loadingFeeds = 2; - this.commonLinkFeed.LoadData(Utilities.GetLoadModus()); - this.clubLinkFeed.LoadData(Utilities.GetLoadModus()); + this.commonLinkFeed.LoadData(Utilities.GetLoadModus()); + this.clubLinkFeed.LoadData(Utilities.GetLoadModus()); } /// diff --git a/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj b/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj index 908175e7..5f458571 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj +++ b/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj @@ -34,6 +34,8 @@ + + diff --git a/CampusAppWP8/CampusAppWP8/Model/Link/LinkListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Link/LinkListModel.cs similarity index 97% rename from CampusAppWP8/CampusAppWP8/Model/Link/LinkListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Link/LinkListModel.cs index c512e9ea..6895ca07 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Link/LinkListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Link/LinkListModel.cs @@ -6,7 +6,7 @@ // 02.07.2013 //----------------------------------------------------------------------------- -namespace CampusAppWP8.Model.Link +namespace CampusAppWPortalLib8.Model.Link { using System; using System.Collections.ObjectModel; diff --git a/CampusAppWP8/CampusAppWP8/Model/Link/LinkModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Link/LinkModel.cs similarity index 98% rename from CampusAppWP8/CampusAppWP8/Model/Link/LinkModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Link/LinkModel.cs index d25e347d..9e2a67cb 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Link/LinkModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Link/LinkModel.cs @@ -6,7 +6,7 @@ // 02.07.2013 //----------------------------------------------------------------------------- -namespace CampusAppWP8.Model.Link +namespace CampusAppWPortalLib8.Model.Link { using System.Globalization; using System.Xml.Serialization; From cb3dd94b551c9e54a275f0252f47ff0d8f44ccbb Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 1 Oct 2013 13:22:39 +0200 Subject: [PATCH 11/22] mv openinghours --- CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 4 +- .../Feed/Openinghours/OpeninghoursFeed.cs | 8 +- .../OpeninghoursInstitutionWp8Model.cs | 156 ++++++++++++++++++ .../Openinghours/OpeninghoursWp8Model.cs | 20 +++ .../Openinghours/OpeninghoursPage.xaml.cs | 8 +- 5 files changed, 186 insertions(+), 10 deletions(-) create mode 100644 CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionWp8Model.cs create mode 100644 CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursWp8Model.cs diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index c28f0ff9..4c536a5f 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -200,8 +200,8 @@ - - + + diff --git a/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs index 9ee3a87c..d77a8369 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs @@ -18,7 +18,7 @@ namespace CampusAppWP8.Feed.Openinghours /// /// This Class is for MesaFeeds /// - public class OpeninghoursFeed : XmlModel + public class OpeninghoursFeed : XmlModel { #region Constructor @@ -42,7 +42,7 @@ namespace CampusAppWP8.Feed.Openinghours /// /// reference of the FeedModel /// true, if model is up-to-date, otherwise false - private bool CheckIsModelUpToDate(OpeninghoursModel model) + private bool CheckIsModelUpToDate(OpeninghoursWp8Model model) { bool retValue = true; @@ -64,7 +64,7 @@ namespace CampusAppWP8.Feed.Openinghours /// reference of the FeedModel /// info about the file /// true, if file is up-to-date, otherwise false - private bool CheckIsFileUpToDateOnLoad(OpeninghoursModel model, FileInfo info) + private bool CheckIsFileUpToDateOnLoad(OpeninghoursWp8Model model, FileInfo info) { bool retValue = true; @@ -85,7 +85,7 @@ namespace CampusAppWP8.Feed.Openinghours /// reference of the FeedModel /// info about the file /// true, if file is up-to-date, otherwise false - private bool CheckIsFileUpToDateOnSave(OpeninghoursModel model, FileInfo info) + private bool CheckIsFileUpToDateOnSave(OpeninghoursWp8Model model, FileInfo info) { bool retValue = true; diff --git a/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionWp8Model.cs new file mode 100644 index 00000000..077ee869 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionWp8Model.cs @@ -0,0 +1,156 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 24.06.2013 +//----------------------------------------------------------------------------- + +namespace CampusAppWP8.Model.Openinghours +{ + using System.Globalization; + using System.Windows; + using System.Xml.Serialization; + + /// + /// Model for menu + /// + public class OpeninghoursInstitutionWp8Model : CampusAppWPortalLib8.Model.Openinghours.OpeninghoursInstitutionModel + { + #region Property + + /// + /// Gets the visibility state of the monday TextBlock. + /// + public Visibility VisibleMonday + { + get + { + return ((this.Monday == string.Empty) || (this.Monday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the tuesday TextBlock. + /// + public Visibility VisibleTuesday + { + get + { + return ((this.Tuesday == string.Empty) || (this.Tuesday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the wednesday TextBlock. + /// + public Visibility VisibleWednesday + { + get + { + return ((this.Wednesday == string.Empty) || (this.Wednesday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the thursday TextBlock. + /// + public Visibility VisibleThursday + { + get + { + return ((this.Thursday == string.Empty) || (this.Thursday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the friday TextBlock. + /// + public Visibility VisibleFriday + { + get + { + return ((this.Friday == string.Empty) || (this.Friday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the saturday TextBlock. + /// + public Visibility VisibleSaturday + { + get + { + return ((this.Saturday == string.Empty) || (this.Saturday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the sunday TextBlock. + /// + public Visibility VisibleSunday + { + get + { + return ((this.Sunday == string.Empty) || (this.Sunday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the comment. + /// + public Visibility VisibleComment + { + get + { + return ((this.Comment == string.Empty) || (this.Comment.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the email address. + /// + public Visibility VisibleEMail + { + get + { + return ((this.EMail == string.Empty) || (this.EMail.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the phone number. + /// + public Visibility VisiblePhone + { + get + { + return ((this.Phone == string.Empty) || (this.Phone.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the room. + /// + public Visibility VisibleRoom + { + get + { + return ((this.Room == string.Empty) || (this.Room.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the building. + /// + public Visibility VisibleBuilding + { + get + { + return ((this.Building == string.Empty) || (this.Building.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursWp8Model.cs new file mode 100644 index 00000000..88b480bd --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursWp8Model.cs @@ -0,0 +1,20 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 24.06.2013 +//----------------------------------------------------------------------------- + +namespace CampusAppWP8.Model.Openinghours +{ + using System.Xml.Serialization; + + /// + /// Model for opening hours. + /// + [XmlRoot("root")] + public class OpeninghoursWp8Model : CampusAppWPortalLib8.Model.Openinghours.OpeninghoursModel + { + } +} diff --git a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs index d8147b93..44694ae9 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs @@ -52,7 +52,7 @@ namespace CampusAppWP8.Pages.Openinghours this.feed.OnLoaded += new OpeninghoursFeed.OnIO(this.FeedIsReady); this.feed.OnFailedWeb += new OpeninghoursFeed.OnFailed(this.FeedIsFailedWeb); this.feed.OnFailedFile += new OpeninghoursFeed.OnFailed(this.FeedIsFailedFile); - this.feed.LoadData(Utilities.GetLoadModus()); + this.feed.LoadData(Utilities.GetLoadModus()); } this.isNewInstance = true; @@ -81,9 +81,9 @@ namespace CampusAppWP8.Pages.Openinghours { if ((this.feed == null) || (this.feed.Model == null)) { - OpeninghoursModel tempModel = null; + OpeninghoursWp8Model tempModel = null; - if ((tempModel = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_OpeninghoursModel)) != null) + if ((tempModel = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_OpeninghoursModel)) != null) { this.feed.Model = tempModel; this.FeedIsReady(); @@ -104,7 +104,7 @@ namespace CampusAppWP8.Pages.Openinghours if (e.NavigationMode != System.Windows.Navigation.NavigationMode.Back) { - App.SaveToIsolatedStorage(Constants.IsolatedStorage_OpeninghoursModel, this.feed.Model); + App.SaveToIsolatedStorage(Constants.IsolatedStorage_OpeninghoursModel, this.feed.Model); } } From c26344fc40c089d6f9fb11f88d816d880aa49bdc Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 1 Oct 2013 13:25:27 +0200 Subject: [PATCH 12/22] mv CourseModel --- CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 1 - CampusAppWP8/CampusAppWP8/Model/Exams/ExamListModel.cs | 1 + .../CampusAppWP8/Model/Utility/CourseListPickerItemListModel.cs | 1 + .../Model/Utility/CourseModel.cs | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Utility/CourseModel.cs (97%) diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index 4c536a5f..e1648e7b 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -133,7 +133,6 @@ - diff --git a/CampusAppWP8/CampusAppWP8/Model/Exams/ExamListModel.cs b/CampusAppWP8/CampusAppWP8/Model/Exams/ExamListModel.cs index 407c65ab..07cfb062 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Exams/ExamListModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Exams/ExamListModel.cs @@ -11,6 +11,7 @@ namespace CampusAppWP8.Model.Exams using System.Collections.ObjectModel; using System.Xml.Serialization; using CampusAppWP8.Model.Utility; + using CampusAppWPortalLib8.Model.Utility; /// Exam list model. /// Stubbfel, 02.09.2013. diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListModel.cs b/CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListModel.cs index fb606444..4df52c37 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListModel.cs @@ -10,6 +10,7 @@ namespace CampusAppWP8.Model.Utility using System.Linq; using CampusAppWP8.Feed.Utility; using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Model.Utility; /// /// This is a class for the courseList diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/CourseModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CourseModel.cs similarity index 97% rename from CampusAppWP8/CampusAppWP8/Model/Utility/CourseModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CourseModel.cs index bba93443..0921c76c 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/CourseModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CourseModel.cs @@ -5,7 +5,7 @@ // 25.07.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Utility +namespace CampusAppWPortalLib8.Model.Utility { using System; From 5de000ef17602bb5e53a40030c333e4ba1e6ddc4 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 1 Oct 2013 13:49:53 +0200 Subject: [PATCH 13/22] mv exams --- CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 7 +- .../Feed/Departments/DepartmentFeed.cs | 2 +- .../CampusAppWP8/Feed/Exams/ExamFeed.cs | 6 +- .../Departments/DepartmentFavoriteFile.cs | 2 +- .../Model/Exams/ExamListWp8Model.cs | 18 ++++ .../CampusAppWP8/Model/Exams/ExamWp8Model.cs | 30 +++++++ .../StudentCouncil/StudentCouncilModel.cs | 2 +- .../DepartmentFavoritePage.xaml.cs | 4 +- .../Departments/DepartmentIndexPage.xaml.cs | 12 +-- .../Pages/Departments/DepartmentPage.xaml | 4 - .../Pages/Departments/DepartmentPage.xaml.cs | 4 +- .../CampusAppWP8/Pages/Exams/Exams.xaml.cs | 2 +- .../Resources/AppResources.Designer.cs | 9 -- .../CampusAppWP8/Resources/AppResources.resx | 3 - .../Model/Departments/ChairModel.cs | 2 +- .../Model/Departments/DepartmentModel.cs | 2 +- .../Model/Departments/FacultyModel.cs | 4 +- .../Model/Exams/ExamListModel.cs | 16 ++-- .../Model/Exams/ExamModel.cs | 14 +-- .../StudentCouncil/StudentCouncilListModel.cs | 81 +++++++++++++++++ .../StudentCouncil/StudentCouncilModel.cs | 86 +++++++++++++++++++ .../Resources/AppResources.Designer.cs | 9 ++ .../Resources/AppResources.resx | 3 + 23 files changed, 263 insertions(+), 59 deletions(-) create mode 100644 CampusAppWP8/CampusAppWP8/Model/Exams/ExamListWp8Model.cs create mode 100644 CampusAppWP8/CampusAppWP8/Model/Exams/ExamWp8Model.cs rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Departments/ChairModel.cs (98%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Departments/DepartmentModel.cs (98%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Departments/FacultyModel.cs (98%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Exams/ExamListModel.cs (80%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Exams/ExamModel.cs (83%) create mode 100644 CampusAppWP8/CampusAppWPortalLib8/Model/StudentCouncil/StudentCouncilListModel.cs create mode 100644 CampusAppWP8/CampusAppWPortalLib8/Model/StudentCouncil/StudentCouncilModel.cs diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index e1648e7b..f142f19f 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -119,8 +119,8 @@ - - + + @@ -188,9 +188,6 @@ - - - diff --git a/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFeed.cs index 0aca15ba..e3c749f7 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFeed.cs @@ -10,10 +10,10 @@ namespace CampusAppWP8.Feed.Departments using System; using System.IO; using CampusAppWP8.Model; - using CampusAppWP8.Model.Departments; using CampusAppWP8.Resources; using CampusAppWP8.Utility; using CampusAppWPortalLib8.Model; + using CampusAppWPortalLib8.Model.Departments; /// /// Feed class for the department information. diff --git a/CampusAppWP8/CampusAppWP8/Feed/Exams/ExamFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Exams/ExamFeed.cs index 3d98da26..107d0804 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Exams/ExamFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Exams/ExamFeed.cs @@ -16,7 +16,7 @@ namespace CampusAppWP8.Feed.Exams /// Exam feed. /// Stubbfel, 02.09.2013. - public class ExamFeed : XmlModel + public class ExamFeed : XmlModel { #region Constructor @@ -39,7 +39,7 @@ namespace CampusAppWP8.Feed.Exams /// Stubbfel, 02.09.2013. /// The model. /// true if it succeeds, false if it fails. - private bool CheckIsModelUpToDate(ExamListModel model) + private bool CheckIsModelUpToDate(ExamListWp8Model model) { if (model == null) { @@ -54,7 +54,7 @@ namespace CampusAppWP8.Feed.Exams /// The model. /// Information describing the file. /// true if it succeeds, false if it fails. - private bool CheckIsFileUpToDate(ExamListModel model, FileInfo fileInfo) + private bool CheckIsFileUpToDate(ExamListWp8Model model, FileInfo fileInfo) { if (fileInfo == null || !fileInfo.Exists || fileInfo.Length < 1) { diff --git a/CampusAppWP8/CampusAppWP8/File/Departments/DepartmentFavoriteFile.cs b/CampusAppWP8/CampusAppWP8/File/Departments/DepartmentFavoriteFile.cs index ea7d1511..fd5f4248 100644 --- a/CampusAppWP8/CampusAppWP8/File/Departments/DepartmentFavoriteFile.cs +++ b/CampusAppWP8/CampusAppWP8/File/Departments/DepartmentFavoriteFile.cs @@ -9,9 +9,9 @@ namespace CampusAppWP8.File.Departments { using System.IO; using CampusAppWP8.Model; - using CampusAppWP8.Model.Departments; using CampusAppWP8.Resources; using CampusAppWPortalLib8.Model; + using CampusAppWPortalLib8.Model.Departments; /// /// Feed object to handle favorite department feeds. diff --git a/CampusAppWP8/CampusAppWP8/Model/Exams/ExamListWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Exams/ExamListWp8Model.cs new file mode 100644 index 00000000..0e112c99 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Exams/ExamListWp8Model.cs @@ -0,0 +1,18 @@ +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 02.09.2013 +//---------------------------------------------------------------------- +namespace CampusAppWP8.Model.Exams +{ + using System.Xml.Serialization; + + /// Exam list model. + /// Stubbfel, 02.09.2013. + [XmlRoot("links")] + public class ExamListWp8Model : CampusAppWPortalLib8.Model.Exams.ExamListModel + { + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Exams/ExamWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Exams/ExamWp8Model.cs new file mode 100644 index 00000000..f0d89d4e --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Exams/ExamWp8Model.cs @@ -0,0 +1,30 @@ +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 02.09.2013 +//---------------------------------------------------------------------- +namespace CampusAppWP8.Model.Exams +{ + using CampusAppWP8.Utility; + + /// Exam model. + /// Stubbfel, 02.09.2013. + public class ExamWp8Model : CampusAppWPortalLib8.Model.Exams.ExamModel + { + #region Property + + /// Gets the caption. + /// The caption. + public string Caption + { + get + { + return Wp8StringManager.StripAndDecodeHTML(this.CourseText + " (" + this.Type + "/" + this.Version + ")"); + } + } + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilModel.cs b/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilModel.cs index 1009645e..abe773c8 100644 --- a/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilModel.cs @@ -57,7 +57,7 @@ namespace CampusAppWP8.Model.StudentCouncil int num; if (int.TryParse(this.faculty, out num)) { - this.faculty = AppResources.Faculty + " " + num; + this.faculty = CampusAppWPortalLib8.Resources.AppResources.Faculty + " " + num; } } } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs index c6e21ac6..f45eb0cb 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs @@ -11,9 +11,9 @@ namespace CampusAppWP8.Pages.Departments using System.Windows; using System.Windows.Controls; using System.Windows.Navigation; - using CampusAppWP8.File.Departments; - using CampusAppWP8.Model.Departments; + using CampusAppWP8.File.Departments; using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Departments; using Microsoft.Phone.Controls; /// diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs index a07fcc3b..cfdf92f8 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs @@ -51,13 +51,13 @@ namespace CampusAppWP8.Pages.Departments { DepartmentIndexPage.feed = new DepartmentFeed(false); } - + DepartmentIndexPage.feed.OnLoaded += new DepartmentFeed.OnIO(this.SetupFacultyList); DepartmentIndexPage.feed.OnFailedWeb += new DepartmentFeed.OnFailed(this.FeedIsFailedWeb); DepartmentIndexPage.feed.OnFailedFile += new DepartmentFeed.OnFailed(this.FeedIsFailedFile); - DepartmentIndexPage.feed.LoadData(Utilities.GetLoadModus()); - + DepartmentIndexPage.feed.LoadData(Utilities.GetLoadModus()); + if (DepartmentIndexPage.favorite == null) { DepartmentIndexPage.favorite = new DepartmentFavoriteFile(false); @@ -160,7 +160,7 @@ namespace CampusAppWP8.Pages.Departments { if (NavigationMode.Back == e.NavigationMode) { - DepartmentIndexPage.favorite.SaveData(); + DepartmentIndexPage.favorite.SaveData(); } base.OnNavigatedFrom(e); @@ -195,12 +195,12 @@ namespace CampusAppWP8.Pages.Departments { if (DepartmentIndexPage.favorite.Model == null) { - DepartmentIndexPage.favorite.Model = new Model.Departments.DepartmentModel(); + DepartmentIndexPage.favorite.Model = new CampusAppWPortalLib8.Model.Departments.DepartmentModel(); } if (DepartmentIndexPage.favorite.Model.Faculties.Count == 0) { - DepartmentIndexPage.favorite.Model.Faculties.Add(new Model.Departments.FacultyModel("favorites")); + DepartmentIndexPage.favorite.Model.Faculties.Add(new CampusAppWPortalLib8.Model.Departments.FacultyModel("favorites")); } } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml index 62fd0e93..5e6f7462 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml @@ -17,10 +17,6 @@ - - - - diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs index 95b27075..1dd9291d 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs @@ -12,8 +12,8 @@ namespace CampusAppWP8.Pages.Departments using System.Windows; using System.Windows.Controls; using System.Windows.Navigation; - using CampusAppWP8.Model.Departments; using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Departments; using Microsoft.Phone.Controls; /// @@ -186,7 +186,7 @@ namespace CampusAppWP8.Pages.Departments Button btn = this.lastClickedBtn as Button; TextBlock btnText = btn.Content as TextBlock; - Model.Departments.ChairModel tempModel = DepartmentIndexPage.GetFeed().Model.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) { diff --git a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs index bce8f255..55aad63b 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs @@ -59,7 +59,7 @@ namespace CampusAppWP8.Pages.Exams } this.ProgressBar.Visibility = System.Windows.Visibility.Visible; - this.feed.LoadData(Utilities.GetLoadModus()); + this.feed.LoadData(Utilities.GetLoadModus()); } /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs index 0d621fb5..1cfb7afa 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs @@ -285,15 +285,6 @@ namespace CampusAppWP8.Resources { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Fakultät ähnelt. - /// - public static string Faculty { - get { - return ResourceManager.GetString("Faculty", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die Favoriten ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx index 9528d551..ebfc23d2 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx @@ -230,9 +230,6 @@ Veranstaltungsart - - Fakultät - Lehrstühle diff --git a/CampusAppWP8/CampusAppWP8/Model/Departments/ChairModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Departments/ChairModel.cs similarity index 98% rename from CampusAppWP8/CampusAppWP8/Model/Departments/ChairModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Departments/ChairModel.cs index 968f91ab..704796e6 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Departments/ChairModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Departments/ChairModel.cs @@ -5,7 +5,7 @@ // fiedlchr // 24.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Departments +namespace CampusAppWPortalLib8.Model.Departments { using System.Globalization; using System.Xml.Serialization; diff --git a/CampusAppWP8/CampusAppWP8/Model/Departments/DepartmentModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Departments/DepartmentModel.cs similarity index 98% rename from CampusAppWP8/CampusAppWP8/Model/Departments/DepartmentModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Departments/DepartmentModel.cs index 202bc929..37ca6719 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Departments/DepartmentModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Departments/DepartmentModel.cs @@ -5,7 +5,7 @@ // fiedlchr // 24.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Departments +namespace CampusAppWPortalLib8.Model.Departments { using System; using System.Collections.ObjectModel; diff --git a/CampusAppWP8/CampusAppWP8/Model/Departments/FacultyModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Departments/FacultyModel.cs similarity index 98% rename from CampusAppWP8/CampusAppWP8/Model/Departments/FacultyModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Departments/FacultyModel.cs index 3014dcf2..802fe20e 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Departments/FacultyModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Departments/FacultyModel.cs @@ -5,11 +5,11 @@ // fiedlchr // 24.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Departments +namespace CampusAppWPortalLib8.Model.Departments { using System.Collections.ObjectModel; using System.Xml.Serialization; - using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Resources; /// /// Model for holding the faculty information. diff --git a/CampusAppWP8/CampusAppWP8/Model/Exams/ExamListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamListModel.cs similarity index 80% rename from CampusAppWP8/CampusAppWP8/Model/Exams/ExamListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamListModel.cs index 07cfb062..abecce29 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Exams/ExamListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamListModel.cs @@ -5,25 +5,25 @@ // stubbfel // 02.09.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Exams +namespace CampusAppWPortalLib8.Model.Exams { using System.Collections.Generic; using System.Collections.ObjectModel; using System.Xml.Serialization; - using CampusAppWP8.Model.Utility; + using CampusAppWPortalLib8.Model.Utility; /// Exam list model. /// Stubbfel, 02.09.2013. [XmlRoot("links")] - public class ExamListModel + public class ExamListModel { #region Property /// Gets or sets the exams. /// The exams. [XmlElement("link")] - public ObservableCollection Exams { get; set; } + public ObservableCollection Exams { get; set; } #endregion @@ -35,8 +35,14 @@ namespace CampusAppWP8.Model.Exams public List CreateCourseList() { List result = new List(); - foreach (ExamModel exam in this.Exams) + foreach (T item in this.Exams) { + ExamModel exam = item as ExamModel; + if (exam == null) + { + continue; + } + CourseModel tmpModel = new CourseModel(exam.CourseNumber, exam.CourseText); if (!result.Contains(tmpModel)) diff --git a/CampusAppWP8/CampusAppWP8/Model/Exams/ExamModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamModel.cs similarity index 83% rename from CampusAppWP8/CampusAppWP8/Model/Exams/ExamModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamModel.cs index e668fe35..31246ac3 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Exams/ExamModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamModel.cs @@ -5,10 +5,10 @@ // stubbfel // 02.09.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Exams +namespace CampusAppWPortalLib8.Model.Exams { using System.Xml.Serialization; - using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Utility; /// Exam model. /// Stubbfel, 02.09.2013. @@ -56,16 +56,6 @@ namespace CampusAppWP8.Model.Exams [XmlAttribute("link")] public string Link { get; set; } - /// Gets the caption. - /// The caption. - public string Caption - { - get - { - return Wp8StringManager.StripAndDecodeHTML(this.CourseText + " (" + this.Type + "/" + this.Version + ")"); - } - } - #endregion } } diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/StudentCouncil/StudentCouncilListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/StudentCouncil/StudentCouncilListModel.cs new file mode 100644 index 00000000..5f17053a --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/StudentCouncil/StudentCouncilListModel.cs @@ -0,0 +1,81 @@ +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 02.07.2013 +//---------------------------------------------------------------------- +namespace CampusAppWPortalLib8.Model.StudentCouncil +{ + using System; + using System.Collections.Generic; + using System.Collections.ObjectModel; + using System.Linq; + using System.Xml.Serialization; + + /// + /// Model for menus in one week + /// + [XmlRoot("root")] + public class StudentCouncilListModel + { + #region Members + /// + /// Time when the model was created + /// + private readonly DateTime createTime; + + #endregion + + #region Constructor + /// + /// Initializes a new instance of the class. + /// + public StudentCouncilListModel() + { + this.createTime = DateTime.Now; + } + + #endregion + + #region Proberty + /// + /// Gets or sets the StudentCouncils + /// + [XmlArray("data")] + [XmlArrayItem("studentcouncil")] + public ObservableCollection StudentCouncils { get; set; } + + /// + /// Gets the creation time of the model + /// + public DateTime CreateTime + { + get + { + return this.createTime; + } + } + + #endregion + + #region Method + /// + /// Method group the StudentCouncilList by Faculty + /// + /// a Dictionary, where the Key is name of the Faculty und the value is a List of StudentCouncil + public Dictionary> GetStudentCouncilsGroupByFaculty() + { + List> tmpList = this.StudentCouncils.GroupBy(p => p.Faculty).ToList(); + Dictionary> itemMap = new Dictionary>(); + foreach (IGrouping group in tmpList) + { + Dictionary> tempDic = new Dictionary>(); + itemMap.Add(group.Key, group.ToList()); + } + + return itemMap; + } + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/StudentCouncil/StudentCouncilModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/StudentCouncil/StudentCouncilModel.cs new file mode 100644 index 00000000..9b28289b --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/StudentCouncil/StudentCouncilModel.cs @@ -0,0 +1,86 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 02.07.2013 +//----------------------------------------------------------------------------- + +namespace CampusAppWPortalLib8.Model.StudentCouncil +{ + using CampusAppWPortalLib8.Resources; + using System.Xml.Serialization; + + /// + /// Model for menu + /// + public class StudentCouncilModel + { + #region Member + + /// + /// name of the faculty. + /// + private string faculty; + + #endregion + + #region Constructor + + /// + /// Initializes a new instance of the class. + /// + public StudentCouncilModel() + { + } + + #endregion + + #region Property + + /// + /// Gets or sets the faculty of the StudentCouncil. + /// + [XmlAttribute("faculty")] + public string Faculty + { + get + { + return this.faculty; + } + + set + { + if (value != this.faculty) + { + this.faculty = value; + int num; + if (int.TryParse(this.faculty, out num)) + { + this.faculty = AppResources.Faculty + " " + num; + } + } + } + } + + /// + /// Gets or sets the name of the StudentCouncil. + /// + [XmlAttribute("name")] + public string Name { get; set; } + + /// + /// Gets or sets the webpage-url of the StudentCouncil. + /// + [XmlAttribute("url")] + public string Url { get; set; } + + /// + /// Gets or sets the email-address of the StudentCouncil. + /// + [XmlAttribute("email")] + public string Email { get; set; } + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs index 4ff4a10f..3f69718e 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs @@ -61,6 +61,15 @@ namespace CampusAppWPortalLib8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Fakultät ähnelt. + /// + public static string Faculty { + get { + return ResourceManager.GetString("Faculty", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Aktion ähnelt. /// diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx index 1fe86252..d966b0b7 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Fakultät + Aktion From 80d05b9c4538da05eef099c4fdf932ba66cea7cf Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 1 Oct 2013 13:51:15 +0200 Subject: [PATCH 14/22] mv studentcouncil --- CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 2 - .../Feed/StudentCouncil/StudentCouncilFeed.cs | 2 +- .../StudentCouncil/StudentCouncilListModel.cs | 81 ----------------- .../StudentCouncil/StudentCouncilModel.cs | 86 ------------------- .../StudentCouncil/StudentCouncilPage.xaml.cs | 2 +- 5 files changed, 2 insertions(+), 171 deletions(-) delete mode 100644 CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilListModel.cs delete mode 100644 CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilModel.cs diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index f142f19f..fdf8ab7b 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -198,8 +198,6 @@ - - CampusMapPage.xaml diff --git a/CampusAppWP8/CampusAppWP8/Feed/StudentCouncil/StudentCouncilFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/StudentCouncil/StudentCouncilFeed.cs index abd7d900..26c1e860 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/StudentCouncil/StudentCouncilFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/StudentCouncil/StudentCouncilFeed.cs @@ -10,7 +10,7 @@ namespace CampusAppWP8.Feed.StudentCouncil using System; using System.IO; using CampusAppWP8.Model; - using CampusAppWP8.Model.StudentCouncil; + using CampusAppWPortalLib8.Model.StudentCouncil; using CampusAppWP8.Resources; using CampusAppWP8.Utility; using CampusAppWPortalLib8.Model; diff --git a/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilListModel.cs b/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilListModel.cs deleted file mode 100644 index 914798d1..00000000 --- a/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilListModel.cs +++ /dev/null @@ -1,81 +0,0 @@ -//----------------------------------------------------------------------- -// -// Company copyright tag. -// -// stubbfel -// 02.07.2013 -//---------------------------------------------------------------------- -namespace CampusAppWP8.Model.StudentCouncil -{ - using System; - using System.Collections.Generic; - using System.Collections.ObjectModel; - using System.Linq; - using System.Xml.Serialization; - - /// - /// Model for menus in one week - /// - [XmlRoot("root")] - public class StudentCouncilListModel - { - #region Members - /// - /// Time when the model was created - /// - private readonly DateTime createTime; - - #endregion - - #region Constructor - /// - /// Initializes a new instance of the class. - /// - public StudentCouncilListModel() - { - this.createTime = DateTime.Now; - } - - #endregion - - #region Proberty - /// - /// Gets or sets the StudentCouncils - /// - [XmlArray("data")] - [XmlArrayItem("studentcouncil")] - public ObservableCollection StudentCouncils { get; set; } - - /// - /// Gets the creation time of the model - /// - public DateTime CreateTime - { - get - { - return this.createTime; - } - } - - #endregion - - #region Method - /// - /// Method group the StudentCouncilList by Faculty - /// - /// a Dictionary, where the Key is name of the Faculty und the value is a List of StudentCouncil - public Dictionary> GetStudentCouncilsGroupByFaculty() - { - List> tmpList = this.StudentCouncils.GroupBy(p => p.Faculty).ToList(); - Dictionary> itemMap = new Dictionary>(); - foreach (IGrouping group in tmpList) - { - Dictionary> tempDic = new Dictionary>(); - itemMap.Add(group.Key, group.ToList()); - } - - return itemMap; - } - #endregion - } -} diff --git a/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilModel.cs b/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilModel.cs deleted file mode 100644 index abe773c8..00000000 --- a/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilModel.cs +++ /dev/null @@ -1,86 +0,0 @@ -//----------------------------------------------------------------------------- -// -// Company copyright tag. -// -// stubbfel -// 02.07.2013 -//----------------------------------------------------------------------------- - -namespace CampusAppWP8.Model.StudentCouncil -{ - using System.Xml.Serialization; - using CampusAppWP8.Resources; - - /// - /// Model for menu - /// - public class StudentCouncilModel - { - #region Member - - /// - /// name of the faculty. - /// - private string faculty; - - #endregion - - #region Constructor - - /// - /// Initializes a new instance of the class. - /// - public StudentCouncilModel() - { - } - - #endregion - - #region Property - - /// - /// Gets or sets the faculty of the StudentCouncil. - /// - [XmlAttribute("faculty")] - public string Faculty - { - get - { - return this.faculty; - } - - set - { - if (value != this.faculty) - { - this.faculty = value; - int num; - if (int.TryParse(this.faculty, out num)) - { - this.faculty = CampusAppWPortalLib8.Resources.AppResources.Faculty + " " + num; - } - } - } - } - - /// - /// Gets or sets the name of the StudentCouncil. - /// - [XmlAttribute("name")] - public string Name { get; set; } - - /// - /// Gets or sets the webpage-url of the StudentCouncil. - /// - [XmlAttribute("url")] - public string Url { get; set; } - - /// - /// Gets or sets the email-address of the StudentCouncil. - /// - [XmlAttribute("email")] - public string Email { get; set; } - - #endregion - } -} diff --git a/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs index 06ab89bd..d57a1ffe 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs @@ -60,7 +60,7 @@ namespace CampusAppWP8.Pages.StudentCouncil } this.ProgressBar.Visibility = System.Windows.Visibility.Visible; - this.feed.LoadData(Utilities.GetLoadModus()); + this.feed.LoadData(Utilities.GetLoadModus()); } /// From dc3c527996c49b4a9a718bc3108ca6b84241faa6 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 1 Oct 2013 14:10:20 +0200 Subject: [PATCH 15/22] mv enums --- .../CampusAppWP8/Api/GeoApi/CampusSpsApi.cs | 4 +- CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 3 - .../CampusAppWP8/Feed/Mensa/MensaFeed.cs | 10 +-- .../Model/Campusmap/CBMainMapModel.cs | 2 +- .../Model/Lecture/LecturePageModel.cs | 1 + .../Model/Setting/UserProfilModel.cs | 67 +------------------ .../Utility/CampusListPickerItemListModel.cs | 9 +-- .../Utility/DegreeListPickerItemListModel.cs | 7 +- .../Utility/RoleListPickerItemListModel.cs | 5 +- .../CampusAppWP8/Pages/Exams/Exams.xaml.cs | 14 ++-- .../Pages/Mensa/MensaPage.xaml.cs | 8 +-- .../Pages/Setting/UserProfil.xaml.cs | 7 +- .../Model/Settings/CampusTypes.cs | 34 ++++++++++ .../Model/Settings/DegreeTypes.cs | 29 ++++++++ .../Model/Settings/RolesTypes.cs | 24 +++++++ .../Model/Utility/ListPickerItemListModel.cs | 2 +- .../Model/Utility/ListPickerItemModel.cs | 2 +- .../SemesterListPickerItemListModel.cs | 6 +- 18 files changed, 128 insertions(+), 106 deletions(-) create mode 100644 CampusAppWP8/CampusAppWPortalLib8/Model/Settings/CampusTypes.cs create mode 100644 CampusAppWP8/CampusAppWPortalLib8/Model/Settings/DegreeTypes.cs create mode 100644 CampusAppWP8/CampusAppWPortalLib8/Model/Settings/RolesTypes.cs rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Utility/ListPickerItemListModel.cs (98%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Utility/ListPickerItemModel.cs (96%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Utility/SemesterListPickerItemListModel.cs (88%) diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs index e6b79166..8809c8a2 100644 --- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs @@ -56,14 +56,14 @@ namespace CampusAppWP8.Api.GeoApi /// Method return the campus of the placeList /// /// actual campus - public CampusAppWP8.Model.Setting.UserProfilModel.Campus GetCampus() + public CampusAppWPortalLib8.Model.Settings.Campus GetCampus() { if (this.Model == null) { return Settings.UserProfil.DefaultCampus; } - CampusAppWP8.Model.Setting.UserProfilModel.Campus campus; + CampusAppWPortalLib8.Model.Settings.Campus campus; foreach (PlaceModel place in this.Model.Places) { if (Enum.TryParse(place.PlaceId, true, out campus)) diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index fdf8ab7b..9af87b3b 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -163,8 +163,6 @@ - - NFC.xaml @@ -230,7 +228,6 @@ ModulWebPage.xaml - ResultDetailPage.xaml diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs index 6f117f4a..39755ba2 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs @@ -52,17 +52,17 @@ namespace CampusAppWP8.Feed.Mensa /// /// camus parameter /// the correct mensaFeed - public static MensaFeed CreateCampusMensaFeed(CampusAppWP8.Model.Setting.UserProfilModel.Campus campus) + public static MensaFeed CreateCampusMensaFeed(CampusAppWPortalLib8.Model.Settings.Campus campus) { switch (campus) { - case CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_MAIN: + case CampusAppWPortalLib8.Model.Settings.Campus.CB_MAIN: return new MensaFeedCBMain(); - case CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_NORTH: + case CampusAppWPortalLib8.Model.Settings.Campus.CB_NORTH: return new MensaFeedCBNorth(); - case CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_SOUTH: + case CampusAppWPortalLib8.Model.Settings.Campus.CB_SOUTH: return new MensaFeedCBSouth(); - case CampusAppWP8.Model.Setting.UserProfilModel.Campus.SFB_MAIN: + case CampusAppWPortalLib8.Model.Settings.Campus.SFB_MAIN: return new MensaFeedSBFMain(); default: return new MensaFeedCBMain(); diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/CBMainMapModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/CBMainMapModel.cs index ebb66894..9f3c79b5 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/CBMainMapModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/CBMainMapModel.cs @@ -21,7 +21,7 @@ namespace CampusAppWP8.Model.Campusmap #region Member /// Variable for the identify of the campus. - private static readonly string Campus = ((int)CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_MAIN).ToString(); + private static readonly string Campus = ((int)CampusAppWPortalLib8.Model.Settings.Campus.CB_MAIN).ToString(); #endregion diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs index a525053f..4696ad2e 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs @@ -10,6 +10,7 @@ namespace CampusAppWP8.Model.Lecture using System.Runtime.Serialization; using CampusAppWP8.Model.Setting; using CampusAppWP8.Model.Utility; + using CampusAppWPortalLib8.Model.Utility; /// /// Model for the LecturePage diff --git a/CampusAppWP8/CampusAppWP8/Model/Setting/UserProfilModel.cs b/CampusAppWP8/CampusAppWP8/Model/Setting/UserProfilModel.cs index eb957228..f61df5a4 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Setting/UserProfilModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Setting/UserProfilModel.cs @@ -9,6 +9,7 @@ namespace CampusAppWP8.Model.Setting { using System.Xml.Serialization; using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Settings; /// /// Model for the profile of an user @@ -35,72 +36,6 @@ namespace CampusAppWP8.Model.Setting #endregion - #region Enums - /// - /// Specifies the degrees. - /// - public enum DegreeType - { - /// - /// bachelor degree - /// - BACHELOR = 82, - - /// - /// master degree - /// - MASTER = 88, - - /// - /// diploma degree - /// - DIPLOM = 11 - } - - /// - /// Specifies the role of the user. - /// - public enum RoleType - { - /// - /// for students (01). - /// - STUDENT = 1, - - /// - /// for staffs (10). - /// - STAFF = 2, - } - - /// - /// Specifies the campus of the user. - /// - public enum Campus - { - /// - /// Cottbus -> MainCampus - /// - CB_MAIN = 1, - - /// - /// Cottbus -> NorthCampus - /// - CB_NORTH = 4, - - /// - /// Cottbus -> SouthCampus - /// - CB_SOUTH = 2, - - /// - /// Senftenberg -> MainCampus - /// - SFB_MAIN = 3 - } - - #endregion - #region Proberties /// diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs b/CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs index 60469c7f..6abdea1a 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs @@ -7,6 +7,7 @@ namespace CampusAppWP8.Model.Utility { using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Utility; /// /// This Class creates a list of degrees @@ -33,10 +34,10 @@ namespace CampusAppWP8.Model.Utility /// protected override void LoadList() { - this.AddItem(new ListPickerItemModel(((int)CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_MAIN).ToString(), AppResources.Campus_CBMain)); - this.AddItem(new ListPickerItemModel(((int)CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_NORTH).ToString(), AppResources.Campus_CBNorth)); - this.AddItem(new ListPickerItemModel(((int)CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_SOUTH).ToString(), AppResources.Campus_CBSouth)); - this.AddItem(new ListPickerItemModel(((int)CampusAppWP8.Model.Setting.UserProfilModel.Campus.SFB_MAIN).ToString(), AppResources.Campus_SFBMain)); + this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.Campus.CB_MAIN).ToString(), AppResources.Campus_CBMain)); + this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.Campus.CB_NORTH).ToString(), AppResources.Campus_CBNorth)); + this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.Campus.CB_SOUTH).ToString(), AppResources.Campus_CBSouth)); + this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.Campus.SFB_MAIN).ToString(), AppResources.Campus_SFBMain)); } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/DegreeListPickerItemListModel.cs b/CampusAppWP8/CampusAppWP8/Model/Utility/DegreeListPickerItemListModel.cs index 515eda2a..734d8a41 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/DegreeListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Utility/DegreeListPickerItemListModel.cs @@ -7,6 +7,7 @@ namespace CampusAppWP8.Model.Utility { using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Utility; /// /// This Class creates a list of degrees @@ -33,9 +34,9 @@ namespace CampusAppWP8.Model.Utility /// protected override void LoadList() { - this.AddItem(new ListPickerItemModel(((int)CampusAppWP8.Model.Setting.UserProfilModel.DegreeType.BACHELOR).ToString(), AppResources.Degree_Bachelor)); - this.AddItem(new ListPickerItemModel(((int)CampusAppWP8.Model.Setting.UserProfilModel.DegreeType.MASTER).ToString(), AppResources.Degree_Master)); - this.AddItem(new ListPickerItemModel(((int)CampusAppWP8.Model.Setting.UserProfilModel.DegreeType.DIPLOM).ToString(), AppResources.Degree_Diploma)); + this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.DegreeType.BACHELOR).ToString(), AppResources.Degree_Bachelor)); + this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.DegreeType.MASTER).ToString(), AppResources.Degree_Master)); + this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.DegreeType.DIPLOM).ToString(), AppResources.Degree_Diploma)); } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/RoleListPickerItemListModel.cs b/CampusAppWP8/CampusAppWP8/Model/Utility/RoleListPickerItemListModel.cs index e185f875..25bcf187 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/RoleListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Utility/RoleListPickerItemListModel.cs @@ -7,6 +7,7 @@ namespace CampusAppWP8.Model.Utility { using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Utility; /// /// Class for the RoleList @@ -33,8 +34,8 @@ namespace CampusAppWP8.Model.Utility /// protected override void LoadList() { - this.AddItem(new ListPickerItemModel(CampusAppWP8.Model.Setting.UserProfilModel.RoleType.STUDENT.ToString(), AppResources.Setting_RoleStudent)); - this.AddItem(new ListPickerItemModel(CampusAppWP8.Model.Setting.UserProfilModel.RoleType.STAFF.ToString(), AppResources.Setting_RoleStaff)); + this.AddItem(new ListPickerItemModel(CampusAppWPortalLib8.Model.Settings.RoleType.STUDENT.ToString(), AppResources.Setting_RoleStudent)); + this.AddItem(new ListPickerItemModel(CampusAppWPortalLib8.Model.Settings.RoleType.STAFF.ToString(), AppResources.Setting_RoleStaff)); } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs index 55aad63b..d530836b 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs @@ -115,17 +115,17 @@ namespace CampusAppWP8.Pages.Exams private void SetupExamList() { var bachelorList = from exam in this.feed.Model.Exams - where exam.DegreeNumber.Equals(((int)CampusAppWP8.Model.Setting.UserProfilModel.DegreeType.BACHELOR).ToString()) + where exam.DegreeNumber.Equals(((int)CampusAppWPortalLib8.Model.Settings.DegreeType.BACHELOR).ToString()) orderby exam.CourseText, exam.Version select exam; var masterList = from exam in this.feed.Model.Exams - where exam.DegreeNumber.Equals(((int)CampusAppWP8.Model.Setting.UserProfilModel.DegreeType.MASTER).ToString()) + where exam.DegreeNumber.Equals(((int)CampusAppWPortalLib8.Model.Settings.DegreeType.MASTER).ToString()) orderby exam.CourseText, exam.Version select exam; var diplomaList = from exam in this.feed.Model.Exams - where exam.DegreeNumber.Equals(((int)CampusAppWP8.Model.Setting.UserProfilModel.DegreeType.DIPLOM).ToString()) + where exam.DegreeNumber.Equals(((int)CampusAppWPortalLib8.Model.Settings.DegreeType.DIPLOM).ToString()) orderby exam.CourseText, exam.Version select exam; @@ -143,17 +143,17 @@ namespace CampusAppWP8.Pages.Exams int result = App.LoadFromIsolatedStorage(Constants.ExamPageModelKey); if (result < 0 || result > 2) { - Model.Setting.UserProfilModel.DegreeType degree = Settings.UserProfil.Degree; + CampusAppWPortalLib8.Model.Settings.DegreeType degree = Settings.UserProfil.Degree; switch (degree) { - case Model.Setting.UserProfilModel.DegreeType.BACHELOR: + case CampusAppWPortalLib8.Model.Settings.DegreeType.BACHELOR: result = 0; break; - case Model.Setting.UserProfilModel.DegreeType.MASTER: + case CampusAppWPortalLib8.Model.Settings.DegreeType.MASTER: result = 1; break; - case Model.Setting.UserProfilModel.DegreeType.DIPLOM: + case CampusAppWPortalLib8.Model.Settings.DegreeType.DIPLOM: result = 2; break; default: diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs index 0f8cddd4..10661192 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs @@ -163,7 +163,7 @@ namespace CampusAppWP8.Pages.Mensa /// Method initialize the Feed depends of a campus /// /// campus parameter - private void InitializeFeed(CampusAppWP8.Model.Setting.UserProfilModel.Campus campus) + private void InitializeFeed(CampusAppWPortalLib8.Model.Settings.Campus campus) { this.feed = MensaFeed.CreateCampusMensaFeed(campus); this.feed.OnLoaded += new MensaFeed.OnIO(this.FeedIsReady); @@ -335,7 +335,7 @@ namespace CampusAppWP8.Pages.Mensa private void ApplicationBarMenuItem_Click(object sender, EventArgs e) { this.ProgressBar.Visibility = System.Windows.Visibility.Visible; - this.InitializeFeed(CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_MAIN); + this.InitializeFeed(CampusAppWPortalLib8.Model.Settings.Campus.CB_MAIN); } /// Event handler. Called by ApplicationBarMenuItem2 for click events. @@ -345,7 +345,7 @@ namespace CampusAppWP8.Pages.Mensa private void ApplicationBarMenuItem2_Click(object sender, EventArgs e) { this.ProgressBar.Visibility = System.Windows.Visibility.Visible; - this.InitializeFeed(CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_SOUTH); + this.InitializeFeed(CampusAppWPortalLib8.Model.Settings.Campus.CB_SOUTH); } /// Event handler. Called by ApplicationBarMenuItem3 for click events. @@ -355,7 +355,7 @@ namespace CampusAppWP8.Pages.Mensa private void ApplicationBarMenuItem3_Click(object sender, EventArgs e) { this.ProgressBar.Visibility = System.Windows.Visibility.Visible; - this.InitializeFeed(CampusAppWP8.Model.Setting.UserProfilModel.Campus.SFB_MAIN); + this.InitializeFeed(CampusAppWPortalLib8.Model.Settings.Campus.SFB_MAIN); } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs index a868f4c1..7025d280 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs @@ -14,6 +14,7 @@ namespace CampusAppWP8.Pages.Setting using CampusAppWP8.Model.Utility; using CampusAppWPortalLib8.Utility; using Microsoft.Phone.Controls; + using CampusAppWPortalLib8.Model.Utility; /// /// Class for the UserProfilePage @@ -108,10 +109,10 @@ namespace CampusAppWP8.Pages.Setting try { this.userProfil.Course = int.Parse(((ListPickerItemModel)this.Course.SelectedItem).Value); - this.userProfil.Degree = (CampusAppWP8.Model.Setting.UserProfilModel.DegreeType)Enum.Parse(typeof(CampusAppWP8.Model.Setting.UserProfilModel.DegreeType), ((ListPickerItemModel)this.Degree.SelectedItem).Value); + this.userProfil.Degree = (CampusAppWPortalLib8.Model.Settings.DegreeType)Enum.Parse(typeof(CampusAppWPortalLib8.Model.Settings.DegreeType), ((ListPickerItemModel)this.Degree.SelectedItem).Value); this.userProfil.Semester = int.Parse(((ListPickerItemModel)this.Semster.SelectedItem).Value); - this.userProfil.Role = (CampusAppWP8.Model.Setting.UserProfilModel.RoleType)Enum.Parse(typeof(CampusAppWP8.Model.Setting.UserProfilModel.RoleType), ((ListPickerItemModel)this.Role.SelectedItem).Value); - this.userProfil.DefaultCampus = (CampusAppWP8.Model.Setting.UserProfilModel.Campus)Enum.Parse(typeof(CampusAppWP8.Model.Setting.UserProfilModel.Campus), ((ListPickerItemModel)this.Campus.SelectedItem).Value); + this.userProfil.Role = (CampusAppWPortalLib8.Model.Settings.RoleType)Enum.Parse(typeof(CampusAppWPortalLib8.Model.Settings.RoleType), ((ListPickerItemModel)this.Role.SelectedItem).Value); + this.userProfil.DefaultCampus = (CampusAppWPortalLib8.Model.Settings.Campus)Enum.Parse(typeof(CampusAppWPortalLib8.Model.Settings.Campus), ((ListPickerItemModel)this.Campus.SelectedItem).Value); } catch (Exception e) { diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Settings/CampusTypes.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Settings/CampusTypes.cs new file mode 100644 index 00000000..950f2490 --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Settings/CampusTypes.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CampusAppWPortalLib8.Model.Settings +{ + /// + /// Specifies the campus of the user. + /// + public enum Campus + { + /// + /// Cottbus -> MainCampus + /// + CB_MAIN = 1, + + /// + /// Cottbus -> NorthCampus + /// + CB_NORTH = 4, + + /// + /// Cottbus -> SouthCampus + /// + CB_SOUTH = 2, + + /// + /// Senftenberg -> MainCampus + /// + SFB_MAIN = 3 + } +} diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Settings/DegreeTypes.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Settings/DegreeTypes.cs new file mode 100644 index 00000000..f1cbbb79 --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Settings/DegreeTypes.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CampusAppWPortalLib8.Model.Settings +{ + /// + /// Specifies the degrees. + /// + public enum DegreeType + { + /// + /// bachelor degree + /// + BACHELOR = 82, + + /// + /// master degree + /// + MASTER = 88, + + /// + /// diploma degree + /// + DIPLOM = 11 + } +} diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Settings/RolesTypes.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Settings/RolesTypes.cs new file mode 100644 index 00000000..cda9ee5c --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Settings/RolesTypes.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CampusAppWPortalLib8.Model.Settings +{ + /// + /// Specifies the role of the user. + /// + public enum RoleType + { + /// + /// for students (01). + /// + STUDENT = 1, + + /// + /// for staffs (10). + /// + STAFF = 2, + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/ListPickerItemListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/ListPickerItemListModel.cs similarity index 98% rename from CampusAppWP8/CampusAppWP8/Model/Utility/ListPickerItemListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Utility/ListPickerItemListModel.cs index f9985ff4..bbcd1a64 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/ListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/ListPickerItemListModel.cs @@ -5,7 +5,7 @@ // stubbfel // 25.07.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Utility +namespace CampusAppWPortalLib8.Model.Utility { using System.Collections.Generic; diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/ListPickerItemModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/ListPickerItemModel.cs similarity index 96% rename from CampusAppWP8/CampusAppWP8/Model/Utility/ListPickerItemModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Utility/ListPickerItemModel.cs index d20163bc..0a394f3a 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/ListPickerItemModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/ListPickerItemModel.cs @@ -5,7 +5,7 @@ // stubbfel // 13.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Utility +namespace CampusAppWPortalLib8.Model.Utility { /// /// Model for the ListPickerItems diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/SemesterListPickerItemListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/SemesterListPickerItemListModel.cs similarity index 88% rename from CampusAppWP8/CampusAppWP8/Model/Utility/SemesterListPickerItemListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Utility/SemesterListPickerItemListModel.cs index 44e206d1..07e254b0 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/SemesterListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/SemesterListPickerItemListModel.cs @@ -4,10 +4,8 @@ // stubbfel // 25.07.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Utility +namespace CampusAppWPortalLib8.Model.Utility { - using CampusAppWP8.Resources; - /// /// Class for the SemesterList /// @@ -33,9 +31,9 @@ namespace CampusAppWP8.Model.Utility /// protected override void LoadList() { - this.AddItem(new ListPickerItemModel("20131", "SoSe 13")); this.AddItem(new ListPickerItemModel("20132", "WiSe 13/14")); this.AddItem(new ListPickerItemModel("20141", "SoSe 14")); + this.AddItem(new ListPickerItemModel("20142", "WiSe 14/15")); } #endregion From 7668450d9ce1abcb2e3c4c77cb2287f1718491bd Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 1 Oct 2013 14:53:03 +0200 Subject: [PATCH 16/22] mv listpickers --- CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 5 +- .../Feed/Mensa/MensaFeedCBMain.cs | 2 +- .../Feed/Mensa/MensaFeedCBNorth.cs | 2 +- .../Feed/Mensa/MensaFeedCBSouth.cs | 2 +- .../Feed/Mensa/MensaFeedSBFMain.cs | 2 +- .../Model/Lecture/LecturePageModel.cs | 6 +- .../CourseListPickerItemListWp8Model.cs | 123 ++++++++++++++++++ .../Pages/Mensa/MensaPage.xaml.cs | 6 +- .../Pages/Setting/UserProfil.xaml.cs | 6 +- .../Resources/AppResources.Designer.cs | 81 ------------ .../CampusAppWP8/Resources/AppResources.resx | 27 ---- .../Utility/CampusListPickerItemListModel.cs | 4 +- .../Utility/CourseListPickerItemListModel.cs | 111 +--------------- .../Utility/DegreeListPickerItemListModel.cs | 4 +- .../Utility/RoleListPickerItemListModel.cs | 4 +- .../Resources/AppResources.Designer.cs | 81 ++++++++++++ .../Resources/AppResources.resx | 27 ++++ 17 files changed, 255 insertions(+), 238 deletions(-) create mode 100644 CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListWp8Model.cs rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Utility/CampusListPickerItemListModel.cs (94%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Utility/CourseListPickerItemListModel.cs (56%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Utility/DegreeListPickerItemListModel.cs (94%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Utility/RoleListPickerItemListModel.cs (93%) diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index 9af87b3b..0450dc67 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -132,9 +132,7 @@ - - - + RoomListPage.xaml @@ -162,7 +160,6 @@ - NFC.xaml diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBMain.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBMain.cs index 98aeca33..e07ffd42 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBMain.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBMain.cs @@ -22,7 +22,7 @@ namespace CampusAppWP8.Feed.Mensa public MensaFeedCBMain() : base(Constants.FileMensa_Shedule_CBMain, CampusAppWPortalLib8.Resources.Constants.UrlMensa_Week_CBMain) { - this.Title = AppResources.Campus_CBMain; + this.Title = CampusAppWPortalLib8.Resources.AppResources.Campus_CBMain; } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBNorth.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBNorth.cs index 6334e3be..4c9d8d5b 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBNorth.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBNorth.cs @@ -22,7 +22,7 @@ namespace CampusAppWP8.Feed.Mensa public MensaFeedCBNorth() : base(Constants.FileMensa_Shedule_CBNorth, CampusAppWPortalLib8.Resources.Constants.UrlMensa_Week_CBNorth) { - this.Title = AppResources.Campus_CBNorth; + this.Title = CampusAppWPortalLib8.Resources.AppResources.Campus_CBNorth; } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBSouth.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBSouth.cs index ab2f80d3..941e5cb4 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBSouth.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBSouth.cs @@ -22,7 +22,7 @@ namespace CampusAppWP8.Feed.Mensa public MensaFeedCBSouth() : base(Constants.FileMensa_Shedule_CBSouth, CampusAppWPortalLib8.Resources.Constants.UrlMensa_Week_CBSouth) { - this.Title = AppResources.Campus_CBSouth; + this.Title = CampusAppWPortalLib8.Resources.AppResources.Campus_CBSouth; } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedSBFMain.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedSBFMain.cs index 39e34a80..3d562a3c 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedSBFMain.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedSBFMain.cs @@ -22,7 +22,7 @@ namespace CampusAppWP8.Feed.Mensa public MensaFeedSBFMain() : base(Constants.FileMensa_Shedule_SBFMain, CampusAppWPortalLib8.Resources.Constants.UrlMensa_Week_SBFMain) { - this.Title = AppResources.Campus_SFBMain; + this.Title = CampusAppWPortalLib8.Resources.AppResources.Campus_SFBMain; } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs index 4696ad2e..6afc7a82 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs @@ -56,7 +56,7 @@ namespace CampusAppWP8.Model.Lecture /// /// need to be extend to full list /// - private CourseListPickerItemListModel courseList; + private CourseListPickerItemListWp8Model courseList; /// /// List of the degrees @@ -266,8 +266,8 @@ namespace CampusAppWP8.Model.Lecture /// public void LoadLists() { - this.courseList = new CourseListPickerItemListModel(); - this.courseList.OnLoaded += new CourseListPickerItemListModel.OnIO(this.CourseListIsReady); + this.courseList = new CourseListPickerItemListWp8Model(); + this.courseList.OnLoaded += new CourseListPickerItemListWp8Model.OnIO(this.CourseListIsReady); this.courseList.LoadCourseList(); } diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListWp8Model.cs new file mode 100644 index 00000000..d520b49d --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListWp8Model.cs @@ -0,0 +1,123 @@ +// +// Company copyright tag.List +// +// stubbfel +// 25.07.2013 +//---------------------------------------------------------------------- +namespace CampusAppWP8.Model.Utility +{ + using System.Collections.Generic; + using System.Linq; + using CampusAppWP8.Feed.Utility; + using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Model.Utility; + + /// + /// This is a class for the courseList + /// + public class CourseListPickerItemListWp8Model : CampusAppWPortalLib8.Model.Utility.CourseListPickerItemListModel + { + #region Member + + /// List of courses. + private CourseFeed courseList; + + #endregion + + #region Constructor + + /// + /// Initializes a new instance of the class. + /// + public CourseListPickerItemListWp8Model() + { + } + + #endregion + + #region Events + + /// + /// Delegate of the OnIO callback function. + /// + public delegate void OnIO(); + + /// + /// Callback pointer, called after loading. + /// + public event OnIO OnLoaded = null; + + #endregion + + #region Method + + #region public + + /// + /// Overrides the LoadList-Method + /// + public void LoadCourseList() + { + if (this.courseList == null || this.courseList.Model == null) + { + this.courseList = new CourseFeed(); + this.courseList.OnLoaded += new CourseFeed.OnIO(this.FeedIsReady); + this.courseList.OnFailedWeb += new CourseFeed.OnFailed(this.FeedIsFail); + this.courseList.OnFailedFile += new CourseFeed.OnFailed(this.FeedIsFail); + this.courseList.LoadData(); + } + else + { + this.CallOnLoaded(); + } + } + + #endregion + + #region private + + /// Feed is fail. + /// Stubbfel, 10.09.2013. + private void FeedIsFail() + { + this.FallBackList(); + this.CallOnLoaded(); + } + + /// Feed is ready. + /// Stubbfel, 10.09.2013. + private void FeedIsReady() + { + this.ConvertToListPickerItemModel(this.courseList.Model.CreateCourseList()); + this.CallOnLoaded(); + } + + /// Converts a courseList to a list picker item model. + /// Stubbfel, 10.09.2013. + /// List of courses. + private void ConvertToListPickerItemModel(List courseList) + { + foreach (CourseModel course in courseList) + { + this.AddItem(new ListPickerItemModel(course.CourseNumber, Wp8StringManager.StripAndDecodeHTML(course.CourseText))); + } + + this.List = this.List.OrderBy(o => o.Text).ToList(); + this.courseList.SaveData(); + } + + /// Call on loaded. + /// Stubbfel, 10.09.2013. + private void CallOnLoaded() + { + if (this.OnLoaded != null) + { + this.OnLoaded(); + } + } + + #endregion + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs index 10661192..d13c3525 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs @@ -73,17 +73,17 @@ namespace CampusAppWP8.Pages.Mensa if (menuItem1 != null) { - menuItem1.Text = AppResources.Campus_CBMain; + menuItem1.Text = CampusAppWPortalLib8.Resources.AppResources.Campus_CBMain; } if (menuItem2 != null) { - menuItem2.Text = AppResources.Campus_CBSouth; + menuItem2.Text = CampusAppWPortalLib8.Resources.AppResources.Campus_CBSouth; } if (menuItem3 != null) { - menuItem3.Text = AppResources.Campus_SFBMain; + menuItem3.Text = CampusAppWPortalLib8.Resources.AppResources.Campus_SFBMain; } } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs index 7025d280..6455d003 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs @@ -29,7 +29,7 @@ namespace CampusAppWP8.Pages.Setting private UserProfilModel userProfil; /// List of courses. - private CourseListPickerItemListModel courseList; + private CourseListPickerItemListWp8Model courseList; #endregion @@ -72,8 +72,8 @@ namespace CampusAppWP8.Pages.Setting private void LoadListPicker() { this.ProgressBar.Visibility = Visibility.Visible; - this.courseList = new CourseListPickerItemListModel(); - this.courseList.OnLoaded += new CourseListPickerItemListModel.OnIO(this.SetupListPickers); + this.courseList = new CourseListPickerItemListWp8Model(); + this.courseList.OnLoaded += new CourseListPickerItemListWp8Model.OnIO(this.SetupListPickers); this.courseList.LoadCourseList(); } diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs index 1cfb7afa..3a118d49 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs @@ -105,42 +105,6 @@ namespace CampusAppWP8.Resources { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Hauptcampus ähnelt. - /// - public static string Campus_CBMain { - get { - return ResourceManager.GetString("Campus_CBMain", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Nordcampus ähnelt. - /// - public static string Campus_CBNorth { - get { - return ResourceManager.GetString("Campus_CBNorth", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Südcampus ähnelt. - /// - public static string Campus_CBSouth { - get { - return ResourceManager.GetString("Campus_CBSouth", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Senftenberg Hauptcampus ähnelt. - /// - public static string Campus_SFBMain { - get { - return ResourceManager.GetString("Campus_SFBMain", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die Gebäudeinfos ausblenden ähnelt. /// @@ -195,33 +159,6 @@ namespace CampusAppWP8.Resources { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Bachelor ähnelt. - /// - public static string Degree_Bachelor { - get { - return ResourceManager.GetString("Degree_Bachelor", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Diplom ähnelt. - /// - public static string Degree_Diploma { - get { - return ResourceManager.GetString("Degree_Diploma", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Master ähnelt. - /// - public static string Degree_Master { - get { - return ResourceManager.GetString("Degree_Master", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die Löschen ähnelt. /// @@ -915,24 +852,6 @@ namespace CampusAppWP8.Resources { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Mitarbeiter ähnelt. - /// - public static string Setting_RoleStaff { - get { - return ResourceManager.GetString("Setting_RoleStaff", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Student ähnelt. - /// - public static string Setting_RoleStudent { - get { - return ResourceManager.GetString("Setting_RoleStudent", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die Profileinstellungen ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx index ebfc23d2..bdac3a8f 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx @@ -236,15 +236,6 @@ Link - - Bachelor - - - Diplom - - - Master - Gebäude @@ -311,12 +302,6 @@ Semester - - Mitarbeiter - - - Student - Studiengangsauswahl @@ -335,18 +320,6 @@ Dürfen Positionsdaten enhoben und verwendet werden? - - Cottbus Hauptcampus - - - Cottbus Nordcampus - - - Cottbus Südcampus - - - Senftenberg Hauptcampus - Campusauswahl diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CampusListPickerItemListModel.cs similarity index 94% rename from CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CampusListPickerItemListModel.cs index 6abdea1a..aa60217e 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CampusListPickerItemListModel.cs @@ -4,9 +4,9 @@ // stubbfel // 08.08.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Utility +namespace CampusAppWPortalLib8.Model.Utility { - using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Resources; using CampusAppWPortalLib8.Model.Utility; /// diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CourseListPickerItemListModel.cs similarity index 56% rename from CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CourseListPickerItemListModel.cs index 4df52c37..884df21a 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CourseListPickerItemListModel.cs @@ -4,81 +4,20 @@ // stubbfel // 25.07.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Utility +namespace CampusAppWPortalLib8.Model.Utility { - using System.Collections.Generic; using System.Linq; - using CampusAppWP8.Feed.Utility; - using CampusAppWP8.Utility; - using CampusAppWPortalLib8.Model.Utility; /// /// This is a class for the courseList /// - public class CourseListPickerItemListModel : ListPickerItemListModel + public abstract class CourseListPickerItemListModel : ListPickerItemListModel { - #region Member - - /// List of courses. - private CourseFeed courseList; - - #endregion - - #region Constructor - - /// - /// Initializes a new instance of the class. - /// - public CourseListPickerItemListModel() - { - } - - #endregion - - #region Events - - /// - /// Delegate of the OnIO callback function. - /// - public delegate void OnIO(); - - /// - /// Callback pointer, called after loading. - /// - public event OnIO OnLoaded = null; - - #endregion - - #region Method - - #region public - - /// - /// Overrides the LoadList-Method - /// - public void LoadCourseList() - { - if (this.courseList == null || this.courseList.Model == null) - { - this.courseList = new CourseFeed(); - this.courseList.OnLoaded += new CourseFeed.OnIO(this.FeedIsReady); - this.courseList.OnFailedWeb += new CourseFeed.OnFailed(this.FeedIsFail); - this.courseList.OnFailedFile += new CourseFeed.OnFailed(this.FeedIsFail); - this.courseList.LoadData(); - } - else - { - this.CallOnLoaded(); - } - } - - #endregion - - #region private + #region Method /// Fall back list. /// Stubbfel, 10.09.2013. - private void FallBackList() + protected void FallBackList() { this.AddItem(new ListPickerItemModel("017", "Bauingenieurwesen")); this.AddItem(new ListPickerItemModel("021", "Betriebswirtschaftslehre")); @@ -124,48 +63,6 @@ namespace CampusAppWP8.Model.Utility this.List = this.List.OrderBy(o => o.Text).ToList(); } - /// Feed is fail. - /// Stubbfel, 10.09.2013. - private void FeedIsFail() - { - this.FallBackList(); - this.CallOnLoaded(); - } - - /// Feed is ready. - /// Stubbfel, 10.09.2013. - private void FeedIsReady() - { - this.ConvertToListPickerItemModel(this.courseList.Model.CreateCourseList()); - this.CallOnLoaded(); - } - - /// Converts a courseList to a list picker item model. - /// Stubbfel, 10.09.2013. - /// List of courses. - private void ConvertToListPickerItemModel(List courseList) - { - foreach (CourseModel course in courseList) - { - this.AddItem(new ListPickerItemModel(course.CourseNumber, Wp8StringManager.StripAndDecodeHTML(course.CourseText))); - } - - this.List = this.List.OrderBy(o => o.Text).ToList(); - this.courseList.SaveData(); - } - - /// Call on loaded. - /// Stubbfel, 10.09.2013. - private void CallOnLoaded() - { - if (this.OnLoaded != null) - { - this.OnLoaded(); - } - } - - #endregion - #endregion } } diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/DegreeListPickerItemListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/DegreeListPickerItemListModel.cs similarity index 94% rename from CampusAppWP8/CampusAppWP8/Model/Utility/DegreeListPickerItemListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Utility/DegreeListPickerItemListModel.cs index 734d8a41..8ae21a53 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/DegreeListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/DegreeListPickerItemListModel.cs @@ -4,9 +4,9 @@ // stubbfel // 25.07.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Utility +namespace CampusAppWPortalLib8.Model.Utility { - using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Resources; using CampusAppWPortalLib8.Model.Utility; /// diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/RoleListPickerItemListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/RoleListPickerItemListModel.cs similarity index 93% rename from CampusAppWP8/CampusAppWP8/Model/Utility/RoleListPickerItemListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Utility/RoleListPickerItemListModel.cs index 25bcf187..24ceb6b3 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/RoleListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/RoleListPickerItemListModel.cs @@ -4,9 +4,9 @@ // stubbfel // 25.07.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Utility +namespace CampusAppWPortalLib8.Model.Utility { - using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Resources; using CampusAppWPortalLib8.Model.Utility; /// diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs index 3f69718e..fe2e04e7 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs @@ -61,6 +61,69 @@ namespace CampusAppWPortalLib8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Hauptcampus ähnelt. + /// + public static string Campus_CBMain { + get { + return ResourceManager.GetString("Campus_CBMain", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Nordcampus ähnelt. + /// + public static string Campus_CBNorth { + get { + return ResourceManager.GetString("Campus_CBNorth", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Südcampus ähnelt. + /// + public static string Campus_CBSouth { + get { + return ResourceManager.GetString("Campus_CBSouth", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Senftenberg Hauptcampus ähnelt. + /// + public static string Campus_SFBMain { + get { + return ResourceManager.GetString("Campus_SFBMain", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Bachelor ähnelt. + /// + public static string Degree_Bachelor { + get { + return ResourceManager.GetString("Degree_Bachelor", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Diplom ähnelt. + /// + public static string Degree_Diploma { + get { + return ResourceManager.GetString("Degree_Diploma", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Master ähnelt. + /// + public static string Degree_Master { + get { + return ResourceManager.GetString("Degree_Master", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Fakultät ähnelt. /// @@ -141,5 +204,23 @@ namespace CampusAppWPortalLib8.Resources { return ResourceManager.GetString("MensaApp_Soup", resourceCulture); } } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Mitarbeiter ähnelt. + /// + public static string Setting_RoleStaff { + get { + return ResourceManager.GetString("Setting_RoleStaff", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Student ähnelt. + /// + public static string Setting_RoleStudent { + get { + return ResourceManager.GetString("Setting_RoleStudent", resourceCulture); + } + } } } diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx index d966b0b7..51ef3544 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx @@ -117,6 +117,27 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Cottbus Hauptcampus + + + Cottbus Nordcampus + + + Cottbus Südcampus + + + Senftenberg Hauptcampus + + + Bachelor + + + Diplom + + + Master + Fakultät @@ -144,4 +165,10 @@ Suppe + + Mitarbeiter + + + Student + \ No newline at end of file From f3d066731010febb1b6e4bf04db979b62fdafee9 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 1 Oct 2013 16:34:03 +0200 Subject: [PATCH 17/22] mv personmodels --- .../Api/Person/PersonSearchApi.cs | 2 +- CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 6 +- .../Model/Person/PersonFunctionWp8Model.cs | 77 +++++++++++++++++++ .../Model/Person/PersonListWp8Model.cs | 29 +++++++ .../Pages/Person/PersonPage.xaml.cs | 5 +- .../Model/Person/IPersonFunctionModel.cs | 23 ++++++ .../Model/Person/IPersonModel.cs | 30 ++++++++ .../Model/Person/PersonFunctionModel.cs | 20 ++--- .../Model/Person/PersonListModel.cs | 41 +++++++--- .../Model/Person/PersonModel.cs | 26 ++++--- .../CampusAppWPortalLib8/Settings.StyleCop | 1 + 11 files changed, 220 insertions(+), 40 deletions(-) create mode 100644 CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionWp8Model.cs create mode 100644 CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs create mode 100644 CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonFunctionModel.cs create mode 100644 CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonModel.cs rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Person/PersonFunctionModel.cs (86%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Person/PersonListModel.cs (64%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Person/PersonModel.cs (84%) diff --git a/CampusAppWP8/CampusAppWP8/Api/Person/PersonSearchApi.cs b/CampusAppWP8/CampusAppWP8/Api/Person/PersonSearchApi.cs index a982fb99..e44e2dbd 100644 --- a/CampusAppWP8/CampusAppWP8/Api/Person/PersonSearchApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/Person/PersonSearchApi.cs @@ -15,7 +15,7 @@ namespace CampusAppWP8.Api.Person /// Person search api. /// Stubbfel, 05.09.2013. - public class PersonSearchApi : XmlModel + public class PersonSearchApi : XmlModel { #region Constructor diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index 0450dc67..636dcfc6 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -127,9 +127,9 @@ - - - + + + diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionWp8Model.cs new file mode 100644 index 00000000..09876067 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionWp8Model.cs @@ -0,0 +1,77 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 05.09.2013 +//----------------------------------------------------------------------------- +namespace CampusAppWP8.Model.Person +{ + using System.Xml.Serialization; + using CampusAppWP8.Utility; + + /// Person function model. + /// Stubbfel, 05.09.2013. + public class PersonFunctionWp8Model : CampusAppWPortalLib8.Model.Person.PersonFunctionModel + { + #region Property + + /// Gets or sets the function. + /// The function. + [XmlAttribute("funktion")] + public new string Function + { + get + { + return base.Function; + } + + set + { + if (value != this.Function) + { + base.Function = Wp8StringManager.StripAndDecodeHTML(value); + } + } + } + + /// Gets or sets the appointment. + /// The appointment. + [XmlAttribute("einrichtung")] + public new string Appointment + { + get + { + return base.Appointment; + } + + set + { + if (value != this.Appointment) + { + base.Appointment = Wp8StringManager.StripAndDecodeHTML(value); + } + } + } + + /// Gets or sets the building. + /// The building. + [XmlAttribute("gebaeude")] + public new string Building + { + get + { + return base.Building; + } + + set + { + if (value != this.Building) + { + base.Building = Wp8StringManager.StripAndDecodeHTML(value); + } + } + } + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs new file mode 100644 index 00000000..e3135c13 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs @@ -0,0 +1,29 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 05.09.2013 +//----------------------------------------------------------------------------- + +namespace CampusAppWP8.Model.Person +{ + using System.Xml.Serialization; + using CampusAppWPortalLib8.Model.Person; + + /// Person list model. + /// Stubbfel, 05.09.2013. + [XmlRoot("Uebersicht")] + public class PersonListWp8Model : CampusAppWPortalLib8.Model.Person.PersonListModel + { + /// Gets a person. + /// Stubbfel, 05.09.2013. + /// The identifier. + /// The person. + public new PersonWp8Model GetPerson(string id) + { + IPersonModel tmpPerson = base.GetPerson(id); + return tmpPerson as PersonWp8Model; + } + } +} diff --git a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs index 289d4ad4..ac47c1e4 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs @@ -12,13 +12,12 @@ namespace CampusAppWP8.Pages.Person using System.Windows; using CampusAppWP8.Api.Person; using CampusAppWP8.Model.Person; - using CampusAppWP8.Model.Utility; using CampusAppWP8.Resources; using CampusAppWP8.Utility.Lui.Button; using CampusAppWP8.Utility.Lui.MessageBoxes; + using CampusAppWPortalLib8.Model.Utility; using Microsoft.Phone.Controls; using Microsoft.Phone.Tasks; - using CampusAppWPortalLib8.Model.Utility; /// Person page. /// Stubbfel, 09.09.2013. @@ -115,7 +114,7 @@ namespace CampusAppWP8.Pages.Person string personID = btn.PersonId as string; int functionIndex = (int)btn.FunctionIndex; - PersonModel person = this.api.Model.GetPerson(personID); + PersonWp8Model person = this.api.Model.GetPerson(personID); if (person == null) { return; diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonFunctionModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonFunctionModel.cs new file mode 100644 index 00000000..6bc47b1b --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonFunctionModel.cs @@ -0,0 +1,23 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 01.10.2013 +//----------------------------------------------------------------------------- +namespace CampusAppWPortalLib8.Model.Person +{ + /// + /// Interface for PersonFunctionModel classes + /// + public interface IPersonFunctionModel + { + /// Gets or sets the identifier of the person. + /// The identifier of the person. + string PersonID { get; set; } + + /// Gets or sets zero-based index of the function. + /// The function index. + int FunctionIndex { get; set; } + } +} diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonModel.cs new file mode 100644 index 00000000..c56cfa3b --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonModel.cs @@ -0,0 +1,30 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 01.10.2013 +//----------------------------------------------------------------------------- +namespace CampusAppWPortalLib8.Model.Person +{ + using System.Collections.ObjectModel; + + /// + /// Interface for PersonModel classes + /// + /// PersonFunctionModel template + public interface IPersonModel + { + /// Gets or sets the functions of a person. + /// The functions. + ObservableCollection Functions { get; set; } + + /// Gets or sets the identifier. + /// The identifier. + string ID { get; set; } + + /// Sets person identifier to function. + /// Stubbfel, 05.09.2013. + void SetPersonIdToFunction(); + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonFunctionModel.cs similarity index 86% rename from CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonFunctionModel.cs index 0a0ddc9f..017e51df 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonFunctionModel.cs @@ -5,14 +5,14 @@ // stubbfel // 05.09.2013 //----------------------------------------------------------------------------- -namespace CampusAppWP8.Model.Person +namespace CampusAppWPortalLib8.Model.Person { using System.Xml.Serialization; - using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Utility; /// Person function model. /// Stubbfel, 05.09.2013. - public class PersonFunctionModel + public class PersonFunctionModel : IPersonFunctionModel { #region Member @@ -55,7 +55,7 @@ namespace CampusAppWP8.Model.Person { if (value != null && value != string.Empty && value != this.tel1) { - this.tel1 = Wp8StringManager.CreateUniTelefonNumber(value); + this.tel1 = DefaultStringManager.CreateUniTelefonNumber(value); } } } @@ -74,7 +74,7 @@ namespace CampusAppWP8.Model.Person { if (value != null && value != string.Empty && value != this.tel2) { - this.tel2 = Wp8StringManager.CreateUniTelefonNumber(value); + this.tel2 = DefaultStringManager.CreateUniTelefonNumber(value); } } } @@ -93,7 +93,7 @@ namespace CampusAppWP8.Model.Person { if (value != null && value != string.Empty && value != this.fax) { - this.fax = Wp8StringManager.CreateUniTelefonNumber(value); + this.fax = DefaultStringManager.CreateUniTelefonNumber(value); } } } @@ -112,7 +112,7 @@ namespace CampusAppWP8.Model.Person { if (value != this.function) { - this.function = Wp8StringManager.StripAndDecodeHTML(value); + this.function = value; } } } @@ -131,7 +131,7 @@ namespace CampusAppWP8.Model.Person { if (value != this.appointment) { - this.appointment = Wp8StringManager.StripAndDecodeHTML(value); + this.appointment = value; } } } @@ -150,7 +150,7 @@ namespace CampusAppWP8.Model.Person { if (value != this.building) { - this.building = Wp8StringManager.StripAndDecodeHTML(value); + this.building = value; } } } @@ -167,7 +167,7 @@ namespace CampusAppWP8.Model.Person set { - if (value != null && value != this.mail && Wp8StringManager.IsValidEmail(value)) + if (value != null && value != this.mail && DefaultStringManager.IsValidEmail(value)) { this.mail = value; } diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonListModel.cs similarity index 64% rename from CampusAppWP8/CampusAppWP8/Model/Person/PersonListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonListModel.cs index 8af959d0..381e3a0f 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Person/PersonListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonListModel.cs @@ -6,7 +6,7 @@ // 05.09.2013 //----------------------------------------------------------------------------- -namespace CampusAppWP8.Model.Person +namespace CampusAppWPortalLib8.Model.Person { using System.Collections.Generic; using System.Collections.ObjectModel; @@ -14,15 +14,16 @@ namespace CampusAppWP8.Model.Person /// Person list model. /// Stubbfel, 05.09.2013. + /// personModel template [XmlRoot("Uebersicht")] - public class PersonListModel + public class PersonListModel { #region Property /// Gets or sets the persons. /// The persons. [XmlElement("person")] - public ObservableCollection Persons { get; set; } + public ObservableCollection Persons { get; set; } #endregion @@ -32,9 +33,13 @@ namespace CampusAppWP8.Model.Person /// Stubbfel, 05.09.2013. public void SetPersonIdToFunction() { - foreach (PersonModel person in this.Persons) + foreach (T item in this.Persons) { - person.SetPersonIdToFunction(); + IPersonModel person = item as IPersonModel; + if (person != null) + { + person.SetPersonIdToFunction(); + } } } @@ -42,17 +47,23 @@ namespace CampusAppWP8.Model.Person /// Stubbfel, 05.09.2013. /// The identifier. /// The person. - public PersonModel GetPerson(string id) + public IPersonModel GetPerson(string id) { - foreach (PersonModel tmpPerson in this.Persons) + foreach (T item in this.Persons) { + IPersonModel tmpPerson = item as IPersonModel; + if (tmpPerson == null) + { + continue; + } + if (tmpPerson.ID.Equals(id)) { return tmpPerson; } } - return null; + return default(IPersonModel); } /// Removes the non function and set identifiers person. @@ -67,16 +78,22 @@ namespace CampusAppWP8.Model.Person /// Stubbfel, 05.09.2013. public void RemoveNonFunctionPerson() { - List removeList = new List(); - foreach (PersonModel tmpPerson in this.Persons) + List removeList = new List(); + foreach (T item in this.Persons) { + IPersonModel tmpPerson = item as IPersonModel; + if (tmpPerson == null) + { + continue; + } + if (tmpPerson.Functions.Count < 1) { - removeList.Add(tmpPerson); + removeList.Add(item); } } - foreach (PersonModel removePerson in removeList) + foreach (T removePerson in removeList) { this.Persons.Remove(removePerson); } diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonModel.cs similarity index 84% rename from CampusAppWP8/CampusAppWP8/Model/Person/PersonModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonModel.cs index d4acbbcd..91623e1a 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Person/PersonModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonModel.cs @@ -5,15 +5,15 @@ // stubbfel // 05.09.2013 //----------------------------------------------------------------------------- -namespace CampusAppWP8.Model.Person +namespace CampusAppWPortalLib8.Model.Person { using System.Collections.ObjectModel; using System.Xml.Serialization; - using CampusAppWP8.Utility; /// Person model. /// Stubbfel, 05.09.2013. - public class PersonModel + /// template for the PersonFunction-Class + public class PersonModel : IPersonModel { #region Member @@ -30,7 +30,7 @@ namespace CampusAppWP8.Model.Person private string id; /// The functions. - private ObservableCollection functions; + private ObservableCollection functions; #endregion @@ -70,7 +70,7 @@ namespace CampusAppWP8.Model.Person { if (value != this.akadgrad) { - this.akadgrad = Wp8StringManager.StripAndDecodeHTML(value); + this.akadgrad = value; } } } @@ -89,7 +89,7 @@ namespace CampusAppWP8.Model.Person { if (value != this.surName) { - this.surName = Wp8StringManager.StripAndDecodeHTML(value); + this.surName = value; } } } @@ -108,7 +108,7 @@ namespace CampusAppWP8.Model.Person { if (value != this.firstName) { - this.firstName = Wp8StringManager.StripAndDecodeHTML(value); + this.firstName = value; } } } @@ -116,7 +116,7 @@ namespace CampusAppWP8.Model.Person /// Gets or sets the functions of a person. /// The functions. [XmlElement("funktion")] - public ObservableCollection Functions + public ObservableCollection Functions { get { @@ -157,10 +157,14 @@ namespace CampusAppWP8.Model.Person } int index = 0; - foreach (PersonFunctionModel function in this.functions) + foreach (T item in this.functions) { - function.PersonID = this.ID; - function.FunctionIndex = index++; + IPersonFunctionModel function = item as IPersonFunctionModel; + if (function != null) + { + function.PersonID = this.ID; + function.FunctionIndex = index++; + } } } diff --git a/CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop b/CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop index e1e8289d..4bc40550 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop +++ b/CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop @@ -1,6 +1,7 @@ + akadgrad api nfc param From 87fc00071a5eb68daa4f3258dc3542cc21e8cde5 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Tue, 1 Oct 2013 16:34:48 +0200 Subject: [PATCH 18/22] setup commit --- .../Model/Person/PersonWp8Model.cs | 77 ++++++++++ .../CampusAppWPortalLib8.csproj | 25 ++++ .../OpeninghoursInstitutionModel.cs | 134 +----------------- .../Model/Openinghours/OpeninghoursModel.cs | 10 +- 4 files changed, 108 insertions(+), 138 deletions(-) create mode 100644 CampusAppWP8/CampusAppWP8/Model/Person/PersonWp8Model.cs rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Openinghours/OpeninghoursInstitutionModel.cs (71%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Openinghours/OpeninghoursModel.cs (84%) diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Person/PersonWp8Model.cs new file mode 100644 index 00000000..ccceb929 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Person/PersonWp8Model.cs @@ -0,0 +1,77 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 05.09.2013 +//----------------------------------------------------------------------------- +namespace CampusAppWP8.Model.Person +{ + using System.Xml.Serialization; + using CampusAppWP8.Utility; + + /// Person model. + /// Stubbfel, 05.09.2013. + public class PersonWp8Model : CampusAppWPortalLib8.Model.Person.PersonModel + { + #region property + + /// Gets or sets the akadgrad. + /// The akadgrad. + [XmlAttribute("akadgrad")] + public new string Akadgrad + { + get + { + return base.Akadgrad; + } + + set + { + if (value != this.Akadgrad) + { + base.Akadgrad = Wp8StringManager.StripAndDecodeHTML(value); + } + } + } + + /// Gets or sets the name of the sur. + /// The name of the sur. + [XmlAttribute("nachname")] + public new string SurName + { + get + { + return base.SurName; + } + + set + { + if (value != this.SurName) + { + base.SurName = Wp8StringManager.StripAndDecodeHTML(value); + } + } + } + + /// Gets or sets the person's first name. + /// The name of the first. + [XmlAttribute("vorname")] + public new string FirstName + { + get + { + return base.FirstName; + } + + set + { + if (value != this.FirstName) + { + base.FirstName = Wp8StringManager.StripAndDecodeHTML(value); + } + } + } + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj b/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj index 5f458571..22081c6b 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj +++ b/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj @@ -33,6 +33,11 @@ 4 + + + + + @@ -40,11 +45,31 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Openinghours/OpeninghoursInstitutionModel.cs similarity index 71% rename from CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Openinghours/OpeninghoursInstitutionModel.cs index 8acc2b0a..33d038f5 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Openinghours/OpeninghoursInstitutionModel.cs @@ -6,7 +6,7 @@ // 24.06.2013 //----------------------------------------------------------------------------- -namespace CampusAppWP8.Model.Openinghours +namespace CampusAppWPortalLib8.Model.Openinghours { using System.Globalization; using System.Windows; @@ -426,138 +426,6 @@ namespace CampusAppWP8.Model.Openinghours } } - /// - /// Gets the visibility state of the monday TextBlock. - /// - public Visibility VisibleMonday - { - get - { - return ((this.dayMonday == string.Empty) || (this.dayMonday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the tuesday TextBlock. - /// - public Visibility VisibleTuesday - { - get - { - return ((this.dayTuesday == string.Empty) || (this.dayTuesday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the wednesday TextBlock. - /// - public Visibility VisibleWednesday - { - get - { - return ((this.dayWednesday == string.Empty) || (this.dayWednesday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the thursday TextBlock. - /// - public Visibility VisibleThursday - { - get - { - return ((this.dayThursday == string.Empty) || (this.dayThursday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the friday TextBlock. - /// - public Visibility VisibleFriday - { - get - { - return ((this.dayFriday == string.Empty) || (this.dayFriday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the saturday TextBlock. - /// - public Visibility VisibleSaturday - { - get - { - return ((this.daySaturday == string.Empty) || (this.daySaturday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the sunday TextBlock. - /// - public Visibility VisibleSunday - { - get - { - return ((this.daySunday == string.Empty) || (this.daySunday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the comment. - /// - public Visibility VisibleComment - { - get - { - return ((this.Comment == string.Empty) || (this.Comment.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the email address. - /// - public Visibility VisibleEMail - { - get - { - return ((this.infoEmail == string.Empty) || (this.infoEmail.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the phone number. - /// - public Visibility VisiblePhone - { - get - { - return ((this.infoPhone == string.Empty) || (this.infoPhone.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the room. - /// - public Visibility VisibleRoom - { - get - { - return ((this.infoRoom == string.Empty) || (this.infoRoom.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the building. - /// - public Visibility VisibleBuilding - { - get - { - return ((this.infoBuilding == string.Empty) || (this.infoBuilding.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - #endregion #region Method diff --git a/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Openinghours/OpeninghoursModel.cs similarity index 84% rename from CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Openinghours/OpeninghoursModel.cs index 59b7caa7..15f09d25 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Openinghours/OpeninghoursModel.cs @@ -6,7 +6,7 @@ // 24.06.2013 //----------------------------------------------------------------------------- -namespace CampusAppWP8.Model.Openinghours +namespace CampusAppWPortalLib8.Model.Openinghours { using System; using System.Collections.ObjectModel; @@ -16,7 +16,7 @@ namespace CampusAppWP8.Model.Openinghours /// Model for opening hours. /// [XmlRoot("root")] - public class OpeninghoursModel + public class OpeninghoursModel { #region Member @@ -28,7 +28,7 @@ namespace CampusAppWP8.Model.Openinghours /// /// Gets or sets feed information item list. /// - private ObservableCollection institutions; + private ObservableCollection institutions; #endregion @@ -39,7 +39,7 @@ namespace CampusAppWP8.Model.Openinghours /// public OpeninghoursModel() { - this.institutions = new ObservableCollection(); + this.institutions = new ObservableCollection(); this.createTime = DateTime.Now; } @@ -63,7 +63,7 @@ namespace CampusAppWP8.Model.Openinghours /// [XmlArray("data")] [XmlArrayItem("institution")] - public ObservableCollection Institutions + public ObservableCollection Institutions { get { From 6ea8d06a0e80288077b84cb52f85572c3bf60801 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Wed, 2 Oct 2013 12:01:46 +0200 Subject: [PATCH 19/22] fix person models --- .../Model/Person/PersonFunctionWp8Model.cs | 2 +- .../Model/Person/PersonListWp8Model.cs | 2 +- .../CampusAppWP8/Pages/Dev/QRScanner.xaml.cs | 17 ++++++++++------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionWp8Model.cs index 09876067..944cf9e1 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionWp8Model.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionWp8Model.cs @@ -12,7 +12,7 @@ namespace CampusAppWP8.Model.Person /// Person function model. /// Stubbfel, 05.09.2013. - public class PersonFunctionWp8Model : CampusAppWPortalLib8.Model.Person.PersonFunctionModel + public class PersonFunctionWp8Model : CampusAppWPortalLib8.Model.Person.PersonFunctionModel { #region Property diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs index e3135c13..474f3fea 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs @@ -22,7 +22,7 @@ namespace CampusAppWP8.Model.Person /// The person. public new PersonWp8Model GetPerson(string id) { - IPersonModel tmpPerson = base.GetPerson(id); + IPersonModel tmpPerson = base.GetPerson(id); return tmpPerson as PersonWp8Model; } } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs index 023cde77..9126ab91 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs @@ -83,7 +83,7 @@ namespace CampusAppWP8.Pages.Dev { this.resultAppStoreKey = NavigationContext.QueryString[Constants.ParamQRResultKey]; } - + this.isInAutofocus = true; this.cam = new PhotoCamera(CameraType.Primary); this.cam.Initialized += new EventHandler(this.Cam_Initialized); this.cam.AutoFocusCompleted += new EventHandler(this.Cam_AutoFocusCompl); @@ -176,7 +176,7 @@ namespace CampusAppWP8.Pages.Dev /// Camera operation completed event information. private void Cam_AutoFocusCompl(object sender, CameraOperationCompletedEventArgs e) { - this.isInAutofocus = false; + //this.isInAutofocus = false; } /// @@ -195,8 +195,6 @@ namespace CampusAppWP8.Pages.Dev this.cam.FocusAtPoint( pos.Y / this.camView.ActualHeight, 1.0 - (pos.X / this.camView.ActualWidth)); - - this.isInAutofocus = true; } else if (this.cam.IsFocusSupported == true) { @@ -243,6 +241,10 @@ namespace CampusAppWP8.Pages.Dev } }); } + else + { + this.cam.Focus(); + } } /// @@ -255,12 +257,13 @@ namespace CampusAppWP8.Pages.Dev while (!this.captureThreadExit) { - if (this.isInAutofocus == false) - { + //if (this.isInAutofocus == false) + //{ this.cam.GetPreviewBufferArgb32(buffer); this.OnCaptureImage(buffer, (int)resolution.Width, (int)resolution.Height); - } + this.isInAutofocus = true; + //} System.Threading.Thread.Sleep(1000); } From ca3bd2381f75a8369c5312b7987ca2122d8f32f2 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Wed, 2 Oct 2013 12:48:35 +0200 Subject: [PATCH 20/22] mv lecture --- .../CampusAppWP8/Api/Lecture/LectureApi.cs | 2 +- CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 10 +-- .../Pages/Lecture/LecturePage.xaml.cs | 8 +- .../Pages/Lecture/ModulWebPage.xaml.cs | 2 +- .../Pages/Lecture/ResultDetailPage.xaml.cs | 5 +- .../Pages/Lecture/ResultPage.xaml.cs | 2 +- .../CampusAppWP8/Resources/Constants.resx | 3 - .../Resources/Constants1.Designer.cs | 9 --- .../CampusAppWPortalLib8.csproj | 6 ++ .../Model/Lecture/LectureActivity.cs | 76 ++++--------------- .../Model/Lecture/LectureCourse.cs | 2 +- .../Model/Lecture/LectureDate.cs | 2 +- .../Model/Lecture/LectureLecturer.cs | 2 +- .../Model/Lecture/LectureList.cs | 19 ++--- .../Model/Lecture/LectureModule.cs | 4 +- .../Resources/Constants.resx | 3 + .../Resources/Constants1.Designer.cs | 9 +++ 17 files changed, 58 insertions(+), 106 deletions(-) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Lecture/LectureActivity.cs (71%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Lecture/LectureCourse.cs (94%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Lecture/LectureDate.cs (97%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Lecture/LectureLecturer.cs (98%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Lecture/LectureList.cs (75%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Lecture/LectureModule.cs (96%) diff --git a/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs b/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs index 3a13bb3d..6ad81728 100644 --- a/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs @@ -18,7 +18,7 @@ namespace CampusAppWP8.Api.Lecture /// /// need the XmlAPI /// - public class LectureApi : XmlModel + public class LectureApi : XmlModel { #region Constructor diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index 636dcfc6..79c3aa26 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -97,6 +97,7 @@ + App.xaml @@ -183,12 +184,8 @@ - - - - - - + + @@ -197,7 +194,6 @@ CampusMapPage.xaml - DepartmentFavoritePage.xaml diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs index 37f79f70..76fa444d 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs @@ -13,11 +13,11 @@ namespace CampusAppWP8.Pages.Lecture using System.Windows.Navigation; using CampusAppWP8.Api.Lecture; using CampusAppWP8.Model.Lecture; - using CampusAppWP8.Model.Utility; using CampusAppWP8.Resources; using CampusAppWP8.Utility.Lui.MessageBoxes; - using Microsoft.Phone.Controls; using CampusAppWPortalLib8.Model.Utility; + using Microsoft.Phone.Controls; + /// /// Class for the LecturePage @@ -73,7 +73,7 @@ namespace CampusAppWP8.Pages.Lecture { // delete all models App.SaveToIsolatedStorage(Constants.IsolatedStorage_LecturePageModel, null); - App.SaveToIsolatedStorage(Constants.IsolatedStorage_LectureModel, null); + App.SaveToIsolatedStorage(Constants.IsolatedStorage_LectureModel, null); } else { @@ -207,7 +207,7 @@ namespace CampusAppWP8.Pages.Lecture this.api.Model.FilterByCourseTitle(query); } - App.SaveToIsolatedStorage(Constants.IsolatedStorage_LectureModel, this.api.Model); + App.SaveToIsolatedStorage(Constants.IsolatedStorage_LectureModel, this.api.Model); this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed; Uri url = new Uri(Constants.PathLecture_ResultPage, UriKind.Relative); NavigationService.Navigate(url); diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml.cs index 95e3e8d0..b7a08572 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml.cs @@ -40,7 +40,7 @@ namespace CampusAppWP8.Pages.Lecture if (NavigationContext.QueryString.ContainsKey(Constants.ParamModelLecture_ModulNumber)) { string number = NavigationContext.QueryString[Constants.ParamModelLecture_ModulNumber]; - this.WebmailBrowser.Navigate(new Uri(Constants.UrlLecture_ModulBaseAddr + number, UriKind.Absolute)); + this.WebmailBrowser.Navigate(new Uri(CampusAppWPortalLib8.Resources.Constants.UrlLecture_ModulBaseAddr + number, UriKind.Absolute)); } base.OnNavigatedTo(e); diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultDetailPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultDetailPage.xaml.cs index 87a5c88e..30de8370 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultDetailPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultDetailPage.xaml.cs @@ -57,10 +57,10 @@ namespace CampusAppWP8.Pages.Lecture /// id of the activity private void LoadActivity(int activityId) { - LectureList list = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_LectureModel); + LectureWp8List list = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_LectureModel); if (list != null) { - LectureActivity activity = list.GetActivity(activityId); + LectureWp8Activity activity = list.GetActivity(activityId); activity.CreateLectureString(); activity.CreateCourseString(); this.ContentPanel.DataContext = activity; @@ -70,6 +70,5 @@ namespace CampusAppWP8.Pages.Lecture #endregion #endregion - } } \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs index aefe127f..296593b0 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs @@ -42,7 +42,7 @@ namespace CampusAppWP8.Pages.Lecture protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); - LectureList list = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_LectureModel); + LectureWp8List list = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_LectureModel); if (list == null) { Uri url = new Uri(Constants.PathLecture_LecturePage, UriKind.Relative); diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index bf923fb5..241f3e53 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -135,9 +135,6 @@ /Pages/Lecture/ResultDetailPage.xaml - - https://www.tu-cottbus.de/modul/ - https://webmail.tu-cottbus.de diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs index 8c29d5cb..e07539c5 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs @@ -1221,15 +1221,6 @@ namespace CampusAppWP8.Resources { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die https://www.tu-cottbus.de/modul/ ähnelt. - /// - public static string UrlLecture_ModulBaseAddr { - get { - return ResourceManager.GetString("UrlLecture_ModulBaseAddr", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die http://www.tu-cottbus.de/campusapp-data/getdata.php?db=clubs&app=2&appversion=1 ähnelt. /// diff --git a/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj b/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj index 22081c6b..f7e93044 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj +++ b/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj @@ -39,6 +39,12 @@ + + + + + + diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureActivity.cs similarity index 71% rename from CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureActivity.cs index 8e8d84ae..8f1a478e 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureActivity.cs @@ -5,12 +5,12 @@ // stubbfel // 13.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Lecture +namespace CampusAppWPortalLib8.Model.Lecture { using System.Collections.ObjectModel; using System.Xml.Serialization; - using CampusAppWP8.Resources; - using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Resources; + using CampusAppWPortalLib8.Utility; /// /// Model for a Activity @@ -20,19 +20,19 @@ namespace CampusAppWP8.Model.Lecture #region Members /// The activity icon name lecture. - private const string ActivityIconNameLecture = "Vorlesung"; + public const string ActivityTypeLecture = "Vorlesung"; /// The activity icon name seminar. - private const string ActivityIconNameSeminar = "Seminar"; + public const string ActivityTypeSeminar = "Seminar"; /// The activity icon name practice. - private const string ActivityIconNamePract = "Übung"; + public const string ActivityTypePract = "Übung"; /// The activity icon name lab. - private const string ActivityIconNameLab = "Labor"; + public const string ActivityTypeLab = "Labor"; /// The activity icon name exam. - private const string ActivityIconNameExam = "Prüfung"; + public const string ActivityTypeExam = "Prüfung"; /// /// List of lecturer @@ -54,9 +54,6 @@ namespace CampusAppWP8.Model.Lecture /// private string topic; - /// URL of the icon. - private string iconUrl; - #endregion #region Constructor @@ -199,21 +196,10 @@ namespace CampusAppWP8.Model.Lecture { if (value != this.topic) { - this.topic = Wp8StringManager.StripAndDecodeHTML(value); + this.topic = value; } } } - - /// Gets URL of the icon. - /// The icon URL. - public string IconUrl - { - get - { - this.CreateIconUrl(); - return this.iconUrl; - } - } #endregion #region Methods @@ -228,10 +214,10 @@ namespace CampusAppWP8.Model.Lecture string result = string.Empty; foreach (LectureLecturer tmpLecturer in this.Lecturer) { - result += Wp8StringManager.AddNewLine(tmpLecturer.ToString()); + result += DefaultStringManager.AddNewLine(tmpLecturer.ToString()); } - this.LecturerString = Wp8StringManager.RemoveNewLine(result); + this.LecturerString = DefaultStringManager.RemoveNewLine(result); } /// @@ -242,46 +228,10 @@ namespace CampusAppWP8.Model.Lecture string result = string.Empty; foreach (LectureCourse course in this.Course) { - result += Wp8StringManager.AddNewLine(course.Title); + result += DefaultStringManager.AddNewLine(course.Title); } - this.CourseString = Wp8StringManager.RemoveNewLine(result); - } - - #endregion - - #region private - - /// Creates icon URL. - /// Stubbfel, 12.09.2013. - private void CreateIconUrl() - { - string typeStr = this.Type; - - if (typeStr.Contains(LectureActivity.ActivityIconNameLecture)) - { - this.iconUrl = Icons.Lecture; - } - else if (typeStr.Contains(LectureActivity.ActivityIconNameExam)) - { - this.iconUrl = Icons.Exams; - } - else if (typeStr.Contains(LectureActivity.ActivityIconNamePract)) - { - this.iconUrl = Icons.Practise; - } - else if (typeStr.Contains(LectureActivity.ActivityIconNameSeminar)) - { - this.iconUrl = Icons.Seminar; - } - else if (typeStr.Contains(LectureActivity.ActivityIconNameLab)) - { - this.iconUrl = Icons.Lab; - } - else - { - this.iconUrl = Icons.Info; - } + this.CourseString = DefaultStringManager.RemoveNewLine(result); } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureCourse.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureCourse.cs similarity index 94% rename from CampusAppWP8/CampusAppWP8/Model/Lecture/LectureCourse.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureCourse.cs index b418f12e..1faedc53 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureCourse.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureCourse.cs @@ -4,7 +4,7 @@ // stubbfel // 10.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Lecture +namespace CampusAppWPortalLib8.Model.Lecture { using System.Xml.Serialization; diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureDate.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureDate.cs similarity index 97% rename from CampusAppWP8/CampusAppWP8/Model/Lecture/LectureDate.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureDate.cs index a6fab88a..e14aac6f 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureDate.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureDate.cs @@ -5,7 +5,7 @@ // stubbfel // 10.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Lecture +namespace CampusAppWPortalLib8.Model.Lecture { using System.Xml.Serialization; diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureLecturer.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureLecturer.cs similarity index 98% rename from CampusAppWP8/CampusAppWP8/Model/Lecture/LectureLecturer.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureLecturer.cs index 7d9102b2..2c69ab67 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureLecturer.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureLecturer.cs @@ -5,7 +5,7 @@ // stubbfel // 10.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Lecture +namespace CampusAppWPortalLib8.Model.Lecture { using System.Xml.Serialization; diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureList.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureList.cs similarity index 75% rename from CampusAppWP8/CampusAppWP8/Model/Lecture/LectureList.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureList.cs index 3229b8d0..5891f1e8 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureList.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureList.cs @@ -5,7 +5,7 @@ // stubbfel // 10.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Lecture +namespace CampusAppWPortalLib8.Model.Lecture { using System.Collections.ObjectModel; using System.Linq; @@ -14,13 +14,14 @@ namespace CampusAppWP8.Model.Lecture /// /// Model for a List of LectureActivity /// + /// T : LectureActivity [XmlRoot("lsf_auszug")] - public class LectureList + public class LectureList where T : LectureActivity { #region Constructor /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// public LectureList() { @@ -35,7 +36,7 @@ namespace CampusAppWP8.Model.Lecture /// [XmlArray("veranstaltungsliste")] [XmlArrayItem("veranstaltung")] - public ObservableCollection Activities { get; set; } + public ObservableCollection Activities { get; set; } #endregion @@ -46,9 +47,9 @@ namespace CampusAppWP8.Model.Lecture /// /// id of the activity /// the activity (FirstOrDefault) - public LectureActivity GetActivity(int id) + public T GetActivity(int id) { - LectureActivity activity = this.Activities.Where(p => p.Id == id).FirstOrDefault(); + T activity = this.Activities.Where(p => p.Id == id).FirstOrDefault(); return activity; } @@ -57,12 +58,12 @@ namespace CampusAppWP8.Model.Lecture /// Specifies the filter. public void FilterByCourseTitle(string filter) { - ObservableCollection filteredCollection = new ObservableCollection(); + ObservableCollection filteredCollection = new ObservableCollection(); filter = filter.Trim().ToLower(); - foreach (LectureActivity activity in this.Activities) + foreach (T activity in this.Activities) { activity.CreateCourseString(); - if (activity.Title.ToLower().Contains(filter)) + if (activity.Title.ToLower().Contains(filter)) { filteredCollection.Add(activity); } diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureModule.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureModule.cs similarity index 96% rename from CampusAppWP8/CampusAppWP8/Model/Lecture/LectureModule.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureModule.cs index 1a190438..0b20bf00 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureModule.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureModule.cs @@ -5,11 +5,11 @@ // stubbfel // 10.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Lecture +namespace CampusAppWPortalLib8.Model.Lecture { using System; using System.Xml.Serialization; - using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Resources; /// /// Model for the module of an lecture diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/Constants.resx b/CampusAppWP8/CampusAppWPortalLib8/Resources/Constants.resx index 5680b6f2..80453741 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/Constants.resx @@ -135,6 +135,9 @@ http://www.tu-cottbus.de/oracle-gateway/php/rss2feed_veranstaltungen.php + + https://www.tu-cottbus.de/modul/ + http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/index.php?mensa=CottbusBTU&v=1 diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWPortalLib8/Resources/Constants1.Designer.cs index 5420fda2..f9f35440 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Resources/Constants1.Designer.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/Constants1.Designer.cs @@ -115,6 +115,15 @@ namespace CampusAppWPortalLib8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die https://www.tu-cottbus.de/modul/ ähnelt. + /// + public static string UrlLecture_ModulBaseAddr { + get { + return ResourceManager.GetString("UrlLecture_ModulBaseAddr", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/index.php?mensa=CottbusBTU&v=1 ähnelt. /// From d9838ddc1616c9b7c9ef2af3150f23e9a2a8ec21 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Wed, 2 Oct 2013 13:25:14 +0200 Subject: [PATCH 21/22] fixes --- .../Model/Openinghours/OpeninghoursModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Openinghours/OpeninghoursModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Openinghours/OpeninghoursModel.cs index 15f09d25..edb61de4 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Model/Openinghours/OpeninghoursModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Openinghours/OpeninghoursModel.cs @@ -16,7 +16,7 @@ namespace CampusAppWPortalLib8.Model.Openinghours /// Model for opening hours. /// [XmlRoot("root")] - public class OpeninghoursModel + public class OpeninghoursModel where T: OpeninghoursInstitutionModel { #region Member From 710b4c1e0708288d6de36b9dfd989363dc503b34 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Wed, 2 Oct 2013 13:27:45 +0200 Subject: [PATCH 22/22] finish#211 --- .../Model/Lecture/LectureWp8Activity.cs | 79 +++++++++++++++++++ .../Model/Lecture/LectureWp8List.cs | 34 ++++++++ .../Model/Exams/ExamListModel.cs | 10 +-- .../Model/Person/IPersonModel.cs | 2 +- .../Model/Person/PersonListModel.cs | 10 +-- .../Model/Person/PersonModel.cs | 2 +- 6 files changed, 122 insertions(+), 15 deletions(-) create mode 100644 CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8Activity.cs create mode 100644 CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8List.cs diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8Activity.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8Activity.cs new file mode 100644 index 00000000..d68c2c0e --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8Activity.cs @@ -0,0 +1,79 @@ +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 13.06.2013 +//---------------------------------------------------------------------- +namespace CampusAppWP8.Model.Lecture +{ + using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Lecture; + + /// + /// Model for a Activity + /// + public class LectureWp8Activity : LectureActivity + { + #region Members + + /// URL of the icon. + private string iconUrl; + + #endregion + + #region Proberty + + /// Gets URL of the icon. + /// The icon URL. + public string IconUrl + { + get + { + this.CreateIconUrl(); + return this.iconUrl; + } + } + #endregion + + #region Methods + + #region private + + /// Creates icon URL. + /// Stubbfel, 12.09.2013. + private void CreateIconUrl() + { + string typeStr = this.Type; + + if (typeStr.Contains(CampusAppWPortalLib8.Model.Lecture.LectureActivity.ActivityTypeLecture)) + { + this.iconUrl = Icons.Lecture; + } + else if (typeStr.Contains(CampusAppWPortalLib8.Model.Lecture.LectureActivity.ActivityTypeExam)) + { + this.iconUrl = Icons.Exams; + } + else if (typeStr.Contains(CampusAppWPortalLib8.Model.Lecture.LectureActivity.ActivityTypePract)) + { + this.iconUrl = Icons.Practise; + } + else if (typeStr.Contains(CampusAppWPortalLib8.Model.Lecture.LectureActivity.ActivityTypeSeminar)) + { + this.iconUrl = Icons.Seminar; + } + else if (typeStr.Contains(CampusAppWPortalLib8.Model.Lecture.LectureActivity.ActivityTypeLab)) + { + this.iconUrl = Icons.Lab; + } + else + { + this.iconUrl = Icons.Info; + } + } + + #endregion + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8List.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8List.cs new file mode 100644 index 00000000..a2ca637d --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8List.cs @@ -0,0 +1,34 @@ +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 10.06.2013 +//---------------------------------------------------------------------- +namespace CampusAppWP8.Model.Lecture +{ + using System.Linq; + using System.Xml.Serialization; + + /// + /// Model for a List of LectureActivity + /// + [XmlRoot("lsf_auszug")] + public class LectureWp8List : CampusAppWPortalLib8.Model.Lecture.LectureList + { + #region Methods + + /// + /// Method return a certain activity + /// + /// id of the activity + /// the activity (FirstOrDefault) + public new LectureWp8Activity GetActivity(int id) + { + LectureWp8Activity activity = this.Activities.Where(p => p.Id == id).FirstOrDefault(); + return base.GetActivity(id) as LectureWp8Activity; + } + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamListModel.cs index abecce29..551d5b7c 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamListModel.cs @@ -16,7 +16,7 @@ namespace CampusAppWPortalLib8.Model.Exams /// Exam list model. /// Stubbfel, 02.09.2013. [XmlRoot("links")] - public class ExamListModel + public class ExamListModel where T : ExamModel { #region Property @@ -35,14 +35,8 @@ namespace CampusAppWPortalLib8.Model.Exams public List CreateCourseList() { List result = new List(); - foreach (T item in this.Exams) + foreach (T exam in this.Exams) { - ExamModel exam = item as ExamModel; - if (exam == null) - { - continue; - } - CourseModel tmpModel = new CourseModel(exam.CourseNumber, exam.CourseText); if (!result.Contains(tmpModel)) diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonModel.cs index c56cfa3b..fcb2db88 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonModel.cs @@ -13,7 +13,7 @@ namespace CampusAppWPortalLib8.Model.Person /// Interface for PersonModel classes /// /// PersonFunctionModel template - public interface IPersonModel + public interface IPersonModel where T : IPersonFunctionModel { /// Gets or sets the functions of a person. /// The functions. diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonListModel.cs index 381e3a0f..d79729a8 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonListModel.cs @@ -35,7 +35,7 @@ namespace CampusAppWPortalLib8.Model.Person { foreach (T item in this.Persons) { - IPersonModel person = item as IPersonModel; + IPersonModel person = item as IPersonModel; if (person != null) { person.SetPersonIdToFunction(); @@ -47,11 +47,11 @@ namespace CampusAppWPortalLib8.Model.Person /// Stubbfel, 05.09.2013. /// The identifier. /// The person. - public IPersonModel GetPerson(string id) + public IPersonModel GetPerson(string id) { foreach (T item in this.Persons) { - IPersonModel tmpPerson = item as IPersonModel; + IPersonModel tmpPerson = item as IPersonModel; if (tmpPerson == null) { continue; @@ -63,7 +63,7 @@ namespace CampusAppWPortalLib8.Model.Person } } - return default(IPersonModel); + return default(IPersonModel); } /// Removes the non function and set identifiers person. @@ -81,7 +81,7 @@ namespace CampusAppWPortalLib8.Model.Person List removeList = new List(); foreach (T item in this.Persons) { - IPersonModel tmpPerson = item as IPersonModel; + IPersonModel tmpPerson = item as IPersonModel; if (tmpPerson == null) { continue; diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonModel.cs index 91623e1a..931104d3 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonModel.cs @@ -13,7 +13,7 @@ namespace CampusAppWPortalLib8.Model.Person /// Person model. /// Stubbfel, 05.09.2013. /// template for the PersonFunction-Class - public class PersonModel : IPersonModel + public class PersonModel : IPersonModel where T : IPersonFunctionModel { #region Member