diff --git a/Service/DCEntityMapper/CompactCustomerDC_Customer.cs b/Service/DCEntityMapper/CompactCustomerDC_Customer.cs index 6d5fb0552..16936e0ea 100644 --- a/Service/DCEntityMapper/CompactCustomerDC_Customer.cs +++ b/Service/DCEntityMapper/CompactCustomerDC_Customer.cs @@ -73,13 +73,13 @@ namespace BeWo.Service.DCEntityMapper { var record_dict = new Dictionary { - {"Address", customer.AddressString}, + {"Adresse", customer.AddressString}, {"Alias", customer.CustomerAlias}, - {"CustomerOid", customer.CustomerOid}, - {"DateOfBirth", customer.DateOfBirthString}, - {"EqutyContribution", customer.EquityContribution}, - {"Fullname", customer.FullName}, - {"InvoiceAddress", customer.InvoiceAddressString} + {"Klient-ID", customer.CustomerOid}, + {"Geburtstag", customer.DateOfBirthString}, + {"EigenkapitalBeitrag", customer.EquityContribution}, + {"Name", customer.FullName}, + {"Rechnungsadresse", customer.InvoiceAddressString} }; return record_dict; diff --git a/Service/DCEntityMapper/CompactEmployeeDC_Employee.cs b/Service/DCEntityMapper/CompactEmployeeDC_Employee.cs index 577c9ecec..35f30bcce 100644 --- a/Service/DCEntityMapper/CompactEmployeeDC_Employee.cs +++ b/Service/DCEntityMapper/CompactEmployeeDC_Employee.cs @@ -40,9 +40,9 @@ namespace BeWo.Service.DCEntityMapper { var dict = new Dictionary() { - {"EmployeeOid", pDC.EmployeeOid }, - {"PersonellNumber", pDC.PersonnelNumber }, - {"FullName", pDC.FirstNameLastName }, + {"Mitarbeiter-ID", pDC.EmployeeOid }, + {"Personalnummer", pDC.PersonnelNumber }, + {"Name", pDC.FirstNameLastName }, }; return dict; diff --git a/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs b/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs index 15e6c6afb..cfcd3da84 100644 --- a/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs +++ b/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs @@ -68,7 +68,7 @@ namespace BeWo.Service.DCEntityMapper { var jsonObject = new Dictionary() { - {"OrganisationOid", pDC.OrganisationOid }, + {"Organisation-ID", pDC.OrganisationOid }, {"Name", pDC.Name }, {"Abteilung", pDC.Name2 }, {"Kundennummer", pDC.DebitorNumber }, diff --git a/Service/DCEntityMapper/CompactPersonDC_Person.cs b/Service/DCEntityMapper/CompactPersonDC_Person.cs index dfa7ba617..50c786c70 100644 --- a/Service/DCEntityMapper/CompactPersonDC_Person.cs +++ b/Service/DCEntityMapper/CompactPersonDC_Person.cs @@ -65,13 +65,13 @@ namespace BeWo.Service.DCEntityMapper { var jsonObject = new Dictionary() { - {"Address", pDC.AddressString }, - {"DateOfBirth", pDC.Birthday }, - {"CustomerOid", pDC.CustomerOid }, - {"EmployeeOid", pDC.EmployeeOid }, - { "FullName", pDC.FullName }, - {"Gender", pDC.Geschlecht.ToString() }, - {"Function", pDC.Function }, + {"Adresse", pDC.AddressString }, + {"Geburtstag", pDC.Birthday }, + {"Klient-ID", pDC.CustomerOid }, + {"Mitarbeiter-ID", pDC.EmployeeOid }, + {"Name", pDC.FullName }, + {"Geschlecht", pDC.Geschlecht.ToString() }, + {"Funktion", pDC.Function }, }; return jsonObject; diff --git a/Service/DCEntityMapper/CompactSupportConceptDC_SupportConcept.cs b/Service/DCEntityMapper/CompactSupportConceptDC_SupportConcept.cs index 3e5afb8c0..3221b1343 100644 --- a/Service/DCEntityMapper/CompactSupportConceptDC_SupportConcept.cs +++ b/Service/DCEntityMapper/CompactSupportConceptDC_SupportConcept.cs @@ -76,14 +76,14 @@ namespace BeWo.Service.DCEntityMapper var jsonObject = new Dictionary() { - {"SupportConceptOid", pDC.SupportConceptOid }, - {"Address", pDC.AddressString }, - {"AllCostBearerNames", pDC.AllCostBearerNames}, - {"CostBearer", pDC.CostBearer }, - {"CostBearerDetailStrings", pDC.CostBearerDetailStrings }, - {"Customer", customer }, - {"StartDate", pDC.StartDate }, - {"EndDate", pDC.EndDate } + {"Hilfeplan-ID", pDC.SupportConceptOid }, + {"Adresse", pDC.AddressString }, + {"Kostentraegernamen", pDC.AllCostBearerNames}, + {"Kostentraeger", pDC.CostBearer }, + {"Kostentraeger Details", pDC.CostBearerDetailStrings }, + {"Klient", customer }, + {"Startdatum", pDC.StartDate }, + {"Enddatum", pDC.EndDate } }; return jsonObject; diff --git a/Service/DCEntityMapper/CustomerDC_Customer.cs b/Service/DCEntityMapper/CustomerDC_Customer.cs index f068fd7e7..712944d17 100644 --- a/Service/DCEntityMapper/CustomerDC_Customer.cs +++ b/Service/DCEntityMapper/CustomerDC_Customer.cs @@ -437,14 +437,14 @@ namespace BeWo.Service.DCEntityMapper { var jsonObject = new Dictionary() { - {"CustomerOid", c.CustomerOid }, - { "Fullname", $"{c.FirstName} {c.LastName}"}, + {"Klient-ID", c.CustomerOid }, + { "Name", $"{c.FirstName} {c.LastName}"}, {"Alias", c.CustomerAlias }, - { "Birthday", c.DateOfBirth }, - {"Gender", c.Sex.ToString() }, + { "Geburtstag", c.DateOfBirth }, + {"Geschlecht", c.Sex.ToString() }, {"Nationalität", c.Nationalitaet?.DisplayName }, - {"IsMigrant", c.IsMigrant }, - {"MigrationBackground", c.Migrationshintergrund }, + {"HatMigrationshintergrund", c.IsMigrant }, + {"Migrationshintergrund", c.Migrationshintergrund }, {"Aufenthaltsstatus", c.AufenthaltsStatus?.DisplayName }, {"Familienstand", c.FamilyStatus.ToString() }, {"Beruf", c.Profession }, @@ -454,15 +454,18 @@ namespace BeWo.Service.DCEntityMapper {"Versichertennummer", c.InsuranceNumber }, {"Versichertenstatus", c.VersichertenStatus }, {"Kommentar", c.Notice }, - {"AdressLine1", c.AddressLine1 }, - {"Street", c.Street }, - {"PostalCode", c.PostalCode }, - {"Town", c.Town }, - {"DistanceInMeter", c.DistanceInMeter }, - {"InvoiceAdressLine1", c.InvoiceAddressLine1 }, - {"InvoiceStreet", c.InvoiceAddressStreet }, - {"InvoicePostalCode", c.InvoiceAddressPostalCode }, - {"InvoiceTown", c.InvoiceAddressTown } + {"Adressezeile 1", c.AddressLine1 }, + {"Straße", c.Street }, + {"PLZ", c.PostalCode }, + {"Ort", c.Town }, + {"Distanz in km", c.DistanceInMeter }, + {"Rechnungsadresse", new Dictionary() + { + { "Adresszeile 1", c.InvoiceAddressLine1 }, + { "Strasse ", c.InvoiceAddressStreet}, + { "Ort", c.InvoiceAddressTown }, + { "PLZ", c.InvoiceAddressPostalCode }, + }} }; return jsonObject; diff --git a/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs b/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs index 0f629e4cd..4bcdb84a4 100644 --- a/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs +++ b/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs @@ -271,22 +271,22 @@ namespace BeWo.Service.DCEntityMapper { var record_dict = new Dictionary { - {"ServiceRecordOid", service_record.ServiceRecordOid}, - { "StartDate", service_record.Start }, - { "EndDate", service_record.End }, - { "Duration (Std)", service_record.DurationInStunden }, - { "ServiceCategory", service_record.ServiceDescription.Category.Name }, - { "ServiceDescription", service_record.ServiceDescription.Name }, - { "Documentation", service_record.Notice + {"Zeiteintrag-ID", service_record.ServiceRecordOid}, + { "Startdatum", service_record.Start }, + { "Enddatum", service_record.End }, + { "Dauer in Stunden", service_record.DurationInStunden }, + { "Leistungskategorie", service_record.ServiceDescription.Category.Name }, + { "Leistungsbeschreibung", service_record.ServiceDescription.Name }, + { "Dokumentation", service_record.Notice + "\n" + service_record.Notice2 + "\n" + service_record.Notice3 + "\n" + service_record.Notice4 + "\n" + service_record.Notice5}, - { "Distance (Meter)", service_record.DistanceInMeter ?? 0 }, - { "InsertedOn", service_record.InsertedOn }, + { "Distanze in Meter", service_record.DistanceInMeter ?? 0 }, + { "Eingetragen am", service_record.InsertedOn }, { "Betrag", service_record.Betrag }, - { "InsertUser", service_record.InsUser }, - { "Employee", service_record.Employee } + { "Eingetragen von", service_record.InsUser }, + { "Mitarbeiter", service_record.Employee } }; return record_dict;