From 40ac60e8f8acce51d6cab9563558ed6812f4beb9 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 2 Dec 2025 23:15:17 +0100 Subject: [PATCH] =?UTF-8?q?Neue=20Felder=20Details=201-10=20f=C3=BCr=20die?= =?UTF-8?q?=20Wohneinheiten=20eingef=C3=BCgt=20+=20Addresszusatz=20beim=20?= =?UTF-8?q?EmployeeView?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo/View/Detail/EmployeeView.xaml | 29 +++- .../Wohneinheit/WohneinheitEditPopup.xaml | 79 ++++++++- .../WohneinheitVerwaltungViewV2.xaml | 90 +++++++++- BeWo/ViewModel/EmployeeVM.cs | 19 ++- BeWo/ViewModel/WohneinheitVM.cs | 161 ++++++++++++++++++ Data/Entities/Wohneinheit.cs | 12 ++ Data/Mappings/Wohneinheit.hbm.xml | 10 ++ Host/Host.csproj.user | 2 +- ...Changes_2025-12-02 Wohneinheit Details.txt | 11 ++ Model/Changes_alle_fuer_neue_db.txt | 13 ++ ReportImp/Fortis/Fortis.csproj | 1 + .../Translation/TranslationDictionary.cs | 29 ++++ .../Translation/TranslationDictionary.cs | 28 +++ .../_TemplateNeuKunde.csproj | 1 + .../WohneinheitDC_Wohneinheit.cs | 21 +++ .../CustomerPlaceholderManager.cs | 3 +- .../EmployeePlaceholderManager.cs | 12 +- .../WohnheimPlaceholderManager.cs | 10 ++ Service/Plugins/TranslationDictionary.cs | 4 + Shared/DataContracts/WohneinheitDC.cs | 10 ++ 20 files changed, 523 insertions(+), 22 deletions(-) create mode 100644 Model/Changes_2025-12-02 Wohneinheit Details.txt create mode 100644 ReportImp/Fortis/Translation/TranslationDictionary.cs create mode 100644 ReportImp/_TemplateNeuKunde/Translation/TranslationDictionary.cs diff --git a/BeWo/View/Detail/EmployeeView.xaml b/BeWo/View/Detail/EmployeeView.xaml index 7812dbb31..3ef43a8b1 100644 --- a/BeWo/View/Detail/EmployeeView.xaml +++ b/BeWo/View/Detail/EmployeeView.xaml @@ -611,16 +611,17 @@ + - + @@ -628,18 +629,24 @@ Grid.Row="0" Grid.Column="0" Margin="3" + VerticalAlignment="Center" + Content="{t:Translate EmployeeViewAdresszusatz}" /> + @@ -670,7 +683,7 @@ Grid.Row="1" Grid.Column="3" Margin="0,20,0,0" - Header="Kontakt" + Header="{t:Translate EmployeeViewKontakt}" Style="{StaticResource ObjectEditGroupBox}"> @@ -681,7 +694,7 @@ - + diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml index 76dc67ae7..4014f8206 100644 --- a/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml +++ b/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml @@ -43,6 +43,16 @@ + + + + + + + + + + @@ -173,7 +183,7 @@ Style="{StaticResource TextEditCurrency}" /> -