From 32369ce4f286a92b94d01d9647a503799146d96a Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 16 Aug 2023 10:25:05 +0200 Subject: [PATCH] =?UTF-8?q?Todos=20f=C3=BCr=20Release=20+=20Diakonie=20Kir?= =?UTF-8?q?chenkreis=20Kleve=20Finanzauswertung=20+=20Neue=20Felder=20Stor?= =?UTF-8?q?no=20und=20Lizenztyp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Detail/Accounting/InvoiceOverview.xaml | 6 +- .../Detail/Accounting/InvoiceOverview.xaml.cs | 17 + BeWo/View/Detail/UserView.xaml | 9 +- BeWo/View/Detail/UserView.xaml.cs | 5 + .../Zeiterfassung/ServiceRecordView2.xaml | 3 +- .../Zeiterfassung/ServiceRecordView2.xaml.cs | 52 + BeWo/View/NotizenView.xaml.cs | 4 +- BeWo/ViewModel/InvoiceBaseVM.cs | 8 +- .../ListViewModel/ServiceRecordListVM.cs | 38 +- BeWo/ViewModel/UserVM.cs | 45 +- Data/Entities/ApplicationUser.cs | 5 + Data/Entities/InvoiceBase.cs | 7 + Data/Mappings/ApplicationUser.hbm.xml | 1 + Data/Mappings/InvoiceBase.hbm.xml | 1 + Model/Changes_2023_08_16_User_InvoiceBase.txt | 7 + Model/Changes_alle_fuer_neue_db.txt | 8 + ReportImp/AwoDortmund/CustomReportCreator.cs | 16 +- .../CustomGroupDurationCalculator.cs | 79 + .../BeWoDarmstadt/CustomReportCreator.cs | 4 +- ReportImp/BeWoDarmstadt/Teamuebersicht.cs | 6 +- .../DiakonieKKKleve/DiakonieKKKleve.csproj | 19 +- ReportImp/DiakonieKKKleve/Finanzauswertung.cs | 79 +- .../Finanzauswertung.designer.cs | 37 +- ...gSozi.cs => FinanzauswertungSoziEinzel.cs} | 4 +- ...=> FinanzauswertungSoziEinzel.designer.cs} | 4 +- ...i.resx => FinanzauswertungSoziEinzel.resx} | 0 .../FinanzauswertungSoziGruppe.cs | 72 + .../FinanzauswertungSoziGruppe.designer.cs | 772 ++++++++++ .../FinanzauswertungSoziGruppe.resx | 123 ++ .../Invoicing/DiakoneKKKleveInvoiceFactory.cs | 11 +- ...koneKKKleveSoziotherapieInvoiceCreation.cs | 19 +- .../PerspektivenEV/PerspektivenEV.csproj | 3 + .../Teamstundenkonto.designer.cs | 1338 ++++++++--------- ReportImp/SHKServiceSBD/Arbeitszeitkonto.cs | 16 +- .../Arbeitszeitkonto.designer.cs | 605 ++++---- .../SHKServiceSBD/ArbeitszeitkontoListRO.cs | 42 +- ...MitarbeiterstundenkontoBerechnungMonate.cs | 31 + ReportImp/WahlEv/WahlCalculations.cs | 8 +- .../Wichernhaus/Budgetnachweis2.Designer.cs | 634 +++++--- ReportImp/Wichernhaus/Budgetnachweis2.cs | 82 +- ReportImp/Wichernhaus/Budgetnachweis2.resx | 2 +- .../BudgetnachweisVariante2.Designer.cs | 341 +++++ .../Wichernhaus/BudgetnachweisVariante2.cs | 69 + .../Wichernhaus/BudgetnachweisVariante2.resx | 131 ++ ReportImp/Wichernhaus/Wichernhaus.csproj | 20 +- .../InvoiceBaseDC_InvoiceBase.cs | 8 +- Service/DCEntityMapper/UserDC_User.cs | 6 +- Service/Plugins/AccountingService.cs | 8 + .../ServiceImplementations/UserServiceImp.cs | 26 +- .../ClientPartials/InvoiceBaseDC.cs | 2 +- Shared/DataContracts/InvoiceBaseDC.cs | 6 + Shared/DataContracts/UserDC.cs | 6 + 52 files changed, 3531 insertions(+), 1314 deletions(-) create mode 100644 Model/Changes_2023_08_16_User_InvoiceBase.txt rename ReportImp/DiakonieKKKleve/{FinanzauswertungSozi.cs => FinanzauswertungSoziEinzel.cs} (92%) rename ReportImp/DiakonieKKKleve/{FinanzauswertungSozi.designer.cs => FinanzauswertungSoziEinzel.designer.cs} (99%) rename ReportImp/DiakonieKKKleve/{FinanzauswertungSozi.resx => FinanzauswertungSoziEinzel.resx} (100%) create mode 100644 ReportImp/DiakonieKKKleve/FinanzauswertungSoziGruppe.cs create mode 100644 ReportImp/DiakonieKKKleve/FinanzauswertungSoziGruppe.designer.cs create mode 100644 ReportImp/DiakonieKKKleve/FinanzauswertungSoziGruppe.resx create mode 100644 ReportImp/Wichernhaus/BudgetnachweisVariante2.Designer.cs create mode 100644 ReportImp/Wichernhaus/BudgetnachweisVariante2.cs create mode 100644 ReportImp/Wichernhaus/BudgetnachweisVariante2.resx diff --git a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml index 62f2b2b70..70ed3fd0b 100644 --- a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml +++ b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml @@ -70,7 +70,11 @@ - + diff --git a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs index f370be0aa..a81149a9f 100644 --- a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs +++ b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs @@ -354,6 +354,23 @@ namespace BeWo.View.Detail.Accounting } } } + + private void TableView_OnCustomRowAppearance(object sender, CustomRowAppearanceEventArgs e) + { + if (e.Property != null && e.Property.Name == "Background") + { + var ib = datagrid_invoices.GetRow(e.RowHandle) as InvoiceBaseVM; + if (ib != null && !String.IsNullOrEmpty(ib.BackgroundColor)) + { + e.Result = new SolidColorBrush((Color)ColorConverter.ConvertFromString(ib.BackgroundColor)); + e.Handled = true; + } + + + } + + //var data = srGridControl.rowhan + } } } \ No newline at end of file diff --git a/BeWo/View/Detail/UserView.xaml b/BeWo/View/Detail/UserView.xaml index d35f59f2e..f8eea7b56 100644 --- a/BeWo/View/Detail/UserView.xaml +++ b/BeWo/View/Detail/UserView.xaml @@ -44,6 +44,10 @@ + + + +