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 {