From 5d82fcfe7513d1eb042c63c651afea1ef40cf0f9 Mon Sep 17 00:00:00 2001
From: Christian <christian.baeurle@beyondsoft.de>
Date: Fri, 15 Dec 2017 10:47:43 +0100
Subject: [PATCH] cb

---
 .../SingleSupportConceptSelectionControl.xaml |  5 +-
 .../Detail/Report/ServicesReportView.xaml.cs  |  1 +
 .../Detail/ServiceRecordGroupEditView.xaml.cs | 13 ++++
 BeWo/View/Master/ReportView.xaml.cs           | 13 ++--
 BeWo/View/Master/SchedulerMasterView.xaml     |  5 +-
 BeWo/View/Master/SchedulerMasterView.xaml.cs  | 24 ++++----
 .../Auslastung/AuslastungReportView2.xaml.cs  |  6 +-
 .../Employee/EmployeeHourReportView.xaml.cs   |  6 +-
 BeWo/ownChat/ChatDokumentationsView.xaml.cs   | 60 ++++++++++---------
 BeWo/ownChat/ChatServiceCustomer.xaml.cs      | 12 +++-
 BeWo/ownChat/ChatView.xaml.cs                 |  4 +-
 Data/Access/SearchDAO.cs                      |  9 +++
 Report/ReportObjects/ServicesOverviewRO.cs    |  1 -
 .../Translation/TranslationDictionary.cs      |  1 +
 .../BeWoRichartz/Properties/licenses.licx     |  1 +
 .../ServicesOverviewReport.Designer.cs        | 54 +++++++----------
 .../BeWoRichartz/ServicesOverviewReport.cs    | 20 +++++++
 Service/Plugins/PluginLoader.cs               |  4 +-
 Service/ServiceContracts/ICustomerService.cs  |  6 +-
 .../CustomerServiceImp.cs                     | 19 +++++-
 .../FlatSupportConceptTreeNodeDC.cs           |  3 +-
 Shared/Translation/Translator.cs              |  2 +-
 22 files changed, 175 insertions(+), 94 deletions(-)

diff --git a/BeWo/View/Controls/SingleSupportConceptSelectionControl.xaml b/BeWo/View/Controls/SingleSupportConceptSelectionControl.xaml
index 6f740ff4d..cfad06f2e 100644
--- a/BeWo/View/Controls/SingleSupportConceptSelectionControl.xaml
+++ b/BeWo/View/Controls/SingleSupportConceptSelectionControl.xaml
@@ -3,7 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
              xmlns:localsearch="clr-namespace:BeWo.View.Search"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
              mc:Ignorable="d">
 
     <Grid Background="{DynamicResource SupportConceptListBrush}" MouseDown="btnSelectSupportConcept_Click" x:Name="mainGrid">
@@ -38,7 +39,7 @@
                   <TextBlock Grid.Row="1" Grid.ColumnSpan="2" FontSize="12" x:Name="supportConceptText" Margin="3 2" Text="{Binding SupportConceptName}" VerticalAlignment="Center" Foreground="{Binding NodeForegroundBrush}" />
                     <TextBlock Grid.Row="2" Grid.ColumnSpan="2" FontSize="12" Foreground="#FFA0A0A0" x:Name="costBearerText" Margin="3 2" Text="{Binding CostBearerName}" VerticalAlignment="Center" />
                     <Button Grid.Column="2" Grid.RowSpan="3" x:Name="btnSelectSupportConcept"
-                    		ToolTip="Hilfeplan auswählen" Tag="{Binding}" Width="26" Height="Auto"  Click="btnSelectSupportConcept_Click" Margin="0">
+                    		ToolTip="{markup:Translate Hilfeplan auswählen}" Tag="{Binding}" Width="26" Height="Auto"  Click="btnSelectSupportConcept_Click" Margin="0">
                         <Border Grid.RowSpan="2" Margin="0"  HorizontalAlignment="Center" VerticalAlignment="Center" >
                             <Canvas VerticalAlignment="Center" HorizontalAlignment="Center" Width="20" Height="20" Margin="0,0,0,0" >
                                 <Ellipse x:Name="lupe1" Stroke="#FFFFFFFF" Height="14" Width="14" StrokeThickness="2" Fill="{x:Null}" />
