From f3d066731010febb1b6e4bf04db979b62fdafee9 Mon Sep 17 00:00:00 2001
From: stubbfel <stubbe@iit.tu-cottbus.de>
Date: Tue, 1 Oct 2013 16:34:03 +0200
Subject: [PATCH] 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
 
     /// <summary>Person search api.</summary>
     /// <remarks>Stubbfel, 05.09.2013.</remarks>
-    public class PersonSearchApi : XmlModel<PersonListModel>
+    public class PersonSearchApi : XmlModel<PersonListWp8Model>
     {
         #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 @@
     <Compile Include="Model\GeoDb\PlaceModel.cs" />
     <Compile Include="Model\GeoDb\PlaceService.cs" />
     <Compile Include="Model\GeoDb\SpsModel.cs" />
-    <Compile Include="Model\Person\PersonFunctionModel.cs" />
-    <Compile Include="Model\Person\PersonListModel.cs" />
-    <Compile Include="Model\Person\PersonModel.cs" />
+    <Compile Include="Model\Person\PersonFunctionWp8Model.cs" />
+    <Compile Include="Model\Person\PersonListWp8Model.cs" />
+    <Compile Include="Model\Person\PersonWp8Model.cs" />
     <Compile Include="Model\Setting\AppSettings.cs" />
     <Compile Include="Model\Setting\UserProfilModel.cs" />
     <Compile Include="Model\Utility\CourseListPickerItemListWp8Model.cs" />
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 @@
+//-----------------------------------------------------------------------------
+// <copyright file="PersonFunctionWp8Model.cs" company="BTU/IIT">
+//     Company copyright tag.
+// </copyright>
+// <author>stubbfel</author>
+// <sience>05.09.2013</sience>
+//-----------------------------------------------------------------------------
+namespace CampusAppWP8.Model.Person
+{
+    using System.Xml.Serialization;
+    using CampusAppWP8.Utility;
+
+    /// <summary>Person function model.</summary>
+    /// <remarks>Stubbfel, 05.09.2013.</remarks>
+    public class PersonFunctionWp8Model : CampusAppWPortalLib8.Model.Person.PersonFunctionModel 
+    {
+        #region Property
+
+        /// <summary>Gets or sets the function.</summary>
+        /// <value>The function.</value>
+        [XmlAttribute("funktion")]
+        public new string Function
+        {
+            get
+            {
+                return base.Function;
+            }
+
+            set
+            {
+                if (value != this.Function)
+                {
+                    base.Function = Wp8StringManager.StripAndDecodeHTML(value);
+                }
+            }
+        }
+
+        /// <summary>Gets or sets the appointment.</summary>
+        /// <value>The appointment.</value>
+        [XmlAttribute("einrichtung")]
+        public new string Appointment
+        {
+            get
+            {
+                return base.Appointment;
+            }
+
+            set
+            {
+                if (value != this.Appointment)
+                {
+                    base.Appointment = Wp8StringManager.StripAndDecodeHTML(value);
+                }
+            }
+        }
+
+        /// <summary>Gets or sets the building.</summary>
+        /// <value>The building.</value>
+        [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 @@
+//-----------------------------------------------------------------------------
+// <copyright file="PersonListWp8Model.cs" company="BTU/IIT">
+//     Company copyright tag.
+// </copyright>
+// <author>stubbfel</author>
+// <sience>05.09.2013</sience>
+//-----------------------------------------------------------------------------
+
+namespace CampusAppWP8.Model.Person
+{
+    using System.Xml.Serialization;
+    using CampusAppWPortalLib8.Model.Person;
+
+    /// <summary>Person list model.</summary>
+    /// <remarks>Stubbfel, 05.09.2013.</remarks>
+    [XmlRoot("Uebersicht")]
+    public class PersonListWp8Model : CampusAppWPortalLib8.Model.Person.PersonListModel<PersonWp8Model>
+    {
+        /// <summary>Gets a person.</summary>
+        /// <remarks>Stubbfel, 05.09.2013.</remarks>
+        /// <param name="id">The identifier.</param>
+        /// <returns>The person.</returns>
+        public new PersonWp8Model GetPerson(string id)
+        {
+            IPersonModel<PersonWp8Model> 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;
 
     /// <summary>Person page.</summary>
     /// <remarks>Stubbfel, 09.09.2013.</remarks>
@@ -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 @@
+//-----------------------------------------------------------------------------
+// <copyright file="IPersonFunctionModel.cs" company="BTU/IIT">
+//     Company copyright tag.
+// </copyright>
+// <author>stubbfel</author>
+// <sience>01.10.2013</sience>
+//-----------------------------------------------------------------------------
+namespace CampusAppWPortalLib8.Model.Person
+{
+    /// <summary>
+    /// Interface for PersonFunctionModel classes
+    /// </summary>
+    public interface IPersonFunctionModel
+    {
+        /// <summary>Gets or sets the identifier of the person.</summary>
+        /// <value>The identifier of the person.</value>
+         string PersonID { get; set; }
+
+        /// <summary>Gets or sets zero-based index of the function.</summary>
+        /// <value>The function index.</value>
+        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 @@
+//-----------------------------------------------------------------------------
+// <copyright file="IPersonModel.cs" company="BTU/IIT">
+//     Company copyright tag.
+// </copyright>
+// <author>stubbfel</author>
+// <sience>01.10.2013</sience>
+//-----------------------------------------------------------------------------
+namespace CampusAppWPortalLib8.Model.Person
+{
+    using System.Collections.ObjectModel;
+
+    /// <summary>
+    /// Interface for PersonModel classes
+    /// </summary>
+    /// <typeparam name="T">PersonFunctionModel template</typeparam>
+    public interface IPersonModel<T>
+    {
+        /// <summary>Gets or sets the functions of a person.</summary>
+        /// <value>The functions.</value>
+        ObservableCollection<T> Functions { get; set; }
+
+        /// <summary>Gets or sets the identifier.</summary>
+        /// <value>The identifier.</value>
+        string ID { get; set; }
+
+        /// <summary>Sets person identifier to function.</summary>
+        /// <remarks>Stubbfel, 05.09.2013.</remarks>
+        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 @@
 // <author>stubbfel</author>
 // <sience>05.09.2013</sience>
 //-----------------------------------------------------------------------------
-namespace CampusAppWP8.Model.Person
+namespace CampusAppWPortalLib8.Model.Person
 {
     using System.Xml.Serialization;
-    using CampusAppWP8.Utility;
+    using CampusAppWPortalLib8.Utility;
 
     /// <summary>Person function model.</summary>
     /// <remarks>Stubbfel, 05.09.2013.</remarks>
-    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 @@
 // <sience>05.09.2013</sience>
 //-----------------------------------------------------------------------------
 
-namespace CampusAppWP8.Model.Person
+namespace CampusAppWPortalLib8.Model.Person
 {
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
@@ -14,15 +14,16 @@ namespace CampusAppWP8.Model.Person
 
     /// <summary>Person list model.</summary>
     /// <remarks>Stubbfel, 05.09.2013.</remarks>
+    /// <typeparam name="T">personModel template</typeparam>
     [XmlRoot("Uebersicht")]
-    public class PersonListModel
+    public class PersonListModel<T>
     {
         #region Property
 
         /// <summary>Gets or sets the persons.</summary>
         /// <value>The persons.</value>
         [XmlElement("person")]
-        public ObservableCollection<PersonModel> Persons { get; set; }
+        public ObservableCollection<T> Persons { get; set; }
 
         #endregion
 
@@ -32,9 +33,13 @@ namespace CampusAppWP8.Model.Person
         /// <remarks>Stubbfel, 05.09.2013.</remarks>
         public void SetPersonIdToFunction()
         {
-            foreach (PersonModel person in this.Persons)
+            foreach (T item in this.Persons)
             {
-                person.SetPersonIdToFunction();
+                IPersonModel<T> person = item as IPersonModel<T>;
+                if (person != null)
+                {
+                    person.SetPersonIdToFunction();
+                }
             }
         }
 
@@ -42,17 +47,23 @@ namespace CampusAppWP8.Model.Person
         /// <remarks>Stubbfel, 05.09.2013.</remarks>
         /// <param name="id">The identifier.</param>
         /// <returns>The person.</returns>
-        public PersonModel GetPerson(string id)
+        public IPersonModel<T> GetPerson(string id)
         {
-            foreach (PersonModel tmpPerson in this.Persons)
+            foreach (T item in this.Persons)
             {
+                IPersonModel<T> tmpPerson = item as IPersonModel<T>;
+                if (tmpPerson == null)
+                {
+                    continue;
+                }
+
                 if (tmpPerson.ID.Equals(id))
                 {
                     return tmpPerson;
                 }
             }
 
-            return null;
+            return default(IPersonModel<T>);
         }
 
         /// <summary>Removes the non function and set identifiers person.</summary>
@@ -67,16 +78,22 @@ namespace CampusAppWP8.Model.Person
         /// <remarks>Stubbfel, 05.09.2013.</remarks>
         public void RemoveNonFunctionPerson()
         {
-            List<PersonModel> removeList = new List<PersonModel>();
-            foreach (PersonModel tmpPerson in this.Persons)
+            List<T> removeList = new List<T>();
+            foreach (T item in this.Persons)
             {
+                IPersonModel<T> tmpPerson = item as IPersonModel<T>;
+                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 @@
 // <author>stubbfel</author>
 // <sience>05.09.2013</sience>
 //-----------------------------------------------------------------------------
-namespace CampusAppWP8.Model.Person
+namespace CampusAppWPortalLib8.Model.Person
 {
     using System.Collections.ObjectModel;
     using System.Xml.Serialization;
-    using CampusAppWP8.Utility;
 
     /// <summary>Person model.</summary>
     /// <remarks>Stubbfel, 05.09.2013.</remarks>
-    public class PersonModel
+    /// <typeparam name="T">template for the PersonFunction-Class</typeparam>
+    public class PersonModel<T> : IPersonModel<T>
     {
         #region Member
 
@@ -30,7 +30,7 @@ namespace CampusAppWP8.Model.Person
         private string id;
 
         /// <summary>The functions.</summary>
-        private ObservableCollection<PersonFunctionModel> functions;
+        private ObservableCollection<T> 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
         /// <summary>Gets or sets the functions of a person.</summary>
         /// <value>The functions.</value>
         [XmlElement("funktion")]
-        public ObservableCollection<PersonFunctionModel> Functions
+        public ObservableCollection<T> 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 @@
 <StyleCopSettings Version="105">
   <GlobalSettings>
     <CollectionProperty Name="RecognizedWords">
+      <Value>akadgrad</Value>
       <Value>api</Value>
       <Value>nfc</Value>
       <Value>param</Value>