From 6c92c8eaccbe703e4b58abfd882eccee285e6e75 Mon Sep 17 00:00:00 2001
From: Christian <christian.baeurle@beyondsoft.de>
Date: Thu, 29 Aug 2019 15:43:23 +0200
Subject: [PATCH] cb

---
 BeWo/MainControl.xaml                         |   2 +-
 BeWo/MainControl.xaml.cs                      |   2 +-
 BeWo/ServiceProxy/ServiceFacade.cs            |  17 +-
 BeWo/View/Detail/BudgetView.xaml              |   2 +-
 .../Detail/Report/FlexibleReportView.xaml.cs  |   7 +-
 BeWo/View/HomeView.xaml.cs                    | 242 ++++++++++++------
 Host/Multitenancy/demo.config                 |   2 +-
 ...ViewPanel ReportName zu Value geändert.txt |   2 +-
 Report/DefaultReportCreator.cs                |   6 +
 Report/ReportObjects/FLSReportRO.cs           |   4 +-
 Service/Plugins/PluginLoader.cs               |   8 +-
 .../Plugins/StundenuebersichtAuswertung.cs    |   3 +-
 .../AnalysisServiceImp.cs                     |   3 +-
 Shared/BeWoEntityEnums.cs                     |  16 +-
 .../ServiceRecordFLSOverviewDC.cs             |   5 +-
 15 files changed, 219 insertions(+), 102 deletions(-)

diff --git a/BeWo/MainControl.xaml b/BeWo/MainControl.xaml
index 6f343c337..384a0998d 100644
--- a/BeWo/MainControl.xaml
+++ b/BeWo/MainControl.xaml
@@ -231,7 +231,7 @@
                                 </Button.RenderTransform>
                             </localView:ImageButton>
                           <localView:ImageButton r:DemandUserRight.VisibleDemands="VertretungenView_View"
-                                    ImageSource="Ressources\Icons\CoinsDisabled.png" x:Name="button_SchulbegleitenderDienst"
+                                    ImageSource="Ressources\Icons\CalendarDisabled.png" x:Name="button_SchulbegleitenderDienst"
                                     Click="Button_Vertretungen_OnClick" Style="{StaticResource NavBarButton}"
                                     Content="{t:Translate VertretungenMenuItem}" Background="{StaticResource SchulbegleitenderDienstContentBrush}"
                                     RenderTransformOrigin="0.5,0.5"
diff --git a/BeWo/MainControl.xaml.cs b/BeWo/MainControl.xaml.cs
index d0ebda8a7..c0c504b11 100644
--- a/BeWo/MainControl.xaml.cs
+++ b/BeWo/MainControl.xaml.cs
@@ -770,7 +770,7 @@ namespace BeWo
 			}
 			else
 			{
-				_HomeView.ReorderPanels();
+				//_HomeView.ReorderPanels();
 			}
 
 			NavigateTo(_HomeView);
diff --git a/BeWo/ServiceProxy/ServiceFacade.cs b/BeWo/ServiceProxy/ServiceFacade.cs
index 34e19ed52..1364abe31 100644
--- a/BeWo/ServiceProxy/ServiceFacade.cs
+++ b/BeWo/ServiceProxy/ServiceFacade.cs
@@ -91,8 +91,14 @@ namespace BeWo.ServiceProxy
 			DoAsync<AnalysisServiceClient, IAnalysisService, T>(pFunc, pCallBack, true);
 			
 		}
-		
-		public static void DoAccountingServiceSync(Action<IAccountingService> pAction)
+
+	    public static void DoAnalysisServiceAsync<T>(Func<IAnalysisService, T> pFunc, Action<T> pCallBack, bool showWaitDialog)
+	    {
+	        DoAsync<AnalysisServiceClient, IAnalysisService, T>(pFunc, pCallBack, showWaitDialog);
+
+	    }
+
+        public static void DoAccountingServiceSync(Action<IAccountingService> pAction)
         {
             pAction.Invoke(GetInstance<AccountingServiceClient, IAccountingService>());
         }