diff --git a/BeWo/View/Detail/Report/ServicesReportView.xaml.cs b/BeWo/View/Detail/Report/ServicesReportView.xaml.cs
index 8a1c8eeea..a3c5997a3 100644
--- a/BeWo/View/Detail/Report/ServicesReportView.xaml.cs
+++ b/BeWo/View/Detail/Report/ServicesReportView.xaml.cs
@@ -135,6 +135,7 @@ namespace BeWo.View.Detail.Report
             //}
             this.combobox_month.SelectedIndex = monthIdx;
             var years = new List<int>();
+            years.Add(DateTime.Now.Year + 1);
             for (int i = 0; i <= 10; i++)
             {
                 years.Add(DateTime.Now.Year - i);
diff --git a/BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs b/BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs
index a97d1172a..2a1e6606d 100644
--- a/BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs
+++ b/BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs
@@ -562,6 +562,19 @@ namespace BeWo.View.Detail
 
         private void UpdateServiceRecordGroup()
         {
+            int newCount = 0;
+
+            foreach (var serviceRecordDc in _Group.ServiceRecordList)
+            {
+                if (!serviceRecordDc.ServiceRecordOid.HasValue)
+                {
+                    newCount++;
+                }
+            }
+            if (newCount == _Group.ServiceRecordList.Count)
+            {
+                return;
+            }
             var dcsToKeep = new Dictionary<string, ServiceRecordDC>();
             var dcsToChange = new List<ServiceRecordDC>();
             var oldSCs = new Dictionary<long, CompactSupportConceptDC>();
diff --git a/BeWo/View/Master/ReportView.xaml.cs b/BeWo/View/Master/ReportView.xaml.cs
index 0e566d05a..2e3f2d9e8 100644
--- a/BeWo/View/Master/ReportView.xaml.cs
+++ b/BeWo/View/Master/ReportView.xaml.cs
@@ -115,16 +115,21 @@ namespace BeWo.View.Master
 
         private void Show(TabItem pTi)
         {
+            foreach (var i in this._OpenViews)
+            {
+                i.Key.Content = null;
+            }
+
             foreach (var i in this._OpenViews)
             {
                 if (i.Key == pTi)
                 {
                     pTi.Content = this._OpenViews[pTi];
                 }
-                else
-                {
-                    i.Key.Content = null;
-                }
+                //else
+                //{
+                //    i.Key.Content = null;
+                //}
             }
         }
 
diff --git a/BeWo/View/Master/SchedulerMasterView.xaml b/BeWo/View/Master/SchedulerMasterView.xaml
index 10cb65e52..ef13f001a 100644
--- a/BeWo/View/Master/SchedulerMasterView.xaml
+++ b/BeWo/View/Master/SchedulerMasterView.xaml
@@ -35,14 +35,15 @@
 						<RowDefinition Height="Auto" />
 					</Grid.RowDefinitions>
                     <Rectangle Fill="{DynamicResource ResourceContentBrush}" Height="6" />
-                    <Grid x:Name="grid_root" Grid.IsSharedSizeScope="True" Grid.Row="1" Margin="5,3,5,5" Opacity="0" >
+                    <Grid x:Name="grid_root" Grid.IsSharedSizeScope="True" Grid.Row="1" Margin="5,3,5,5" >
                     	<Grid.ColumnDefinitions>        	
 							<ColumnDefinition Width="*"/>
 						</Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
+                           
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
+                      <localSchedView:NewSchedulerView></localSchedView:NewSchedulerView>
                     </Grid>
                     <Border Grid.Row="2" Grid.ColumnSpan="3" Height="35" Margin="0,0,0,0" VerticalAlignment="Stretch" Background="#FF000000">
 						<Border.OpacityMask>
diff --git a/BeWo/View/Master/SchedulerMasterView.xaml.cs b/BeWo/View/Master/SchedulerMasterView.xaml.cs
index 72c2a4ecc..8fd737e4d 100644
--- a/BeWo/View/Master/SchedulerMasterView.xaml.cs
+++ b/BeWo/View/Master/SchedulerMasterView.xaml.cs
@@ -19,21 +19,21 @@ namespace BeWo.View.Master
 
 	    private void ShowAppointmentScheduler()
 	    {
-		    if (NewSchedulerView != null)
-		    {
-		        return;
-		    }
+		    //if (NewSchedulerView != null)
+		    //{
+		    //    return;
+		    //}
 
-		    NewSchedulerView = Resources["NewSchedulerMain"] as NewSchedulerView;
+		    //NewSchedulerView = Resources["NewSchedulerMain"] as NewSchedulerView;
 
-		    if (NewSchedulerView == null)
-		    {
-		        return;
-		    }
+		    //if (NewSchedulerView == null)
+		    //{
+		    //    return;
+		    //}
 
-		    grid_root.Children.Add(NewSchedulerView);
-		    var fadein2 = new DoubleAnimation(1, new Duration(TimeSpan.FromSeconds(1)));
-		    grid_root.BeginAnimation(OpacityProperty, fadein2);
+		    //grid_root.Children.Add(NewSchedulerView);
+		    //var fadein2 = new DoubleAnimation(1, new Duration(TimeSpan.FromSeconds(1)));
+		    //grid_root.BeginAnimation(OpacityProperty, fadein2);
 	    }
     }
 }
