From 8fc22539be551c6777a9ff8ea0284e8734dbed52 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Thu, 8 Aug 2013 15:15:15 +0200 Subject: [PATCH 1/2] mv userprofil to isalated storage --- CampusAppWP8/CampusAppWP8/App.xaml.cs | 24 ++--- CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 5 +- .../File/Setting/UserProfilFile.cs | 67 -------------- .../Model/Lecture/LecturePageModel.cs | 2 +- .../Model/Setting/UserProfilModel.cs | 90 +++---------------- .../Pages/Setting/UserProfil.xaml.cs | 27 +++--- .../CampusAppWP8/Pages/StartPage.xaml.cs | 2 +- .../Resources/AppResources.Designer.cs | 2 +- .../CampusAppWP8/Resources/AppResources.resx | 2 +- .../Resources/Constants.Designer.cs | 36 ++++++++ .../CampusAppWP8/Resources/Constants.resx | 12 +++ CampusAppWP8/CampusAppWP8/Settings.cs | 5 +- 12 files changed, 85 insertions(+), 189 deletions(-) delete mode 100644 CampusAppWP8/CampusAppWP8/File/Setting/UserProfilFile.cs diff --git a/CampusAppWP8/CampusAppWP8/App.xaml.cs b/CampusAppWP8/CampusAppWP8/App.xaml.cs index 46d1bfa0..a0c297cf 100644 --- a/CampusAppWP8/CampusAppWP8/App.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/App.xaml.cs @@ -1,18 +1,15 @@ -using CampusAppWP8.File.Setting; -using CampusAppWP8.Model.Setting; +using CampusAppWP8.Model.Setting; using CampusAppWP8.Resources; using CampusAppWP8.Utility; using Microsoft.Phone.Controls; using Microsoft.Phone.Shell; using System; using System.Diagnostics; -using System.Globalization; using System.IO.IsolatedStorage; using System.Threading; using System.Windows; using System.Windows.Markup; using System.Windows.Navigation; -using Windows.Devices.Geolocation; namespace CampusAppWP8 @@ -143,18 +140,7 @@ namespace CampusAppWP8 /// private void LoadSettings() { - UserProfilFile userFile; - userFile = Settings.UserProfil; - if (userFile.Model == null) - { - userFile.onLoaded += new UserProfilFile.OnLoaded(this.UserSettingsLoaded); - userFile.LoadData(); - } - else - { - this.UserSettingsLoaded(); - } - + this.UserSettingsLoaded(); Thread thread = new Thread(new ThreadStart(Utilities.DetermineAndStoreCurrentPosition)); thread.Start(); } @@ -164,9 +150,9 @@ namespace CampusAppWP8 /// private void UserSettingsLoaded() { - if (Settings.UserProfil.Model == null) + if (Settings.UserProfil == null) { - Settings.UserProfil.Model = new UserProfilModel(); + Settings.UserProfil = new UserProfilModel(); } } @@ -175,7 +161,7 @@ namespace CampusAppWP8 private void Application_Activated(object sender, ActivatedEventArgs e) { this.LoadSettings(); - + } // Code, der ausgeführt werden soll, wenn die Anwendung deaktiviert wird (in den Hintergrund gebracht wird) diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index bc1fd99d..7993a775 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -99,7 +99,6 @@ - @@ -445,7 +444,9 @@ ..\packages\SharpZipLib-WP7.0.86.0.518\lib\sl4-windowsphone71\SharpZipLib.WindowsPhone7.dll - + + + + + + + + + + + + + + + + + + + + + + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs index 405634eb..ad348121 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs @@ -56,16 +56,19 @@ namespace CampusAppWP8.Pages.Setting DegreeListPickerItemListModel degreeList = new DegreeListPickerItemListModel(); SemesterListPickerItemListModel semesterList = new SemesterListPickerItemListModel(); RoleListPickerItemListModel roleList = new RoleListPickerItemListModel(); + CampusListPickerItemListModel campusList = new CampusListPickerItemListModel(); this.Course.ItemsSource = courseList.List; this.Degree.ItemsSource = degreeList.List; this.Semster.ItemsSource = semesterList.List; this.Role.ItemsSource = roleList.List; + this.Campus.ItemsSource = campusList.List; this.Course.SelectedIndex = courseList.GetIndexOrDefault(this.userProfil.Course.ToString().PadLeft(3, '0')); this.Degree.SelectedIndex = degreeList.GetIndexOrDefault(((int)this.userProfil.Degree).ToString()); this.Semster.SelectedIndex = semesterList.GetIndexOrDefault(this.userProfil.Semester.ToString()); this.Role.SelectedIndex = roleList.GetIndexOrDefault(this.userProfil.Role.ToString()); + this.Campus.SelectedIndex = campusList.GetIndexOrDefault(((int)this.userProfil.DefaultCampus).ToString()); } /// @@ -79,6 +82,7 @@ namespace CampusAppWP8.Pages.Setting this.userProfil.Degree = (CampusAppWP8.Model.Setting.UserProfilModel.DegreeType)Enum.Parse(typeof(CampusAppWP8.Model.Setting.UserProfilModel.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); } catch (Exception e) { diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs index 7a24e051..cb61d417 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs @@ -105,6 +105,42 @@ 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 Campusplan ähnelt. /// @@ -393,6 +429,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Campusauswahl ähnelt. + /// + public static string ListPickerHeaderCampus { + get { + return ResourceManager.GetString("ListPickerHeaderCampus", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Studiengangsauswahl ähnelt. /// @@ -663,6 +708,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Campus ähnelt. + /// + public static string Setting_UserCampus { + get { + return ResourceManager.GetString("Setting_UserCampus", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Studiengang ähnelt. /// @@ -700,7 +754,7 @@ namespace CampusAppWP8.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die Semster ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die Semester ähnelt. /// public static string Setting_UserSemester { get { diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx index 0a92d7fd..4e7afc85 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx @@ -333,7 +333,7 @@ Rolle - Semster + Semester Mitarbeiter @@ -365,4 +365,22 @@ Dürfen Positionsdaten enhoben und verwendet werden? + + Cottbus Hauptcampus + + + Cottbus Nordcampus + + + Cottbus Südcampus + + + Senftenberg Hauptcampus + + + Campusauswahl + + + Campus + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs index 7c4137ce..2b67bdc9 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs @@ -735,6 +735,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die UserSettings.DefaultCampus ähnelt. + /// + public static string UserSettings_DefaultCampus { + get { + return ResourceManager.GetString("UserSettings_DefaultCampus", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die UserSettings.Degree ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index 3df7fc27..b277f0f9 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -363,4 +363,7 @@ UserSettings.Semester + + UserSettings.DefaultCampus + \ No newline at end of file