@@ -483,7 +489,12 @@ namespace BeWo.ServiceProxy
 			DoAsync<ReportServiceClient, IReportService, T>(pFunc, pCallBack, true);
 		}
 
-		public static void DoReportServiceSync(Action<IReportService> pAction)
+	    public static void DoReportServiceAsync<T>(Func<IReportService, T> pFunc, Action<T> pCallBack, bool showWaitDialog)
+	    {
+	        DoAsync<ReportServiceClient, IReportService, T>(pFunc, pCallBack, showWaitDialog);
+	    }
+
+        public static void DoReportServiceSync(Action<IReportService> pAction)
 		{
 			try
 			{
diff --git a/BeWo/View/Detail/BudgetView.xaml b/BeWo/View/Detail/BudgetView.xaml
index 9c13d1568..488e8835f 100644
--- a/BeWo/View/Detail/BudgetView.xaml
+++ b/BeWo/View/Detail/BudgetView.xaml
@@ -24,7 +24,7 @@
       </Grid.RowDefinitions>
       <Label>Bezeichnung</Label>
       <TextBox Grid.Column="1" Margin="3" Height="23" Text="{val:ValidationBinding Path=NewVM.Name, UpdateSourceTrigger=PropertyChanged}" />
-      <Label Grid.Column="2">Betragshöhe</Label>
+      <Label Grid.Column="2">Budget</Label>
       <dxe:TextEdit Grid.Column="3" MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Height="23" Margin="3" EditValue="{val:ValidationBinding Path=NewVM.Betragshoehe, UpdateSourceTrigger=PropertyChanged}" />
       <Button Name="button_addBudget" Click="Button_addBudget_Click" Grid.Column="4" Height="25" Margin="3,3,3,3" Padding="5 0" IsDefault="True" Content="Hinzufügen" />
 
diff --git a/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs b/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
index 6e4d18ced..16f141b47 100644
--- a/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
+++ b/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
@@ -478,7 +478,7 @@ namespace BeWo.View.Detail.Report
             }
             else
             {
-                MessageBox.Show("Hier befindet sich keine Zeiterfassung!", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Stop);
+                MessageBox.Show("Keine Einträge vorhanden.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Information);
             }
         }
         #endregion
@@ -513,7 +513,7 @@ namespace BeWo.View.Detail.Report
         #region Methoden
         private void InitChart()
         {
-            ChartControl.Diagram = ChartFactory.GenerateDiagram(typeof(AreaSeries2D), false);
+            ChartControl.Diagram = ChartFactory.GenerateDiagram(typeof(BarSideBySideSeries2D), false);
         }
 
         private IEnumerable<DataBarFormatCondition> CreateDataBarConditions(List<string> columns, List<string> rows, List<string> datas, string formatName)
@@ -831,9 +831,12 @@ namespace BeWo.View.Detail.Report
                 seriesTypes.Add(typeof(AreaStackedSeries3D), new SeriesTypeDescriptor { DiagramType = XYDiagram3DType, DisplayText = "Area Stacked Series 3D" });
                 seriesTypes.Add(typeof(AreaFullStackedSeries3D), new SeriesTypeDescriptor { DiagramType = XYDiagram3DType, DisplayText = "Area Full-Stacked Series 3D" });
                 seriesTypes.Add(typeof(BarSeries3D), new SeriesTypeDescriptor { DiagramType = XYDiagram3DType, DisplayText = "Bar Series 3D" });
+                seriesTypes.Add(typeof(BarSideBySideSeries2D), new SeriesTypeDescriptor { DiagramType = XYDiagram2DType, DisplayText = "Bar Series 2D" });
                 seriesTypes.Add(typeof(PointSeries3D), new SeriesTypeDescriptor { DiagramType = XYDiagram3DType, DisplayText = "Point Series 3D" });
                 seriesTypes.Add(typeof(PieSeries3D), new SeriesTypeDescriptor { DiagramType = SimpleDiagram3DType, DisplayText = "Pie Series 3D" });
                 seriesTypes.Add(typeof(PieSeries2D), new SeriesTypeDescriptor { DiagramType = SimpleDiagram2DType, DisplayText = "Pie Series 2D" });
+                
+
                 return seriesTypes;
             }
 