\ No newline at end of file
diff --git a/BeWo/View/Report/Auslastung/AuslastungReportView2.xaml.cs b/BeWo/View/Report/Auslastung/AuslastungReportView2.xaml.cs
index 2707bcbde..9d793d4ed 100644
--- a/BeWo/View/Report/Auslastung/AuslastungReportView2.xaml.cs
+++ b/BeWo/View/Report/Auslastung/AuslastungReportView2.xaml.cs
@@ -61,7 +61,11 @@ namespace BeWo.View.Report.Auslastung
 			ThemeManager.SetTheme(BeWoApp.CurrentBeWo.MainWindow, Theme.Office2010Black);
             //ThemeManager.SetTheme(docPrevControl, Theme.Office2010Black);
 
-            Unloaded += delegate { ThemeManager.SetTheme(BeWoApp.CurrentBeWo.MainWindow, null); docPrevControl.Visibility = Visibility.Collapsed; };
+            Unloaded += delegate
+            {
+                ThemeManager.SetTheme(BeWoApp.CurrentBeWo.MainWindow, null);
+                //docPrevControl.Visibility = Visibility.Collapsed;
+            };
         }
         
         private void CheckBox_Checked(object sender, RoutedEventArgs e)
diff --git a/BeWo/View/Report/Employee/EmployeeHourReportView.xaml.cs b/BeWo/View/Report/Employee/EmployeeHourReportView.xaml.cs
index d648f74a6..92750f0cc 100644
--- a/BeWo/View/Report/Employee/EmployeeHourReportView.xaml.cs
+++ b/BeWo/View/Report/Employee/EmployeeHourReportView.xaml.cs
@@ -60,7 +60,11 @@ namespace BeWo.View.Report.Employee
 			ThemeManager.SetTheme(BeWoApp.CurrentBeWo.MainWindow, Theme.Office2010Black);
             //ThemeManager.SetTheme(docPrevControl, Theme.Office2010Black);
 
-            Unloaded += delegate { ThemeManager.SetTheme(BeWoApp.CurrentBeWo.MainWindow, null); docPrevControl.Visibility = Visibility.Collapsed; };
+            Unloaded += delegate
+            {
+                ThemeManager.SetTheme(BeWoApp.CurrentBeWo.MainWindow, null);
+                //docPrevControl.Visibility = Visibility.Collapsed;
+            };
         }
 
         private void CheckBox_Checked(object sender, RoutedEventArgs e)
