ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MH: Neues Flag für InfoButton im Kalender erstellt

Browse Source
This commit is contained in:
Marcel Hirschle
2022-04-26 10:00:34 +02:00
parent c04063e896
commit c2692dd9cc
7 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
BeWo/BeWoApp.xaml.cs
View File

@@ -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;
}

2
BeWo/Core/Config/AppSettings.cs
View File

@@ -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; }

10
BeWo/Scheduler/View/NewSchedulerView.xaml
View File

@@ -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>

18
BeWo/Scheduler/View/NewSchedulerView.xaml.cs
View File

@@ -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
}

1
BeWo/Scheduler/ViewModel/NewSchedulerViewModel.cs
View File

@@ -14,6 +14,7 @@ namespace BeWo.Scheduler.ViewModel
{
public class NewSchedulerViewModel
{
public event EventHandler<EventArgs<ISchedulerViewModel>> ViewModelChanged;
private ISchedulerViewModel _ActiveAppointmentViewModel;

4
Service/Plugins/PluginLoader.cs
View File

@@ -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;

2
Shared/Core/SettingsKeys.cs
View File

@@ -69,6 +69,8 @@
public static string FileRootDirectory => "FileRootDirectory";
public static string ShowKlientenBetreuungszeiten => "ShowKlientenBetreuungszeiten";
public static string ShowInfoButtonInCalender => "ShowInfoButtonInCalender";
}
}