diff --git a/BeWo/View/HomeView.xaml.cs b/BeWo/View/HomeView.xaml.cs
index 68a3df1f3..6270ef106 100644
--- a/BeWo/View/HomeView.xaml.cs
+++ b/BeWo/View/HomeView.xaml.cs
@@ -152,7 +152,10 @@ namespace BeWo.View
 
             PruefePasswortStaerke();
 
-            ServiceFacade.DoOperationsServiceAsync(s => s.GetHomeViewPanels(), r => Dispatcher?.Invoke(() => UpdatePanels(r)));
+            //ServiceFacade.DoOperationsServiceAsync(s => s.GetHomeViewPanels(), r => Dispatcher?.Invoke(() => UpdatePanels(r)));
+
+            var panels = ServiceFacade.DoOperationsServiceSync(s => s.GetHomeViewPanels());
+            UpdatePanels(panels);
         }
 
         #endregion
@@ -175,7 +178,7 @@ namespace BeWo.View
 
         private void HomeDragPanelViewLoaded(object o, RoutedEventArgs e)
         {
-            
+            SetMaximizedPanel();
             //Warum klappt das bei Köln Ring nicht?=
             if (BeWoApp.LoggedOnUser == null || BeWoApp.LoggedOnUser.ResetPasswordInfos == null)
             {
@@ -744,12 +747,11 @@ namespace BeWo.View
             //ListboxInternalNews.Items.Clear();
             InternalNewsGrid.Children.Clear();
 
-            ReorderPanels();
 
-            InitContent();
+            LoadContent();
         }
 
-        private void InitBewoNews()
+        private void LoadBewoNews()
         {
             try
             {
@@ -766,57 +768,92 @@ namespace BeWo.View
             }
         }
 
-        private void InitBirthdays()
+        private void LoadBirthdays()
         {
             var endOfWeek = DateTime.Now.GetNext(DayOfWeek.Sunday).Date;
             endOfWeek = endOfWeek.AddDays(1).GetNext(DayOfWeek.Sunday).Date;
-            ServiceFacade.DoAnalysisServiceAsync(s1 => s1.GetPersonsHavingBirthday(endOfWeek), ReloadBirthdays);
+            ServiceFacade.DoAnalysisServiceAsync(s1 => s1.GetPersonsHavingBirthday(endOfWeek), ReloadBirthdays, false);
         }
 
-        private void InitContent()
+        private void LoadContent()
         {
-            InitLoginInfo();
+            LoadLoginInfo();
 
+            if (IsPanelVisible("PanelTasks"))
+            {
+                LoadTasks();
+            }
 
+            if (IsPanelVisible("PanelExpiringSupportConcepts"))
+            {
+                LoadExpiredSupportConcepts();
+            }
+
+            if (IsPanelVisible("PanelConferenceDates"))
+            {
+                LoadNextConferenceDates();
+            }
+            
+            if (IsPanelVisible("PanelBirthdates"))
+            {
+                LoadBirthdays();
+            }
+
+            if (IsPanelVisible("PanelInternalNews"))
+            {
+                UpdateInternalNews();
+            }
+
+            if (IsPanelVisible("PanelBeWoNews"))
+            {
+                LoadBewoNews();
+            }
 
-            InitExpiredSupportConcepts();
-            InitNextConferenceDates();
-            InitBewoNews();
-            InitBirthdays();
-            UpdateInternalNews();
-            InitTasks();
 
             rb_open.IsChecked = true;
         }
 
-        private void InitExpiredSupportConcepts()
+        private bool IsPanelVisible(string test)
+        {
+            foreach (DragDockPanel panel in PanelHost.Children)
+            {
+                if (panel.Name == test)
+                {
+                    return true;
+                }
+            }
+
+            return true;
+        }
+
+        private void LoadExpiredSupportConcepts()
         {
             // DateTime endOfWeek = DateTime.Now.GetNext(DayOfWeek.Sunday).Date;
             // DateTime endOfWeek2 = endOfWeek.AddDays(8);
             var dt = DateTime.Now.AddMonths(BeWoApp.AppSettings.HilfeplanAuslaufAuswahl);
             ServiceFacade.DoAnalysisServiceAsync(
                 s1 => s1.GetExpiringSupportConcepts(BeWoApp.LoggedOnUser.Employee.EmployeeOid, dt),
-                ReloadExpiringSupportConcepts);
+                ReloadExpiringSupportConcepts, false);
         }
 