diff --git a/BeWo/ownChat/ChatDokumentationsView.xaml.cs b/BeWo/ownChat/ChatDokumentationsView.xaml.cs
index 81544865d..e7e431d50 100644
--- a/BeWo/ownChat/ChatDokumentationsView.xaml.cs
+++ b/BeWo/ownChat/ChatDokumentationsView.xaml.cs
@@ -264,38 +264,44 @@ namespace BeWo.ownChat
                                 {
                                     foreach (var cus in _compactCustomer)
                                     {
-                                        var dcs = new ServiceRecordDC();
-                                        dcs.Start = firstTime;
-                                        dcs.End = lastTime;
-                                        dcs.Employee = emp;
-                                        dcs.Customer = cus;
-                                        dcs.SupportConcept = HoleHilfeplanAusListe(scList, cus, firstTime, lastTime);
-                                        dcs.GroupEmployeeCount = _compactEmployee.Count;
-                                        dcs.GroupPersonCount = _compactCustomer.Count;
-
-                                        if (BeWoApp.AppSettings.IsEndDateVisible)
+                                        var sc = HoleHilfeplanAusListe(scList, cus, firstTime, lastTime);
+                                        if (sc != null)
                                         {
-                                            dcs.ServiceRecordFormat = ServiceRecordFormate.ZeiterfassungMitEndDatum;
-                                        }
-                                        else if (BeWoApp.AppSettings.IsOnlyYearMonthVisible)
-                                        {
-                                            dcs.ServiceRecordFormat = ServiceRecordFormate.ZeiterfassungMitMonatJahr;
-                                        }
-                                        else
-                                        {
-                                            dcs.ServiceRecordFormat = ServiceRecordFormate.OriginaleZeiterfassung;
-                                        }
+                                            var dcs = new ServiceRecordDC();
+                                            dcs.Start = firstTime;
+                                            dcs.End = lastTime;
+                                            dcs.Employee = emp;
+                                            dcs.Customer = cus;
+                                            dcs.SupportConcept =
+                                                HoleHilfeplanAusListe(scList, cus, firstTime, lastTime);
+                                            dcs.GroupEmployeeCount = _compactEmployee.Count;
+                                            dcs.GroupPersonCount = _compactCustomer.Count;
 
-                                        dcs.DurationInStunden = ZeiterfassungsDauer.Minuten;
+                                            if (BeWoApp.AppSettings.IsEndDateVisible)
+                                            {
+                                                dcs.ServiceRecordFormat = ServiceRecordFormate.ZeiterfassungMitEndDatum;
+                                            }
+                                            else if (BeWoApp.AppSettings.IsOnlyYearMonthVisible)
+                                            {
+                                                dcs.ServiceRecordFormat =
+                                                    ServiceRecordFormate.ZeiterfassungMitMonatJahr;
+                                            }
+                                            else
+                                            {
+                                                dcs.ServiceRecordFormat = ServiceRecordFormate.OriginaleZeiterfassung;
+                                            }
+
+                                            dcs.DurationInStunden = ZeiterfassungsDauer.Minuten;
 
 
-                                        if (dcs.SupportConcept.CostBearerList != null &&
-                                            dcs.SupportConcept.CostBearerList.Count > 0)
-                                        {
-                                            dcs.CostBearer = dcs.SupportConcept.CostBearerList[0].Organisation;
-                                        }
+                                            if (dcs.SupportConcept.CostBearerList != null &&
+                                                dcs.SupportConcept.CostBearerList.Count > 0)
+                                            {
+                                                dcs.CostBearer = dcs.SupportConcept.CostBearerList[0].Organisation;
+                                            }
 
-                                        ServiceListRecordDC.Add(dcs);
+                                            ServiceListRecordDC.Add(dcs);
+                                        }
                                     }
                                 }
 
diff --git a/BeWo/ownChat/ChatServiceCustomer.xaml.cs b/BeWo/ownChat/ChatServiceCustomer.xaml.cs
index 944627297..a25b2660f 100644
--- a/BeWo/ownChat/ChatServiceCustomer.xaml.cs
+++ b/BeWo/ownChat/ChatServiceCustomer.xaml.cs
@@ -368,7 +368,7 @@ namespace BeWo.ownChat
             var pwStaerke = BeWoUtils.CheckPasswordSecurity(TXTPasswort.Text);
             if (BeWoApp.AppSettings.IsPasswordSecurityActiv && (pwStaerke == PasswortSecurityStrength.SehrSchwach || pwStaerke == PasswortSecurityStrength.Schwach))
             {
-                string failure = "Das Passwort ist zu schwach!";
+                string failure = "Das Passwort ist zu schwach! Das Passwort sollte mindestens 8 Zeichen lang sein und Sonderzeichen, Ziffern oder Großbuchstaben enthalten.";
                 MessageBox.Show(failure, "Erstellen des Passworts fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
                 return;
             }
@@ -384,9 +384,11 @@ namespace BeWo.ownChat
                         s.SetBenutzerPasswortChatAppCode(customerOid.Value, TXTBenutzerName.Text,
                             TXTPasswort.Text));
                 EndWaiting();
