From 4bd9dffd0baf91a4b2c3bf4b59c442b0406d2594 Mon Sep 17 00:00:00 2001
From: Lyndon Jetten <lyndon.jetten@ownsoft.de>
Date: Mon, 6 Mar 2023 15:56:50 +0100
Subject: [PATCH] =?UTF-8?q?FaC:=20Klienten=20meiner=20Teams=20werden=20im?=
 =?UTF-8?q?=20Kalender=20angezeigt,=20auch=20wenn=20man=20sonst=20keine=20?=
 =?UTF-8?q?sehen=20darf.=20Nach=20der=20=C3=84nderung=20von=20Benutzergrup?=
 =?UTF-8?q?pen=20in=20denen=20der=20angemeldete=20Mitarbeiter=20ist,=20wir?=
 =?UTF-8?q?d=20der=20Cache=20geleert,=20um=20den=20=C3=84nderungen=20entsp?=
 =?UTF-8?q?rechende=20Objekte=20aus=20der=20Datenbank=20neuzuladen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWo/Scheduler/View/NewSchedulerView.xaml    |  1 +
 BeWo/Scheduler/View/NewSchedulerView.xaml.cs | 10 ++++++----
 BeWo/View/Detail/UserGroupView.xaml.cs       | 11 ++++++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml b/BeWo/Scheduler/View/NewSchedulerView.xaml
index a48f1e3c2..d92d815eb 100644
--- a/BeWo/Scheduler/View/NewSchedulerView.xaml
+++ b/BeWo/Scheduler/View/NewSchedulerView.xaml
@@ -11,6 +11,7 @@
                     xmlns:view="clr-namespace:BeWo.Scheduler.View"
                     xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
                     xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup" xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup" 
+					Loaded="NewSchedulerView_OnLoaded"
                     Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
     <localView:BeWoView.Resources>
         <ResourceDictionary>
diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
index 931e9629a..96706d8f3 100644
--- a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
+++ b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
@@ -451,7 +451,7 @@ namespace BeWo.Scheduler.View
                                         allEmployees = new List<CompactEmployeeDC> {BeWoApp.CompactLoggedOnEmployee};
                                     }
 
-                                    var darfKlientenAnsichtSehen = BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyCustomers) || BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View);
+                                    var darfKlientenAnsichtSehen = BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyTeams) || BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyCustomers) || BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View);
                                     var darfTermineAllerKlientenSehen = BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderKliententermineAlleAnsehen);
 
                                     if(darfKlientenAnsichtSehen)
@@ -482,7 +482,6 @@ namespace BeWo.Scheduler.View
 
         private void ConstructObject()
         {
-            
             IsEmployeeBrushVisible = true;
 
             InitializeComponent();
@@ -1840,8 +1839,6 @@ namespace BeWo.Scheduler.View
             }).ToList());
             selectedAppointment.CF_EmployeeList(neu);
 
-            // ToDo: Ausnahme erstellen und als abgesagt speichern
-
             if(selectedAppointment.Type == AppointmentType.Occurrence)
             {
                 var id = selectedAppointment.RecurrenceInfo.Id.ToString();
@@ -2850,6 +2847,11 @@ namespace BeWo.Scheduler.View
                 }
             }
         }
+
+        private void NewSchedulerView_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            ReloadVM(true);
+        }
     }
 
     #region Converter
diff --git a/BeWo/View/Detail/UserGroupView.xaml.cs b/BeWo/View/Detail/UserGroupView.xaml.cs
index 4fa1fc09b..559754ace 100644
--- a/BeWo/View/Detail/UserGroupView.xaml.cs
+++ b/BeWo/View/Detail/UserGroupView.xaml.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.ServiceModel;
 using System.Windows;
-
+using BeWo.Core.Service;
 using BeWo.ServiceProxy;
 using BeWo.ViewModel;
 
@@ -73,6 +73,7 @@ namespace BeWo.View.Detail
             }
         }
 
+        
         private void ReloadViewModel(long pOID)
         {
             VMFactory.CreateUserGroupVMAsync(
@@ -82,9 +83,13 @@ namespace BeWo.View.Detail
                     {
                         ViewModel = cb;
 
-                        if (BeWoApp.LoggedOnUser.UserGroups.Contains(cb.DataContract))
+                        if(BeWoApp.LoggedOnUser.UserGroups.Contains(cb.DataContract))
                         {
-                            ServiceFacade.DoUserServiceAsync(s => s.LoadUser(BeWoApp.LoggedOnUser.UserOid.Value), cb2 => BeWoApp.LoggedOnUser = cb2, true);
+                            ServiceFacade.DoUserServiceAsync(s => s.LoadUser(BeWoApp.LoggedOnUser.UserOid.Value), cb2 =>
+                            {
+                                BeWoApp.LoggedOnUser = cb2;
+                                Cache.GetInstance().ClearAll();
+                            }, true);
                         }
                     }));
         }