-        private void InitLoginInfo()
+        private void LoadLoginInfo()
         {
             DateTime endOfWeek = DateTime.Now.GetNext(DayOfWeek.Sunday).Date;
 
-            ServiceFacade.DoAnalysisServiceAsync(s1 => s1.GetLastLogins(BeWoApp.LoggedOnUser.LoginName), ReloadLogins);
+            ServiceFacade.DoAnalysisServiceAsync(s1 => s1.GetLastLogins(BeWoApp.LoggedOnUser.LoginName), ReloadLogins, false);
         }
 
-        private void InitNextConferenceDates()
+        private void LoadNextConferenceDates()
         {
             DateTime endOfWeek = DateTime.Now.GetNext(DayOfWeek.Sunday).Date;
             DateTime endOfWeek2 = endOfWeek.AddDays(8);
 
             ServiceFacade.DoAnalysisServiceAsync(
                 s1 => s1.GetSupportConceptsWithConferenceDate(BeWoApp.LoggedOnUser.Employee.EmployeeOid, endOfWeek2),
-                ReloadConferenceDates);
+                ReloadConferenceDates, false);
         }
 
-        private void InitTasks()
+        private void LoadTasks()
         {
             var test = 0;
 
@@ -861,7 +898,7 @@ namespace BeWo.View
                             EmployeesForAppointmentView = cb.OrderBy(o => o.LastName + ", " + o.FirstName).ToList();
                             employeeFilterBox.SelectedItem = BeWoApp.CompactLoggedOnEmployee;
                         });