+
+                BeWoUtils.OwnChatSynchronisationVeranlassen();
                 MessageBox.Show("Benutzername und Passwort wurden erfolgreich gespeichert.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
                 
-                BeWoUtils.OwnChatSynchronisationVeranlassen();
+                
                 
             }
             else
@@ -409,7 +411,13 @@ namespace BeWo.ownChat
             StartWaiting();
             
             List<string> parameter = new List<string>();
+
+#if DEBUG
+            parameter.Add("5473568546");
+#else
             parameter.Add(BeWoApp.Tenant);
+#endif
+
             parameter.Add(BeWoApp.Mandator.Apikey);
 
             parameter.Add(TXTBenutzerName.Text);
diff --git a/BeWo/ownChat/ChatView.xaml.cs b/BeWo/ownChat/ChatView.xaml.cs
index 15850ec6a..98781e9fa 100644
--- a/BeWo/ownChat/ChatView.xaml.cs
+++ b/BeWo/ownChat/ChatView.xaml.cs
@@ -182,7 +182,7 @@ namespace BeWo.ownChat
                     }
                     else
                     {
-                        MessageBox.Show("Sie haben diesen Klienten nicht in Ihrer Liste.", "Dokumentieren nicht möglich", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                        MessageBox.Show("Der/die ausgewählte Klient/in wurde nicht gefunden.", "Dokumentieren nicht möglich", MessageBoxButton.OK, MessageBoxImage.Exclamation);
                     }
                 }
                 else
@@ -192,7 +192,7 @@ namespace BeWo.ownChat
             }
             else
             {
-                MessageBox.Show("Es kann nur im Chat der Klienten dokumentiert werden.", "Dokumentieren nicht möglich", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                MessageBox.Show("Es können nur Nachrichten von KlientInnen dokumentiert werden.", "Dokumentieren nicht möglich", MessageBoxButton.OK, MessageBoxImage.Exclamation);
             }         
         }
 
diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs
index bd0947233..dc7903d51 100644
--- a/Data/Access/SearchDAO.cs
+++ b/Data/Access/SearchDAO.cs
@@ -615,6 +615,15 @@ namespace BeWo.Data.Access
             return null;
         }
 
