From c2692dd9cc5bf11dbfbbc064d9edd91a10b79267 Mon Sep 17 00:00:00 2001
From: Marcel Hirschle <marcel.hirschle@beyondsoft.de>
Date: Tue, 26 Apr 2022 10:00:34 +0200
Subject: [PATCH] =?UTF-8?q?MH:=20Neues=20Flag=20f=C3=BCr=20InfoButton=20im?=
 =?UTF-8?q?=20Kalender=20erstellt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWo/BeWoApp.xaml.cs                           | 13 ++++++++++---
 BeWo/Core/Config/AppSettings.cs                |  2 ++
 BeWo/Scheduler/View/NewSchedulerView.xaml      | 10 +++++-----
 BeWo/Scheduler/View/NewSchedulerView.xaml.cs   | 18 ++++++++++++++++++
 .../ViewModel/NewSchedulerViewModel.cs         |  1 +
 Service/Plugins/PluginLoader.cs                |  4 ++--
 Shared/Core/SettingsKeys.cs                    |  2 ++
 7 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index b9573581d..002e1f606 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -201,6 +201,7 @@ namespace BeWo
 			    bool showDienstplanung                        = false;
                 var showEmployeeSignature                     = false;
                 var showMultipleResourceColors                = false;
+                var showInfoButtonInCalender				  = false;
 
 
                 AppSettings.ShowAdvisedAttendedFlag = false;
@@ -451,7 +452,11 @@ namespace BeWo
 					{
 						AppSettings.ShowKlientenBetreuungszeiten = true;
 					}
-
+					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowInfoButtonInCalender);
+					if (val != null && val.Equals("1"))
+					{
+						AppSettings.ShowInfoButtonInCalender = true;
+					}
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.AllowStorno);
 					AppSettings.AllowStorno = val != null && val.Equals("1");
 					
@@ -513,6 +518,7 @@ namespace BeWo
 				showMarker = true;
 				showUrlaubsplanung = true;
 				showDienstplanung = true;
+				showInfoButtonInCalender = true;
 #endif
 
 				AppSettings.ShowDatevFields                          = showDatevFields;
@@ -548,8 +554,9 @@ namespace BeWo
 			    AppSettings.ShowUrlaubsplanung                       = showUrlaubsplanung;
 			    AppSettings.DontShowSpitzabrechnung                  = dontShowSpitzabrechnung;
 			    AppSettings.ShowDienstplanung                        = showDienstplanung;
-                AppSettings.ShowEmployeeSignature                    = showEmployeeSignature;
-                AppSettings.ShowMultipleResourceColors = showMultipleResourceColors;
+                AppSettings.ShowEmployeeSignature	                 = showEmployeeSignature;
+                AppSettings.ShowMultipleResourceColors				 = showMultipleResourceColors;
+                AppSettings.ShowInfoButtonInCalender				 = showInfoButtonInCalender;
 
 				BS.Shared.Settings.ApplicationSettings.SupportConceptExpirationLimitInMonths = AppSettings.HilfeplanAuslaufAuswahl;
 			}
diff --git a/BeWo/Core/Config/AppSettings.cs b/BeWo/Core/Config/AppSettings.cs
index 94215dce6..0bec27fdc 100644
--- a/BeWo/Core/Config/AppSettings.cs
+++ b/BeWo/Core/Config/AppSettings.cs
@@ -388,6 +388,8 @@ namespace BeWo.Core.Config
 
         public int DienstplanungStandardZeilenAnzahl { get; set; }
 
+        public bool ShowInfoButtonInCalender{ get; set; }
+
         public bool AllowStorno { get; set; }
 
         public bool ShowEmployeeSignature { get; set; }
diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml b/BeWo/Scheduler/View/NewSchedulerView.xaml
index 623d4f8fd..1c061af61 100644
--- a/BeWo/Scheduler/View/NewSchedulerView.xaml
+++ b/BeWo/Scheduler/View/NewSchedulerView.xaml
@@ -26,8 +26,8 @@
             <view:EmployeeBrushConverter x:Key="EmployeeBrushConverter" />
 			<view:AppointmentBorderZusageConverter x:Key="AppointmentBorderZusageConverter" />
 			<view:NichtNochEinConverter x:Key="NichtNochEinConverter" />
-			
-		    <!-- Region Appointment Templates -->
+            <view:InformationButtonVisibilityConverter x:Key="InformationButtonVisibilityConverter" />
+            <!-- Region Appointment Templates -->
 
             <!-- Region VerticalAppointmentTemplate -->
 		    <ControlTemplate x:Key="{dxscht:SchedulerViewThemeKey ResourceKey=VerticalAppointmentTemplate, IsThemeIndependent=true}" TargetType="{x:Type dxschint:VisualVerticalAppointmentControl}">
@@ -689,7 +689,7 @@
 
                                                                     </CheckBox>
                                                                     <Border Width="15" Height="15" Grid.Column="1" Background="{Binding Path=FilterableBrush}" CornerRadius="3" />