-                    });
+                    }, false);
                 }
                 else
                 {
@@ -922,16 +959,16 @@ namespace BeWo.View
             //ServiceFacade.DoEmployeeServiceAsync(s => s.GetPublishedNewsItems(), cb => this.Dispatch(delegate { listboxInternalNews.ItemsSource = cb.OrderByDescending(i => i.PublishDate).ToList(); }));
             ServiceFacade.DoEmployeeServiceAsync(
                 s => s.GetPublishedNewsItemsForEmployee(BeWoApp.LoggedOnUser.Employee.EmployeeOid, showTeamNews),
-                RefreshInternalNews);
+                RefreshInternalNews, false);
         }
 
         private void UpdatePanels(List<HomeViewPanelDC> panels)
         {
-            if (panels == null || panels.Count == 0) return;
+            if (panels != null && panels.Count > 0)
+            {
+                PanelHost.Children.Clear();
 
-            PanelHost.Children.Clear();
-
-            var dict = new Dictionary<HomeViewPanelType, DragDockPanel>()
+                var dict = new Dictionary<HomeViewPanelType, DragDockPanel>()
                 {
                     {HomeViewPanelType.BeWoNewsPanel, PanelBeWoNews},
                     {HomeViewPanelType.BirthdatesPanel, PanelBirthdates},
@@ -942,43 +979,85 @@ namespace BeWo.View
                 };
 
 
-            //panels.Add(new HomeViewPanelDC { HeaderTitel = "TestTask", PanelType = HomeViewPanelType.TasksPanel });
-            //panels.Add(new HomeViewPanelDC { HeaderTitel = "TestNews", PanelType = HomeViewPanelType.BeWoNewsPanel });
-            //panels.Add(new HomeViewPanelDC { HeaderTitel = "TestDates", PanelType = HomeViewPanelType.ExpiringSupportConceptsPanel });
-            //panels.Add(new HomeViewPanelDC { HeaderTitel = "Test", PanelType = HomeViewPanelType.TasksPanel });
+                //panels.Add(new HomeViewPanelDC { HeaderTitel = "TestTask", PanelType = HomeViewPanelType.TasksPanel });
+                //panels.Add(new HomeViewPanelDC { HeaderTitel = "TestNews", PanelType = HomeViewPanelType.BeWoNewsPanel });
+                //panels.Add(new HomeViewPanelDC { HeaderTitel = "TestDates", PanelType = HomeViewPanelType.ExpiringSupportConceptsPanel });
+                //panels.Add(new HomeViewPanelDC { HeaderTitel = "Test", PanelType = HomeViewPanelType.TasksPanel });
 
-            foreach (var panelDC in panels)
-            {
-                if (dict.ContainsKey(panelDC.PanelType))
+                var save = BeWoApp.AppSettings.StartupPanelOrder;
+                if (save == null || save.Count != panels.Count)
                 {
-                    var panel = dict[panelDC.PanelType];
-                    PanelHost.Children.Add(panel);
-                    if (panelDC.HeaderTitel == null) continue;
+                    save = panels.Select(p => GetDefaultPanelName(p)).ToList();
+                }
 
-                    foreach (var child in ((StackPanel)panel.Header).Children)
+                foreach (var name in save)
+                {
+                    foreach (var panelDC in panels)
                     {
-                        if (child is TextBlock textBlock && (string)textBlock.Tag == "Titel")
+                        if (GetDefaultPanelName(panelDC) == name)
                         {
-                            textBlock.Text = panelDC.HeaderTitel;
+                            if (dict.ContainsKey(panelDC.PanelType))
+                            {
+                                var panel = dict[panelDC.PanelType];
+                                PanelHost.Children.Add(panel);
+                                if (String.IsNullOrEmpty(panelDC.HeaderTitel)) continue;
+
+                                foreach (var child in ((StackPanel) panel.Header).Children)
+                                {
+                                    if (child is TextBlock textBlock && (string) textBlock.Tag == "Titel")
+                                    {
+                                        textBlock.Text = panelDC.HeaderTitel;
+                                    }
+                                }
+                            }
+                            else if (panelDC.PanelType == HomeViewPanelType.CustomReportPanel)
+                            {
+                                PanelHost.Children.Add(CreateReportPanel(panelDC.HeaderTitel, panelDC.Value));
+                            }
+                            else if (panelDC.PanelType == HomeViewPanelType.CustomXamlPanel)
+                            {
+                                PanelHost.Children.Add(CreateXamlPanel(panelDC.HeaderTitel, panelDC.Value));
+                            }
+                            else
+                            {
+                                throw new ArgumentOutOfRangeException();
+                            }
                         }
                     }
                 }
-                else if (panelDC.PanelType == HomeViewPanelType.CustomReportPanel)
-                {
-                    PanelHost.Children.Add(CreateReportPanel(panelDC.HeaderTitel, panelDC.Value));
-                }
-                else if (panelDC.PanelType == HomeViewPanelType.CustomXamlPanel)
-                {
-                    PanelHost.Children.Add(null);
-                }
-                else
-                {
-                    throw new ArgumentOutOfRangeException();
-                }
+                
+                SetMaximizedPanel();
+            }
+            else
+            {
+
+                ReorderPanels();
             }
             InitPanels(null);
         }
-        
+
+        private string GetDefaultPanelName(HomeViewPanelDC p)
+        {
+            
+            switch (p.PanelType)
+            {
+                case HomeViewPanelType.TasksPanel:
+                    return "PanelTasks";
+                case HomeViewPanelType.ExpiringSupportConceptsPanel:
+                    return "PanelExpiringSupportConcepts";
+                case HomeViewPanelType.ConferenceDatesPanel:
+                    return "PanelConferenceDates";
+                case HomeViewPanelType.BirthdatesPanel:
+                    return "PanelBirthdates";
+                case HomeViewPanelType.InternalNewsPanel:
+                    return "PanelInternalNews";
+                case HomeViewPanelType.BeWoNewsPanel:
+                    return "PanelBeWoNews";
+            }
+
+            return p.HeaderTitel;
+        }
+
         private DragDockPanel CreateReportPanel(string title, string reportName)
         {
             var panel = new DragDockPanel()
@@ -1009,7 +1088,12 @@ namespace BeWo.View
                     }
                 }
             };