+        public IList<Customer> FindCustomersWithPersonOids(IEnumerable<long> pPersonOid)
+        {
+            
+            return CreateCriteriaIsActive<Customer>()
+                .CreateAlias(Customer.PropertyName_Person, "p", JoinType.InnerJoin)
+                .Add(Restrictions.In("p." + BeWoEntityBase.PropertyName_Oid, pPersonOid.ToArray()))
+                .List<Customer>();
+        }
+
         public IList<Person> GetActivePersonsWithType(PersonType type)
         {
             return CreateCriteriaIsActive<Person>()
diff --git a/Report/ReportObjects/ServicesOverviewRO.cs b/Report/ReportObjects/ServicesOverviewRO.cs
index e26f79b68..5401273d0 100644
--- a/Report/ReportObjects/ServicesOverviewRO.cs
+++ b/Report/ReportObjects/ServicesOverviewRO.cs
@@ -501,7 +501,6 @@ namespace BeWo.Report.ReportObjects
                         var cb2scDC = cb2sc.MapToNewDC();
 
             
-
                         if (cb2sc.CostBearer != null)
                         {
 
diff --git a/ReportImp/ApiBerlin/Translation/TranslationDictionary.cs b/ReportImp/ApiBerlin/Translation/TranslationDictionary.cs
index 5ff0fe747..c431c2e69 100644
--- a/ReportImp/ApiBerlin/Translation/TranslationDictionary.cs
+++ b/ReportImp/ApiBerlin/Translation/TranslationDictionary.cs
@@ -46,6 +46,7 @@ namespace ApiBerlin.Translation
 
             AddOrReplaceTranslation(dict, "Weiteren Kostenträger hinzufügen", "Weitere Kostenübernahme hinzufügen");
 
+            AddOrReplaceTranslation(dict, "<Kein Hilfeplan ausgewählt>", "<Keine Bewilligung ausgewählt>");
             
 
             return dict;
diff --git a/ReportImp/BeWoRichartz/Properties/licenses.licx b/ReportImp/BeWoRichartz/Properties/licenses.licx
index e69de29bb..c7fd819d5 100644
--- a/ReportImp/BeWoRichartz/Properties/licenses.licx
+++ b/ReportImp/BeWoRichartz/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/BeWoRichartz/ServicesOverviewReport.Designer.cs b/ReportImp/BeWoRichartz/ServicesOverviewReport.Designer.cs
index 865837ec9..9c03e00a5 100644
--- a/ReportImp/BeWoRichartz/ServicesOverviewReport.Designer.cs
+++ b/ReportImp/BeWoRichartz/ServicesOverviewReport.Designer.cs
@@ -45,14 +45,13 @@ namespace BeWoRichartz
             this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
             this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
             this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblFLSPerWeek = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
@@ -82,6 +81,7 @@ namespace BeWoRichartz
             this.customerCountField = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -255,17 +255,10 @@ namespace BeWoRichartz
             this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             this.xrTableCell2.Weight = 0.20996435548972622D;
             // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
-            // 
             // formattingRuleStartDate
             // 
             this.formattingRuleStartDate.Condition = "[StartDate2]  < [StartDate]";
             this.formattingRuleStartDate.DataMember = "ServicesDouble";
-            // 
-            // 
-            // 
             this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
             this.formattingRuleStartDate.Name = "formattingRuleStartDate";
             // 
@@ -276,7 +269,7 @@ namespace BeWoRichartz
             this.xrLabel21,
             this.xrLabel20,
             this.xrLabel18,
-            this.xrLabel19,
+            this.lblFLSPerWeek,
             this.xrLabel16,
             this.xrLabel17,
             this.xrLabel15,
@@ -333,18 +326,16 @@ namespace BeWoRichartz
             this.xrLabel18.StylePriority.UseFont = false;
             this.xrLabel18.Text = "FLS wöchentl.:";
             // 
-            // xrLabel19
+            // lblFLSPerWeek
             // 
-            this.xrLabel19.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
-            this.xrLabel19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.00}")});
-            this.xrLabel19.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
-            this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(466.0001F, 164.2709F);
-            this.xrLabel19.Name = "xrLabel19";
-            this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel19.SizeF = new System.Drawing.SizeF(102.0417F, 18F);
-            this.xrLabel19.StylePriority.UseBorders = false;
-            this.xrLabel19.StylePriority.UseFont = false;
+            this.lblFLSPerWeek.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.lblFLSPerWeek.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+            this.lblFLSPerWeek.LocationFloat = new DevExpress.Utils.PointFloat(466.0001F, 164.2709F);
+            this.lblFLSPerWeek.Name = "lblFLSPerWeek";
+            this.lblFLSPerWeek.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblFLSPerWeek.SizeF = new System.Drawing.SizeF(102.0417F, 18F);
+            this.lblFLSPerWeek.StylePriority.UseBorders = false;
+            this.lblFLSPerWeek.StylePriority.UseFont = false;
             // 
             // xrLabel16
             // 
@@ -468,9 +459,6 @@ namespace BeWoRichartz
             // 
             this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]";
             this.formattingRuleServiceDesc.DataMember = "ServicesDouble";
-            // 
-            // 
-            // 
             this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
             this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc";
             // 
@@ -478,9 +466,6 @@ namespace BeWoRichartz
             // 
             this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]";
             this.formattingRuleCostBearer.DataMember = "ServicesDouble";
