From 7a441a9956c728b461246fa0bb60c41f2a330a60 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 15 Sep 2020 13:23:34 +0200 Subject: [PATCH] cb diverse bugfixing --- BeWo/Converter/CellColorConverter.cs | 2 +- BeWo/View/Master/AdministrationView.xaml.cs | 15 ++++-- BeWo/View/MessageDialog.xaml.cs | 2 + .../SupportConceptCostBearerRelVM.cs | 50 +++++++++---------- Report/ReportObjects/FinanceRO.cs | 5 +- Service/Plugins/PluginLoader.cs | 8 +-- 6 files changed, 47 insertions(+), 35 deletions(-) diff --git a/BeWo/Converter/CellColorConverter.cs b/BeWo/Converter/CellColorConverter.cs index cc18937d4..fd4c00a12 100644 --- a/BeWo/Converter/CellColorConverter.cs +++ b/BeWo/Converter/CellColorConverter.cs @@ -44,7 +44,7 @@ namespace BeWo.Converter if (IsAbsence(dt, t.Customer.AbsenceTimes)) { - return Brushes.Red; + return Brushes.LightGray; } } } diff --git a/BeWo/View/Master/AdministrationView.xaml.cs b/BeWo/View/Master/AdministrationView.xaml.cs index 0cf8e7729..426cfb92b 100644 --- a/BeWo/View/Master/AdministrationView.xaml.cs +++ b/BeWo/View/Master/AdministrationView.xaml.cs @@ -222,12 +222,19 @@ namespace BeWo.View.Master switch (accordionItem.Name) { case nameof(TabitemMandator): - ServiceFacade.DoAccountingServiceAsync(s => s.LoadInvoiceNumber(), - iv => ServiceFacade.DoOperationsServiceAsync( + ServiceFacade.DoAccountingServiceAsync(s => s.LoadInvoiceNumberList(), + inl => ServiceFacade.DoOperationsServiceAsync( s => s.GetMandator(), m => - this.Dispatch(() => AddView(TabitemMandator, - new MandatorView(new MandatorVM(new InvoiceNumberVM(iv), m)))))); + this.Dispatch(() => + { + var vmList = new List(); + foreach (var indc in inl) + { + vmList.Add(new InvoiceNumberVM(indc)); + } + AddView(TabitemMandator, new MandatorView(new MandatorVM(vmList, m))); + }))); return; case nameof(TabitemQualificationTypes): VMFactory.CreateValueListVMAsync(ValueListEntryType.StaffQualificationsType, diff --git a/BeWo/View/MessageDialog.xaml.cs b/BeWo/View/MessageDialog.xaml.cs index e939d65f9..409bc5a4b 100644 --- a/BeWo/View/MessageDialog.xaml.cs +++ b/BeWo/View/MessageDialog.xaml.cs @@ -17,6 +17,8 @@ namespace BeWo.View { InitializeComponent(); DataContext = this; + + OkayButton.Visibility = Visibility.Collapsed; } public MessageDialog(Action pAfterPasswordConfirmationCallBack) diff --git a/BeWo/ViewModel/SupportConceptCostBearerRelVM.cs b/BeWo/ViewModel/SupportConceptCostBearerRelVM.cs index 06dab8091..5c65a6917 100644 --- a/BeWo/ViewModel/SupportConceptCostBearerRelVM.cs +++ b/BeWo/ViewModel/SupportConceptCostBearerRelVM.cs @@ -135,23 +135,23 @@ namespace BeWo.ViewModel { if (value != null) { - if (this.ApprovedStartDate == null) - { - this._ApprovedStartDate = value.Value.AddYears(-1); - this.FirePropertyChanged(PropertyName_ApprovedStartDate); - } + //if (this.ApprovedStartDate == null) + //{ + // this._ApprovedStartDate = value.Value.AddYears(-1); + // this.FirePropertyChanged(PropertyName_ApprovedStartDate); + //} - if (this.RequestedStartDate == null) - { - this._RequestedStartDate = value.Value.AddYears(-1); - this.FirePropertyChanged(PropertyName_RequestedStartDate); - } + //if (this.RequestedStartDate == null) + //{ + // this._RequestedStartDate = value.Value.AddYears(-1); + // this.FirePropertyChanged(PropertyName_RequestedStartDate); + //} - if (this.RequestedEndDate == null) - { - this._RequestedEndDate = value; - this.FirePropertyChanged(PropertyName_RequestedEndDate); - } + //if (this.RequestedEndDate == null) + //{ + // this._RequestedEndDate = value; + // this.FirePropertyChanged(PropertyName_RequestedEndDate); + //} } this._ApprovedEndDate = value; @@ -207,11 +207,11 @@ namespace BeWo.ViewModel { if (value != null && value > DateTime.Now.AddYears(-3) && value < DateTime.Now.AddYears(3)) { - if (this.ApprovedEndDate == null) - { - this._ApprovedEndDate = value.Value.AddYears(1).AddDays(-1); - this.FirePropertyChanged(PropertyName_ApprovedEndDate); - } + //if (this.ApprovedEndDate == null) + //{ + // this._ApprovedEndDate = value.Value.AddYears(1).AddDays(-1); + // this.FirePropertyChanged(PropertyName_ApprovedEndDate); + //} if (this.RequestedStartDate == null) { @@ -219,11 +219,11 @@ namespace BeWo.ViewModel this.FirePropertyChanged(PropertyName_RequestedStartDate); } - if (this.RequestedEndDate == null) - { - this._RequestedEndDate = value.Value.AddYears(1).AddDays(-1); - this.FirePropertyChanged(PropertyName_RequestedEndDate); - } + // if (this.RequestedEndDate == null) + // { + // this._RequestedEndDate = value.Value.AddYears(1).AddDays(-1); + // this.FirePropertyChanged(PropertyName_RequestedEndDate); + // } } this._ApprovedStartDate = value; diff --git a/Report/ReportObjects/FinanceRO.cs b/Report/ReportObjects/FinanceRO.cs index 0323be22d..eb1c39362 100644 --- a/Report/ReportObjects/FinanceRO.cs +++ b/Report/ReportObjects/FinanceRO.cs @@ -97,7 +97,10 @@ namespace BeWo.Report.ReportObjects if (item.SupportConcept != null && item.SupportConcept.ActivationType != ActivationTypeId.Deleted) { var ro = new SupportConceptFinanceRO(); - + if (item.CustomerName.Contains("Saupe")) + { + int test = 0; + } ro.CustomerName = item.CustomerName; ro.SupportConceptTimeSpanString = item.SupportConceptTimeSpanString; ro.CostBearerName = item.CostBearerName; diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index d1c987e55..e5dfd7531 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -19,7 +19,7 @@ namespace BeWo.Service.Plugins #if DEBUG var t = "demo"; - //t = "irgendwaswasesnichtgibt"; + t = "irgendwaswasesnichtgibt"; //t = "5473568546"; //Interner Chat //t = "2356097460"; // Lebenshilfe Würzburg //t = "1234567890"; // Präsentationsdatenbank @@ -120,7 +120,7 @@ namespace BeWo.Service.Plugins //t = "3341456098"; // Hilfe Daheim (früher BeWo Schillinger) //t = "4271389563"; // Komm Mit //t = "5430005891"; // Marienhospital Eickel - //t = "3265049248"; // Gerdas Pflegedienst + t = "3265049248"; // Gerdas Pflegedienst //t = "1549622397"; // Kontakt und Krisenhilfe //t = "4782194565"; // Skm Rheydt //t = "7535795843"; // Sozialwerk Dürener Christen @@ -146,7 +146,7 @@ namespace BeWo.Service.Plugins //t = "3956369664"; // LH Wetterau //t = "3984525482"; // API Berlin //t = "9975231461"; // Selwo - t = "8181286349"; // BeWo am Rhein + //t = "8181286349"; // BeWo am Rhein //t = "4595275645"; // Eigenständig //t = "7912635399"; // Prof. Dr. Eggers Stiftung //t = "3549726254"; // Socia @@ -172,7 +172,7 @@ namespace BeWo.Service.Plugins //t = "7755740484"; // Sawo //t = "8275654834"; // Twg Jonathan //t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V. - //t = "2632162696"; // Pro BeWo Düren + t = "2632162696"; // Pro BeWo Düren //t = "6340891020"; // Caritas Ahlen //t = "3659854106"; // alpha e.V. //t = "5809130435"; // Lebenshilfe Kusel