-
+            var ctrl = new DocumentPreviewControl
+            {
+                CommandBarStyle = CommandBarStyle.None,
+                Margin = new Thickness(-3, -4, -3, -3)
+            };
+            panel.Content = ctrl;
             panel.Loaded += (s, e) => LoadReport(reportName, title, panel);
 
             return panel;
@@ -1044,7 +1128,7 @@ namespace BeWo.View
                         }
                     }
                 },
-                Content = XamlReader.Load(XmlReader.Create(xamlString))
+                Content = XamlReader.Parse(xamlString)
             };
 
             return panel;
@@ -1052,7 +1136,7 @@ namespace BeWo.View
 
         private void LoadReport(string reportName, string title, DragDockPanel panel)
         {
-            ServiceFacade.DoReportServiceAsync(s => s.CreateCustomReport(BeWoApp.LoggedOnEmployee.EmployeeOid.Value, reportName),  ms => SetReportControl(ms, title, panel));
+            ServiceFacade.DoReportServiceAsync(s => s.CreateCustomReport(BeWoApp.LoggedOnEmployee.EmployeeOid.Value, reportName),  ms => SetReportControl(ms, title, panel), false);
         }
 
         private void SetReportControl(MemoryStream ms, string title, DragDockPanel panel)
@@ -1060,16 +1144,21 @@ namespace BeWo.View
             this.Dispatch(
                 delegate
                 {
-                    var grid = new Grid();
-                    grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
-                    grid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
-                    var ctrl = new DocumentPreviewControl
+                    //var grid = new Grid();
+                    //grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+                    //grid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
+                    //var ctrl = new DocumentPreviewControl
+                    //{
+                    //    CommandBarStyle = CommandBarStyle.None
+                    //};
+                    //grid.Margin = new Thickness(-3, -4, -3, -3);
+                    //grid.Children.Add(ctrl);
+                    //panel.Content = grid;
+
+                    if (panel.Content is DocumentPreviewControl)
                     {
-                        CommandBarStyle = CommandBarStyle.None
-                    };
-                    grid.Children.Add(ctrl);
-                    panel.Content = grid;
-                    BeWoUtils.ShowReportWindow(ms, title, ctrl);
+                        BeWoUtils.ShowReportWindow(ms, title, panel.Content as DocumentPreviewControl);
+                    }
                 });
             
         }
@@ -1504,7 +1593,7 @@ namespace BeWo.View
                                                                                      i.Type != (int)AppointmentType.DeletedOccurrence).OrderBy(o => o.StartDate ?? DateTime.MinValue).ToList();
                         }
                     });
-                });
+                }, false);
             }
             else
             {
@@ -1629,7 +1718,7 @@ namespace BeWo.View
 
             save.DoForEach(x => PanelHost.AddPanel(panels[x]));
 
-            SetMaximizedPanel();
+            
         }
 
         private void SetMaximizedPanel()
@@ -1641,15 +1730,16 @@ namespace BeWo.View
                     var p = item as DragDockPanel;
                     if (BeWoApp.AppSettings.StartupPanelMaximized.Equals(p.Name))
                     {
-                        IEnumerable<DependencyObject> objekts = p.GetAllChildren();
+                        //IEnumerable<DependencyObject> objekts = p.GetAllChildren();
 
-                        foreach (DependencyObject child in objekts)
-                        {
-                            if (child is ToggleButton btn)
-                            {
-                                btn.IsChecked = true;
-                            }
-                        }
+                        //foreach (DependencyObject child in objekts)
+                        //{
+                        //    if (child is ToggleButton btn)
+                        //    {
+                        //        btn.IsChecked = true;
+                        //    }
+                        //}
+                        p.PanelMaximized = true;
                     }
                 }
             }
