diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs
index 3502c684..e008cee8 100644
--- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs
+++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs
@@ -5,7 +5,7 @@
// stubbfel
// 12.08.2013
//----------------------------------------------------------------------
-namespace CampusAppWP8.Feed.GeoApi
+namespace CampusAppWP8.Api.GeoApi
{
using System;
using System.Collections.Generic;
diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs
index 7972517f..3bef6f90 100644
--- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs
+++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs
@@ -5,7 +5,7 @@
// stubbfel
// 06.08.2013
//----------------------------------------------------------------------
-namespace CampusAppWP8.Feed.GeoApi
+namespace CampusAppWP8.Api.GeoApi
{
using System;
using System.Collections.Generic;
diff --git a/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs b/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs
index da60d1a9..96ce98a2 100644
--- a/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs
+++ b/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs
@@ -5,7 +5,7 @@
// stubbfel
// 13.06.2013
//----------------------------------------------------------------------
-namespace CampusAppWP8.Feed.Lecture
+namespace CampusAppWP8.Api.Lecture
{
using CampusAppWP8.Model;
using CampusAppWP8.Model.Lecture;
diff --git a/CampusAppWP8/CampusAppWP8/Api/Person/PersonSearchApi.cs b/CampusAppWP8/CampusAppWP8/Api/Person/PersonSearchApi.cs
new file mode 100644
index 00000000..56bf909e
--- /dev/null
+++ b/CampusAppWP8/CampusAppWP8/Api/Person/PersonSearchApi.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CampusAppWP8.Api.Person
+{
+ class PersonSearchApi
+ {
+ }
+}
diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
index d3a8f03c..54bc80fd 100644
--- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
+++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
@@ -95,6 +95,7 @@
+
App.xaml
@@ -119,6 +120,7 @@
+
diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionModel.cs b/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionModel.cs
index 6e558548..86c91b26 100644
--- a/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionModel.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionModel.cs
@@ -1,24 +1,42 @@
-using CampusAppWP8.Resources;
-using CampusAppWP8.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Xml.Serialization;
-
+//-----------------------------------------------------------------------------
+//
+// Company copyright tag.
+//
+// stubbfel
+// 05.09.2013
+//-----------------------------------------------------------------------------
namespace CampusAppWP8.Model.Person
{
+ using System.Xml.Serialization;
+ using CampusAppWP8.Utility;
+
+ /// Person function model.
+ /// Stubbfel, 05.09.2013.
public class PersonFunctionModel
{
+ /// The first tel.
private string tel1;
+ /// The second tel.
private string tel2;
+ /// The fax.
private string fax;
+ /// The mail.
private string mail;
+ /// The function.
+ private string function;
+
+ /// The appointment.
+ private string appointment;
+
+ /// The building.
+ private string building;
+
+ /// Gets or sets the tel 1.
+ /// The tel 1.
[XmlAttribute("telefon")]
public string Tel1
{
@@ -26,6 +44,7 @@ namespace CampusAppWP8.Model.Person
{
return this.tel1;
}
+
set
{
if (value != null && value != this.tel1)
@@ -35,6 +54,8 @@ namespace CampusAppWP8.Model.Person
}
}
+ /// Gets or sets the tel 2.
+ /// The tel 2.
[XmlAttribute("telefon2")]
public string Tel2
{
@@ -42,6 +63,7 @@ namespace CampusAppWP8.Model.Person
{
return this.tel2;
}
+
set
{
if (value != null && value != this.tel2)
@@ -51,6 +73,8 @@ namespace CampusAppWP8.Model.Person
}
}
+ /// Gets or sets the fax.
+ /// The fax.
[XmlAttribute("fax")]
public string Fax
{
@@ -58,6 +82,7 @@ namespace CampusAppWP8.Model.Person
{
return this.fax;
}
+
set
{
if (value != null && value != this.fax)
@@ -67,15 +92,65 @@ namespace CampusAppWP8.Model.Person
}
}
+ /// Gets or sets the function.
+ /// The function.
[XmlAttribute("funktion")]
- public string Function { get; set; }
+ public string Function
+ {
+ get
+ {
+ return this.function;
+ }
+ set
+ {
+ if (value != this.function)
+ {
+ this.function = StringManager.StripHTML(value);
+ }
+ }
+ }
+
+ /// Gets or sets the appointment.
+ /// The appointment.
[XmlAttribute("einrichtung")]
- public string Appointment { get; set; }
+ public string Appointment
+ {
+ get
+ {
+ return this.appointment;
+ }
+ set
+ {
+ if (value != this.appointment)
+ {
+ this.appointment = StringManager.StripHTML(value);
+ }
+ }
+ }
+
+ /// Gets or sets the building.
+ /// The building.
[XmlAttribute("gebaeude")]
- public string Building { get; set; }
+ public string Building
+ {
+ get
+ {
+ return this.building;
+ }
+ set
+ {
+ if (value != this.building)
+ {
+ this.building = StringManager.StripHTML(value);
+ }
+ }
+ }
+
+ /// Gets or sets the mail.
+ /// The mail.
[XmlAttribute("mail")]
public string Mail
{
@@ -83,6 +158,7 @@ namespace CampusAppWP8.Model.Person
{
return this.mail;
}
+
set
{
if (value != null && value != this.mail && StringManager.IsValidEmail(value))
@@ -91,7 +167,5 @@ namespace CampusAppWP8.Model.Person
}
}
}
-
-
}
}
diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonListModel.cs b/CampusAppWP8/CampusAppWP8/Model/Person/PersonListModel.cs
new file mode 100644
index 00000000..3f181cc9
--- /dev/null
+++ b/CampusAppWP8/CampusAppWP8/Model/Person/PersonListModel.cs
@@ -0,0 +1,24 @@
+//-----------------------------------------------------------------------------
+//
+// Company copyright tag.
+//
+// stubbfel
+// 05.09.2013
+//-----------------------------------------------------------------------------
+
+namespace CampusAppWP8.Model.Person
+{
+ using System.Collections.ObjectModel;
+ using System.Xml.Serialization;
+
+ /// Person list model.
+ /// Stubbfel, 05.09.2013.
+ [XmlRoot("Uebersicht")]
+ public class PersonListModel
+ {
+ /// Gets or sets the persons.
+ /// The persons.
+ [XmlElement("person")]
+ public ObservableCollection Persons { get; set; }
+ }
+}
diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonModel.cs b/CampusAppWP8/CampusAppWP8/Model/Person/PersonModel.cs
index e5cc4d8d..8fd06768 100644
--- a/CampusAppWP8/CampusAppWP8/Model/Person/PersonModel.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Person/PersonModel.cs
@@ -1,28 +1,94 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Serialization;
-
+//-----------------------------------------------------------------------------
+//
+// Company copyright tag.
+//
+// stubbfel
+// 05.09.2013
+//-----------------------------------------------------------------------------
namespace CampusAppWP8.Model.Person
{
+ using System.Collections.ObjectModel;
+ using System.Xml.Serialization;
+ using CampusAppWP8.Utility;
+
+ /// Person model.
+ /// Stubbfel, 05.09.2013.
public class PersonModel
{
+ /// The akadgrad.
+ private string akadgrad;
+
+ /// Name of the sur.
+ private string surName;
+
+ /// The person's first name.
+ private string firstName;
+
+ /// Gets or sets the identifier.
+ /// The identifier.
[XmlAttribute("id")]
- public string ID {get; set;}
+ public string ID { get; set; }
+ /// Gets or sets the akadgrad.
+ /// The akadgrad.
[XmlAttribute("akadgrad")]
- public string Akadgrad { get; set; }
+ public string Akadgrad
+ {
+ get
+ {
+ return this.akadgrad;
+ }
+ set
+ {
+ if (value != this.akadgrad)
+ {
+ this.akadgrad = StringManager.StripHTML(value);
+ }
+ }
+ }
+
+ /// Gets or sets the name of the sur.
+ /// The name of the sur.
[XmlAttribute("nachname")]
- public string SureName { get; set; }
+ public string SurName
+ {
+ get
+ {
+ return this.surName;
+ }
+ set
+ {
+ if (value != this.surName)
+ {
+ this.surName = StringManager.StripHTML(value);
+ }
+ }
+ }
+
+ /// Gets or sets the person's first name.
+ /// The name of the first.
[XmlAttribute("vorname")]
- public string FirstName { get; set; }
+ public string FirstName
+ {
+ get
+ {
+ return this.firstName;
+ }
+ set
+ {
+ if (value != this.firstName)
+ {
+ this.firstName = StringManager.StripHTML(value);
+ }
+ }
+ }
+
+ /// Gets or sets the functions of a person.
+ /// The functions.
[XmlElement("funktion")]
- public ObservableCollection Function { get; set; }
+ public ObservableCollection Functions { get; set; }
}
}
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs
index df00699e..0954f3b6 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs
@@ -11,7 +11,7 @@ namespace CampusAppWP8.Pages.Lecture
using System.Collections.Generic;
using System.Windows;
using System.Windows.Navigation;
- using CampusAppWP8.Feed.Lecture;
+ using CampusAppWP8.Api.Lecture;
using CampusAppWP8.Model.Lecture;
using CampusAppWP8.Model.Utility;
using CampusAppWP8.Resources;
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
index 228ffcb9..3f777e48 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
@@ -11,7 +11,7 @@ namespace CampusAppWP8.Pages.Mensa
using System.Threading;
using System.Windows;
using System.Windows.Navigation;
- using CampusAppWP8.Feed.GeoApi;
+ using CampusAppWP8.Api.GeoApi;
using CampusAppWP8.Feed.Mensa;
using CampusAppWP8.Resources;
using CampusAppWP8.Utility.Lui.MessageBoxes;