-            // 
-            // 
-            // 
             this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
             this.formattingRuleCostBearer.Name = "formattingRuleCostBearer";
             // 
@@ -488,9 +473,6 @@ namespace BeWoRichartz
             // 
             this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]";
             this.formattingRuleEmployeeName.DataMember = "ServicesDouble";
-            // 
-            // 
-            // 
             this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
             this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName";
             // 
@@ -552,7 +534,7 @@ namespace BeWoRichartz
             // lblFlsRateFactorTotal
             // 
             this.lblFlsRateFactorTotal.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
-            this.lblFlsRateFactorTotal.BorderWidth = 1;
+            this.lblFlsRateFactorTotal.BorderWidth = 1F;
             this.lblFlsRateFactorTotal.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
             this.lblFlsRateFactorTotal.LocationFloat = new DevExpress.Utils.PointFloat(364.9994F, 47.29169F);
             this.lblFlsRateFactorTotal.Multiline = true;
@@ -596,7 +578,7 @@ namespace BeWoRichartz
             // lblFlsGesamt
             // 
             this.lblFlsGesamt.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
-            this.lblFlsGesamt.BorderWidth = 1;
+            this.lblFlsGesamt.BorderWidth = 1F;
             this.lblFlsGesamt.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
             this.lblFlsGesamt.LocationFloat = new DevExpress.Utils.PointFloat(364.9994F, 22F);
             this.lblFlsGesamt.Name = "lblFlsGesamt";
@@ -661,6 +643,10 @@ namespace BeWoRichartz
             this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
             this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS";
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
             // Stundenzettel
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -688,7 +674,7 @@ namespace BeWoRichartz
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;
             this.SnapGridSize = 9F;
-            this.Version = "13.1";
+            this.Version = "17.1";
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -741,7 +727,7 @@ namespace BeWoRichartz
         private DevExpress.XtraReports.UI.CalculatedField fieldBillableFLS;
         private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareFLS;
         private DevExpress.XtraReports.UI.XRLabel xrLabel18;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel19;
+        private DevExpress.XtraReports.UI.XRLabel lblFLSPerWeek;
         private DevExpress.XtraReports.UI.XRLabel xrLabel16;
         private DevExpress.XtraReports.UI.XRLabel xrLabel17;
         private DevExpress.XtraReports.UI.XRLabel xrLabel15;
diff --git a/ReportImp/BeWoRichartz/ServicesOverviewReport.cs b/ReportImp/BeWoRichartz/ServicesOverviewReport.cs
index 183e32660..0d6e25676 100644
--- a/ReportImp/BeWoRichartz/ServicesOverviewReport.cs
+++ b/ReportImp/BeWoRichartz/ServicesOverviewReport.cs
@@ -41,8 +41,28 @@ namespace BeWoRichartz
                 lblFlsGesamt.Text = String.Format("{0:0.##}", pRO.TotalFLMBillable/60);
                 lblFlsRateFactorTotal.Text = String.Format("{0:0.##}", (pRO.TotalFLMBillable/60)*1.2);
             }
+
+            if (IstBewilligt(pRO))
+            {
+                lblFLSPerWeek.Text = String.Format("{0:0.00}", pRO.ApprovedFLSPerWeek);
+            }
+            else
+            {
+                lblFLSPerWeek.Text = "";
+            }
             bindingSource1.DataSource = pRO;
         }
 