diff --git a/Host/Multitenancy/demo.config b/Host/Multitenancy/demo.config
index ffdd8e32c..8a227fe92 100644
--- a/Host/Multitenancy/demo.config
+++ b/Host/Multitenancy/demo.config
@@ -16,7 +16,7 @@
             </property>
 
           <property name="connection.connection_string">
-            Server=localhost;Password=root;User ID=root; Initial Catalog=alpha
+            Server=localhost;Password=root;User ID=root; Initial Catalog=kette
           </property>
 
           <property name="dialect">
diff --git a/Model/Changes_2019_08_14 HomeViewPanel ReportName zu Value geändert.txt b/Model/Changes_2019_08_14 HomeViewPanel ReportName zu Value geändert.txt
index 69761422d..57e4462f4 100644
--- a/Model/Changes_2019_08_14 HomeViewPanel ReportName zu Value geändert.txt	
+++ b/Model/Changes_2019_08_14 HomeViewPanel ReportName zu Value geändert.txt	
@@ -1,2 +1,2 @@
-ALTER TABLE `bewodemo`.`homeviewpanel` 
+ALTER TABLE `homeviewpanel` 
 CHANGE COLUMN `ReportName` `Value` VARCHAR(1024) NULL DEFAULT NULL ;
diff --git a/Report/DefaultReportCreator.cs b/Report/DefaultReportCreator.cs
index 0ea332ad8..247fe0903 100644
--- a/Report/DefaultReportCreator.cs
+++ b/Report/DefaultReportCreator.cs
@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Security;
+using System.Threading;
 using System.Web;
 using BeWo.Report.DefaultReports;
 using BS.Shared;
