From 22b36efd603b37ba481c706c938628274adfab98 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Mon, 15 Feb 2021 08:04:40 +0100 Subject: [PATCH] =?UTF-8?q?MH:=20OperationsServiceImp=20aufger=C3=A4umt=20?= =?UTF-8?q?+=20Aktenzeichenfeld=20f=C3=BCr=20Behindertenausweis=20hinzugef?= =?UTF-8?q?=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo/View/Controls/DPCtrlWeek.cs | 11 +- BeWo/View/Detail/AdditionalServiceView.xaml | 2 +- BeWo/View/Detail/CustomerView.xaml | 3 +- .../Detail/Report/DienstplanerView.xaml.cs | 11 +- BeWo/View/Detail/ServiceRecordView2.xaml | 7 +- BeWo/ViewModel/CustomerVM.cs | 25 +- Data/Entities/Customer.cs | 19 +- Data/Mappings/Customer.hbm.xml | 3 +- Service/DCEntityMapper/CustomerDC_Customer.cs | 2 + .../Dienstplanung/DienstplanungsManager.cs | 138 ++ Service/Dokumentverwaltung/DokumentManager.cs | 237 +++ Service/Service.csproj | 4 +- .../OperationsServiceImp.cs | 1358 +---------------- Service/Vorlagen/VorlagenManager.cs | 1033 +++++++++++++ Shared/DataContracts/CustomerDC.cs | 3 + 15 files changed, 1556 insertions(+), 1300 deletions(-) create mode 100644 Service/Dienstplanung/DienstplanungsManager.cs create mode 100644 Service/Dokumentverwaltung/DokumentManager.cs create mode 100644 Service/Vorlagen/VorlagenManager.cs diff --git a/BeWo/View/Controls/DPCtrlWeek.cs b/BeWo/View/Controls/DPCtrlWeek.cs index 01a2b373c..e6582cf5a 100644 --- a/BeWo/View/Controls/DPCtrlWeek.cs +++ b/BeWo/View/Controls/DPCtrlWeek.cs @@ -31,16 +31,23 @@ namespace BeWo.View.Controls double res = 0.0; if (dc.Count != 0) + { foreach (var x in dc) { res += x.DurationHours; } + c.Text = res.ToString("0.##"); + } - c.Text = res.ToString("0.##"); + else + { + c.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 2); + c.Text = ""; + } } else { - c.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 2); + c.BorderBlack.BorderThickness = new Thickness(0, 0, 1, 1); c.Text = ""; } diff --git a/BeWo/View/Detail/AdditionalServiceView.xaml b/BeWo/View/Detail/AdditionalServiceView.xaml index 956fc9e2d..f9549bbc0 100644 --- a/BeWo/View/Detail/AdditionalServiceView.xaml +++ b/BeWo/View/Detail/AdditionalServiceView.xaml @@ -431,7 +431,7 @@ - diff --git a/BeWo/View/Detail/CustomerView.xaml b/BeWo/View/Detail/CustomerView.xaml index c02058fad..eb9f86a98 100644 --- a/BeWo/View/Detail/CustomerView.xaml +++ b/BeWo/View/Detail/CustomerView.xaml @@ -871,7 +871,8 @@ ItemsSource="{x:Static core:EnumTranslations.PflegegradTranslations}" SelectedValue="{Binding Path=Pflegegrad}" DisplayMemberPath="Value" SelectedValuePath="Key" /> - + diff --git a/BeWo/View/Detail/Report/DienstplanerView.xaml.cs b/BeWo/View/Detail/Report/DienstplanerView.xaml.cs index bf8549ec5..6a2a5839e 100644 --- a/BeWo/View/Detail/Report/DienstplanerView.xaml.cs +++ b/BeWo/View/Detail/Report/DienstplanerView.xaml.cs @@ -535,17 +535,18 @@ namespace BeWo.View.Detail.Report return; case "WE": + + pos = int.Parse(e.Column.FieldName.Remove(e.Column.FieldName.Length - 1)); + e.Value = selZeile.Zeile == 2 ? _DienstEintragListe.FindAll(x => x.Employee == selZeile.Employee).SelectMany(y => y.GetDienstWoche(pos)).ToList() : null; + if (selZeile.Zeile == 0 && selZeile.StatusListe != null) { e.Value = new List(); var week = new DPCtrlWeek(); week.DienstInfoDCList = e.Value as List; - } // Nutzlos.. + } - pos = int.Parse(e.Column.FieldName.Remove(e.Column.FieldName.Length - 1)); - e.Value = selZeile.Zeile == 2 ? _DienstEintragListe.FindAll(x => x.Employee == selZeile.Employee).SelectMany(y => y.GetDienstWoche(pos)).ToList() : null; - - if(e.Value != null) + if (e.Value != null) { // Nur für eigenes Verständnis beim Debuggen } diff --git a/BeWo/View/Detail/ServiceRecordView2.xaml b/BeWo/View/Detail/ServiceRecordView2.xaml index 14a4a1cbb..5e3e9c862 100644 --- a/BeWo/View/Detail/ServiceRecordView2.xaml +++ b/BeWo/View/Detail/ServiceRecordView2.xaml @@ -852,9 +852,10 @@ -