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..83bfbf50 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -99,7 +99,6 @@ - @@ -108,6 +107,7 @@ + @@ -445,7 +445,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 f5ab784a..ad348121 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs @@ -7,12 +7,12 @@ //---------------------------------------------------------------------- namespace CampusAppWP8.Pages.Setting { - using System; - using System.Windows.Navigation; - using CampusAppWP8.File.Setting; + using CampusAppWP8.Model.Setting; using CampusAppWP8.Model.Utility; using CampusAppWP8.Utility; using Microsoft.Phone.Controls; + using System; + using System.Windows.Navigation; /// /// Class for the UserProfilePage @@ -22,7 +22,7 @@ namespace CampusAppWP8.Pages.Setting /// /// Reference of the profileFile /// - private UserProfilFile userFile; + private UserProfilModel userProfil; /// /// Initializes a new instance of the class. @@ -30,7 +30,7 @@ namespace CampusAppWP8.Pages.Setting public UserProfil() { this.InitializeComponent(); - this.userFile = Settings.UserProfil; + this.userProfil = Settings.UserProfil; this.SetupListPickers(); } @@ -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.userFile.Model.Course.ToString().PadLeft(3, '0')); - this.Degree.SelectedIndex = degreeList.GetIndexOrDefault(((int)this.userFile.Model.Degree).ToString()); - this.Semster.SelectedIndex = semesterList.GetIndexOrDefault(this.userFile.Model.Semester.ToString()); - this.Role.SelectedIndex = roleList.GetIndexOrDefault(this.userFile.Model.Role.ToString()); + 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()); } /// @@ -75,11 +78,11 @@ namespace CampusAppWP8.Pages.Setting { try { - this.userFile.Model.Course = int.Parse(((ListPickerItemModel)this.Course.SelectedItem).Value); - this.userFile.Model.Degree = (CampusAppWP8.Model.Setting.UserProfilModel.DegreeType)Enum.Parse(typeof(CampusAppWP8.Model.Setting.UserProfilModel.DegreeType), ((ListPickerItemModel)this.Degree.SelectedItem).Value); - this.userFile.Model.Semester = int.Parse(((ListPickerItemModel)this.Semster.SelectedItem).Value); - this.userFile.Model.Role = (CampusAppWP8.Model.Setting.UserProfilModel.RoleType)Enum.Parse(typeof(CampusAppWP8.Model.Setting.UserProfilModel.RoleType), ((ListPickerItemModel)this.Role.SelectedItem).Value); - this.userFile.SaveData(); + 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.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/Pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs index 9835260f..b3a8412b 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs @@ -33,7 +33,7 @@ namespace CampusAppWP8.Pages menuItem1.Text = AppResources.Setting_UserProfilAppBarTitle; } - if (Settings.AppSetting.InitApp) + if (!Settings.AppSetting.InitApp) { this.ShowOptIns(); Settings.AppSetting.InitApp = true; diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs index b2d6dccd..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. /// @@ -214,7 +250,7 @@ namespace CampusAppWP8.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die Dürfen Positionsdaten enhober und verwendet werdet? ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die Dürfen Positionsdaten enhoben und verwendet werden? ähnelt. /// public static string GeoWatch_OptInText { get { @@ -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 4677210c..4e7afc85 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx @@ -333,7 +333,7 @@ Rolle - Semster + Semester Mitarbeiter @@ -363,6 +363,24 @@ Ortung - Dürfen Positionsdaten enhober und verwendet werdet? + 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 950c81cb..2b67bdc9 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs @@ -726,6 +726,51 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die UserSettings.Course ähnelt. + /// + public static string UserSettings_Course { + get { + return ResourceManager.GetString("UserSettings_Course", resourceCulture); + } + } + + /// + /// 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. + /// + public static string UserSettings_Degree { + get { + return ResourceManager.GetString("UserSettings_Degree", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die UserSettings.Role ähnelt. + /// + public static string UserSettings_Role { + get { + return ResourceManager.GetString("UserSettings_Role", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die UserSettings.Semester ähnelt. + /// + public static string UserSettings_Semester { + get { + return ResourceManager.GetString("UserSettings_Semester", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die 20121 ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index 99e8808a..b277f0f9 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -351,4 +351,19 @@ http://141.43.76.140/service/sps + + UserSettings.Course + + + UserSettings.Degree + + + UserSettings.Role + + + UserSettings.Semester + + + UserSettings.DefaultCampus + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Settings.cs b/CampusAppWP8/CampusAppWP8/Settings.cs index 3e22f380..a09bbe44 100644 --- a/CampusAppWP8/CampusAppWP8/Settings.cs +++ b/CampusAppWP8/CampusAppWP8/Settings.cs @@ -8,7 +8,6 @@ namespace CampusAppWP8 { - using CampusAppWP8.File.Setting; using CampusAppWP8.Model.Setting; /// @@ -19,7 +18,7 @@ namespace CampusAppWP8 /// /// reference of the user-profile-file /// - private static UserProfilFile userProfil = new UserProfilFile(); + private static UserProfilModel userProfil = new UserProfilModel(); /// /// reference of the appSettings @@ -29,7 +28,7 @@ namespace CampusAppWP8 /// /// Gets or sets the user-profile-file /// - public static UserProfilFile UserProfil + public static UserProfilModel UserProfil { get {