@@ -608,6 +609,11 @@ namespace BeWo.Report
 
         public override XtraReport CreateCustomReport(long employeeOid, String reportName)
         {
+            if (String.IsNullOrEmpty(reportName))
+            {
+                return new XtraReport();
+            }
+
             var report = FindReportImp<QueryRO>(null, reportName);
             if (report == null)
             {
diff --git a/Report/ReportObjects/FLSReportRO.cs b/Report/ReportObjects/FLSReportRO.cs
index 9c3d83e75..c7574cb03 100644
--- a/Report/ReportObjects/FLSReportRO.cs
+++ b/Report/ReportObjects/FLSReportRO.cs
@@ -221,8 +221,8 @@ namespace BeWo.Report.ReportObjects
                         }
 
                         
-                        // reportSR.InsertedOn = sr.InsertedOn;
-                        // reportSR.InsUser = sr.InsUser;
+                        reportSR.InsertedOn = sr.InsertedOn;
+                        reportSR.InsUser = sr.InsUser;
 	                    reportSR.ServiceRecordOid = sr.ServiceRecordOid;
 	                    reportSR.DistanceInMeter = sr.DistanceInMeter;
                         reportSR.Notice = sr.Notice;
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index 4416f4df1..1362c3095 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -97,7 +97,7 @@ namespace BeWo.Service.Plugins
                 //t = "3830114427"; // FiZ Familie im Zentrum Hof
                 //t = "7138297573"; // Tagwerk betreutes wohnen
                 //t = "1008896531"; // BeWo Auxilio
-                //t = "9383760246"; // Die Kette
+                t = "9383760246"; // Die Kette
                 //t = "5915565037"; // LH Remscheid
                 //t = "3350425974"; // BeWo Rückenwind
                 //t = "9447917179"; // LH Rodenkirchen
@@ -171,7 +171,7 @@ namespace BeWo.Service.Plugins
                 //t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V.
                 //t = "2632162696"; // Pro BeWo Düren
                 //t = "6340891020"; // Caritas Ahlen
-                t = "3659854106"; // alpha e.V.
+                //t = "3659854106"; // alpha e.V.
                 //t = "5809130435"; // Lebenshilfe Kusel
                 //t = "3367947706"; // PaS Mönchengladbach
                 //t = "2331203795"; // BeWo für dich
@@ -211,10 +211,12 @@ namespace BeWo.Service.Plugins
 			    //t = "4290816992"; // BeWo Imflow
 			    //t = "7584236951"; // Aachener Betreuungsbüro Kirschbaum und Manz GbR
 			    //t = "3678599942"; // VKM Rietberg
+			    //t = "4069072369"; // BeWo Dreilich&Pastor (Pastor)
+                //t = "4160851689"; // BeWo Dreilich&Pastor (Dreilich)
 
                 return t;
 #else
-				if (MultitenancyOperationContextExt.Current != null)
+                if (MultitenancyOperationContextExt.Current != null)
 					return MultitenancyOperationContextExt.Current.Tenant;
 
 				return SessionFacade.Tenant;
diff --git a/Service/Plugins/StundenuebersichtAuswertung.cs b/Service/Plugins/StundenuebersichtAuswertung.cs
index f485fa91d..d3329d0ab 100644
--- a/Service/Plugins/StundenuebersichtAuswertung.cs
+++ b/Service/Plugins/StundenuebersichtAuswertung.cs
@@ -675,7 +675,8 @@ namespace BeWo.Service.Plugins
             srDC.Notice3 = sr.Notice3;
             srDC.Notice4 = sr.Notice4;
             srDC.Notice5 = sr.Notice5;
-
+            srDC.InsertedOn = sr.InsTs;
+            srDC.InsUser = sr.InsUser;
             if (useRoundedDuration)
             {
                 srDC.RoundedDuration = sr.RoundedDuration;
diff --git a/Service/ServiceImplementations/AnalysisServiceImp.cs b/Service/ServiceImplementations/AnalysisServiceImp.cs
index 09d9e9fef..6cb555152 100644
--- a/Service/ServiceImplementations/AnalysisServiceImp.cs
+++ b/Service/ServiceImplementations/AnalysisServiceImp.cs
@@ -687,7 +687,8 @@ namespace BeWo.Service.ServiceImplementations
             srDC.Notice3 = sr.Notice3;
             srDC.Notice4 = sr.Notice4;
             srDC.Notice5 = sr.Notice5;
-
+            srDC.InsertedOn = sr.InsTs;
+            srDC.InsUser = sr.InsUser;
             if (useRoundedDuration)
 	        {
 		        srDC.RoundedDuration = sr.RoundedDuration;
diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs
index 568faa909..4108b7181 100644
--- a/Shared/BeWoEntityEnums.cs
+++ b/Shared/BeWoEntityEnums.cs
@@ -1020,13 +1020,13 @@ namespace BS.Shared
 
     public enum HomeViewPanelType
     {
-        TasksPanel,
-        ExpiringSupportConceptsPanel,
-        ConferenceDatesPanel,
-        BirthdatesPanel,
-        InternalNewsPanel,
-        BeWoNewsPanel,
-        CustomReportPanel,
-        CustomXamlPanel
+        TasksPanel = 0, // PanelTasks
+        ExpiringSupportConceptsPanel = 1, // PanelExpiringSupportConcepts
+        ConferenceDatesPanel = 2, // PanelConferenceDates
+        BirthdatesPanel = 3, // PanelBirthdates
+        InternalNewsPanel = 4, // PanelInternalNews
+        BeWoNewsPanel = 5, // PanelBeWoNews
+        CustomReportPanel = 6,
+        CustomXamlPanel = 7
     }
 }
\ No newline at end of file
diff --git a/Shared/DataContracts/ServiceRecordFLSOverviewDC.cs b/Shared/DataContracts/ServiceRecordFLSOverviewDC.cs
index d27e67dfa..642f21474 100644
--- a/Shared/DataContracts/ServiceRecordFLSOverviewDC.cs
+++ b/Shared/DataContracts/ServiceRecordFLSOverviewDC.cs
@@ -64,6 +64,9 @@ namespace BS.Shared.DataContracts
 		public int? DistanceInMeter { get; set; }
 
 		[DataMember]
-		public int? Relevance { get; set; }
+        public string InsUser { get; set; }
+
+        [DataMember]
+        public DateTime? InsertedOn { get; set; }
     }
 }
\ No newline at end of file