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