-                                                                    <Button x:Name="btn_showEmployeeInformation" Width="15" Height="15" Grid.Column="2" Margin="5 0 5 0" Click="btn_showEmployeeInformation_Click" FontFamily="Microsoft Sans Serif" Content="i"/>
+                                                                    <Button x:Name="btn_showEmployeeInformation" Width="15" Height="15" Grid.Column="2" Margin="5 0 5 0" Click="btn_showEmployeeInformation_Click" FontFamily="Microsoft Sans Serif" Content="i" Visibility="{Binding Converter={StaticResource InformationButtonVisibilityConverter}}"/>
                                                                 </Grid>
                                                             </Border>
                                                         </Grid>
@@ -799,7 +799,7 @@
                                                                         </CheckBox.IsChecked>
                                                                     </CheckBox>
 
-                                                                    <Button x:Name="btn_showCustomerInformation" Width="15" Height="15" Grid.Column="1" Margin="5 0 5 0" Click="btn_showCustomerInformation_Click"  FontFamily="Microsoft Sans Serif" Content="i"/>
+                                                                    <Button x:Name="btn_showCustomerInformation" Width="15" Height="15" Grid.Column="1" Margin="5 0 5 0" Click="btn_showCustomerInformation_Click"  FontFamily="Microsoft Sans Serif" Content="i" Visibility="{Binding Converter={StaticResource InformationButtonVisibilityConverter}}"/>
                                                                 </Grid>
                                                             </Border>
                                                         </Grid>
@@ -1056,7 +1056,7 @@
 			</dxe:DateNavigator>
 		</Grid>
 	    
-		<Border Grid.Row="0" Grid.RowSpan="2" x:Name="PopupContent" />
+		<Border Grid.Row="0" Grid.RowSpan="2" x:Name="PopupContent" Margin="0,-10,0,10" />
     <Popup Grid.Row="0" StaysOpen="True" Placement="MousePoint" Width="290" Height="80" Closed="popup_Closed" Opened="popup_Opened" x:Name="DeleteAppointmentsPopup">
       <Grid Background="{StaticResource ControlBackground}" Margin="2,2,2,2">
           <Grid.ColumnDefinitions>
diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
index b1f1b5e46..e2e775734 100644
--- a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
+++ b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
@@ -3143,5 +3143,23 @@ namespace BeWo.Scheduler.View
         }
     }
 
+    public class InformationButtonVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (BeWoApp.AppSettings.ShowInfoButtonInCalender == true)
+            {
+                return Visibility.Visible;
+            }
+            else
+                return Visibility.Collapsed;
+        }
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+
     #endregion
 }
diff --git a/BeWo/Scheduler/ViewModel/NewSchedulerViewModel.cs b/BeWo/Scheduler/ViewModel/NewSchedulerViewModel.cs
index c961331db..51482ff0a 100644
--- a/BeWo/Scheduler/ViewModel/NewSchedulerViewModel.cs
+++ b/BeWo/Scheduler/ViewModel/NewSchedulerViewModel.cs
@@ -14,6 +14,7 @@ namespace BeWo.Scheduler.ViewModel
 {
 	public class NewSchedulerViewModel
 	{
+
 		public event EventHandler<EventArgs<ISchedulerViewModel>> ViewModelChanged;
 
 		private ISchedulerViewModel _ActiveAppointmentViewModel;
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index 057ac61eb..e38d78b9f 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -298,7 +298,7 @@ namespace BeWo.Service.Plugins
                 //t = "3640152169"; // Claudia Charisius
                 //t = "3884496709"; // Wahl e.V.
                 //t = "3536079480"; // Behindertenhilfe Menden
-                //t = "5427523619"; // ChristopherusHausFamilienhilfe
+                t = "5427523619"; // ChristopherusHausFamilienhilfe
                 //t = "8251343124"; // Rat Plus Tat
                 //t = "6819347851"; // Awo Kreisverband Plön
                 //t = "2385915144"; // AKGG GmbHd
@@ -323,7 +323,7 @@ namespace BeWo.Service.Plugins
                 //t = "1048483934"; // Frauenhaus e.V. EWFRA - Wohnprojekt für Frauen
                 //t = "4293131072"; // ASB Rhein-Erft/Düren e.V. Schulbegleitung
                 //t = "2221228727"; // Autismus Leben gGmbH
-                t = "5065709552"; // Biotop e.V.
+                //t = "5065709552"; // Biotop e.V.
                 //t = "9094672461"; // Toprak GmbH
 
                 return t;
diff --git a/Shared/Core/SettingsKeys.cs b/Shared/Core/SettingsKeys.cs
index eaaa720b3..ecca7c6f1 100644
--- a/Shared/Core/SettingsKeys.cs
+++ b/Shared/Core/SettingsKeys.cs
@@ -69,6 +69,8 @@
         public static string FileRootDirectory                         => "FileRootDirectory";
 
         public static string ShowKlientenBetreuungszeiten => "ShowKlientenBetreuungszeiten";
+        public static string ShowInfoButtonInCalender => "ShowInfoButtonInCalender";
         
+
     }
 }