+        private bool IstBewilligt(ServicesOverviewRO pRo)
+        {
+            if (pRo.CostBearer2SupportConceptList.Count > 0)
+            {
+                if (pRo.CostBearer2SupportConceptList[0].ApprovedStartDate.HasValue)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index 53bc99dfd..8355b96a7 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -102,7 +102,7 @@ namespace BeWo.Service.Plugins
                 //t = "4690407894"; // Bleib im Leben
                 //t = "2576513996"; // TRIAS
                 //t = "2509786400"; // LH Stade
-                //t = "8677523325"; // BeWo Richartz
+                t = "8677523325"; // BeWo Richartz
                 //t = "1765854593"; // Mein Betreutes Wohnen
                 //t = "6802909544"; // Lebenshilfe Coburg
                 //t = "9417634361"; // Synprax
@@ -163,7 +163,7 @@ namespace BeWo.Service.Plugins
                 //t = "7803602698"; // Taubblindendienst
                 //t = "5518600303"; //Wetterleuchten e.V.
                 //t = "4096649015"; // AWO Dortmund
-			    t = "3614251071"; // Pusteblume
+			    //t = "3614251071"; // Pusteblume
                 return t;
 #else
 				if (MultitenancyOperationContextExt.Current != null)
diff --git a/Service/ServiceContracts/ICustomerService.cs b/Service/ServiceContracts/ICustomerService.cs
index 5b72c8aba..b7689a47b 100644
--- a/Service/ServiceContracts/ICustomerService.cs
+++ b/Service/ServiceContracts/ICustomerService.cs
@@ -445,7 +445,11 @@ namespace BeWo.Service.ServiceContracts
 		[OperationContract]
 	    List<CompactCustomerDC> GetCompactCustomersById(IEnumerable<long> pCustomerOids);
 
-		[FaultContract(typeof(BeWoFault))]
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        List<CompactCustomerDC> GetCompactCustomersByPersonOids(IEnumerable<long> personOids);
+
+        [FaultContract(typeof(BeWoFault))]
 		[OperationContract]
 		List<ValueListEntryDC> GetSupportConceptGoalParents(IEnumerable<long> pParentItemOids);
 
diff --git a/Service/ServiceImplementations/CustomerServiceImp.cs b/Service/ServiceImplementations/CustomerServiceImp.cs
index 9c660125e..1bee0d26a 100644
--- a/Service/ServiceImplementations/CustomerServiceImp.cs
+++ b/Service/ServiceImplementations/CustomerServiceImp.cs
@@ -2297,7 +2297,24 @@ namespace BeWo.Service.ServiceImplementations
 			}
 		}
 
-		public List<ValueListEntryDC> GetSupportConceptGoalParents(IEnumerable<long> pParentItemOids)
+	    public List<CompactCustomerDC> GetCompactCustomersByPersonOids(IEnumerable<long> personOids)
+	    {
+	        try
+	        {
+	            var result = new List<CompactCustomerDC>();
+
+	            var customers = DAOFactory.SearchDAO.FindCustomersWithPersonOids(personOids);
+	            result.AddRange(MapperFactory.CompactCustomerDC_Customer.MapToNewDCs(customers));
+
+	            return result;
+	        }
+	        catch (Exception e)
+	        {
+	            throw Utils.CreateBeWoFaultException(e);
+	        }
+	    }
+
+        public List<ValueListEntryDC> GetSupportConceptGoalParents(IEnumerable<long> pParentItemOids)
 		{
 			try
 			{
diff --git a/Shared/DataContracts/ClientPartials/FlatSupportConceptTreeNodeDC.cs b/Shared/DataContracts/ClientPartials/FlatSupportConceptTreeNodeDC.cs
index 1b5070582..78a2e8e26 100644
--- a/Shared/DataContracts/ClientPartials/FlatSupportConceptTreeNodeDC.cs
+++ b/Shared/DataContracts/ClientPartials/FlatSupportConceptTreeNodeDC.cs
@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel;
 using System.Windows.Media;
+using BS.Shared.Translation;
 
 namespace BS.Shared.DataContracts
 {
@@ -40,7 +41,7 @@ namespace BS.Shared.DataContracts
             {
                 if (this.SupportConceptTreeNodeDC == null)
                 {
-                    return "<Kein Hilfeplan ausgewählt>";
+                    return Translator.Translate("<Kein Hilfeplan ausgewählt>");
                 }
 
                 if (this.SupportConceptTreeNodeDC.Customer != null)
diff --git a/Shared/Translation/Translator.cs b/Shared/Translation/Translator.cs
index c9fb1d70e..1b463252d 100644
--- a/Shared/Translation/Translator.cs
+++ b/Shared/Translation/Translator.cs
@@ -48,7 +48,7 @@ namespace BS.Shared.Translation
             //}
 
             ////return input;
-           //return "TRANSLATED";
+          // return "TRANSLATED";
 
             if (instance != null)
             {