diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index c1beec740..793bbfab6 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -3596,12 +3596,6 @@ - - - - - - diff --git a/BeWoPlanerMobil/Util/JsonPerson.cs b/BeWoPlanerMobil/Util/JsonPerson.cs index b614f4392..00a28e817 100644 --- a/BeWoPlanerMobil/Util/JsonPerson.cs +++ b/BeWoPlanerMobil/Util/JsonPerson.cs @@ -88,7 +88,7 @@ namespace BeWoPlanerMobil.Util Familienstand = person.FamilyStatus != null ? EnumTranslations.FamilyStatusTranslations[person.FamilyStatus] : string.Empty; Funktion = person.Function?.DisplayName ?? string.Empty; Staatsangehoerigkeit = person.Nationalitaet?.DisplayName ?? string.Empty; - Migrationshintergrund = person.Migrationshintergrund; + Migrationshintergrund = person.IsMigrant ? "checked" : string.Empty; Aufenthaltsstatus = person.AufenthaltsStatus?.DisplayName ?? string.Empty; Archiviert = person.ActivationType == ActivationTypeId.Archived ? "checked" : string.Empty; Notizen = person.PersonNotice; @@ -106,16 +106,16 @@ namespace BeWoPlanerMobil.Util { switch(contact.ContactType) { - case ContactType.business_Mail: + case ContactType.private_Mail: EMail = contact.ContactValue; break; - case ContactType.business_Fax: + case ContactType.private_Fax: Fax = contact.ContactValue; break; - case ContactType.business_Phone: + case ContactType.private_Phone: Telefon = contact.ContactValue; break; - case ContactType.business_MobilePhone: + case ContactType.private_MobilePhone: Handy = contact.ContactValue; break; } diff --git a/BeWoPlanerMobil/Views/Person/Person.cshtml b/BeWoPlanerMobil/Views/Person/Person.cshtml index 2d97debda..66beb4e51 100644 --- a/BeWoPlanerMobil/Views/Person/Person.cshtml +++ b/BeWoPlanerMobil/Views/Person/Person.cshtml @@ -265,16 +265,12 @@
-
-
-
-
- Migrationshintergrund -
-
- -
-
+
+
+ + +
+
@@ -523,7 +519,7 @@
-
+