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

Vermittlung Arbeit - Recht + Styles

Browse Source
This commit is contained in:
Rene Evertz
2024-09-20 13:05:47 +02:00
parent b9fd6c803f
commit 30bf436a88
7 changed files with 65 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
BeWo/Styles/ControlStyles/TextEditStyles.xaml
View File

@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors">
<!-- Base -->
<Style x:Key="BaseTextEdit" TargetType="{x:Type dxe:TextEdit}">
<Setter Property="Margin" Value="3" />
@@ -44,6 +44,13 @@
<Setter Property="Mask" Value="########0.## Std" />
<Setter Property="dxe:NumericMaskOptions.AlwaysShowDecimalSeparator" Value="False" />
</Style>
<Style
x:Key="TextEditDays"
BasedOn="{StaticResource BaseNumberMaskTextEdit}"
TargetType="{x:Type dxe:TextEdit}">
<Setter Property="Mask" Value="########0.## Tage" />
<Setter Property="dxe:NumericMaskOptions.AlwaysShowDecimalSeparator" Value="False" />
</Style>
<!-- Numbers -->
<Style

97
BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
View File

@@ -8,6 +8,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:viewmodel="clr-namespace:BeWo.ViewModel"
x:Name="root"
d:DataContext="{d:DesignInstance Type=viewmodel:CustomerGemeinnutzigeArbeitVM}"
d:DesignHeight="1450"
d:DesignWidth="1800"
@@ -28,17 +29,9 @@
<Setter Property="Margin" Value="15" />
<Setter Property="Padding" Value="10,7,7,5" />
</Style>
<Style BasedOn="{StaticResource {x:Type TextBox}}" TargetType="TextBox">
<Setter Property="IsReadOnly" Value="{Binding DataContext.PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}" />
</Style>
<Style BasedOn="{StaticResource {x:Type dxe:DateEdit}}" TargetType="{x:Type dxe:DateEdit}">
<Setter Property="IsReadOnly" Value="{Binding DataContext.PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}" />
</Style>
<Style BasedOn="{StaticResource {x:Type dxe:TextEdit}}" TargetType="{x:Type dxe:TextEdit}">
<Setter Property="IsReadOnly" Value="{Binding DataContext.PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}" />
</Style>
<Style BasedOn="{StaticResource {x:Type uc:NullItemComboBox}}" TargetType="{x:Type uc:NullItemComboBox}">
<Setter Property="IsEnabled" Value="{Binding DataContext.PermissionCustomerWohnhilfeManage, Mode=OneTime, ElementName=root_grid}" />
<Style BasedOn="{StaticResource CheckBoxBase}" TargetType="CheckBox">
<Setter Property="IsHitTestVisible" Value="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}" />
<Setter Property="Focusable" Value="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}" />
</Style>
</ResourceDictionary>
</UserControl.Resources>
@@ -94,6 +87,7 @@
<TextBox
Grid.Row="0"
Grid.Column="1"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Text="{Binding Path=EigenesAktenzeichen, UpdateSourceTrigger=PropertyChanged}" />
<Label
@@ -104,8 +98,9 @@
Grid.Row="1"
Grid.Column="1"
EditValue="{Binding Path=Auftragseingang, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
ShowClearButton="False" />
<Label
Grid.Row="2"
Grid.Column="0"
@@ -114,9 +109,10 @@
x:Name="comboBox_Auftragsherkunft"
Grid.Row="2"
Grid.Column="1"
IsEnabled="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}"
ItemsSource="{Binding Path=Auftragsherkunfte}"
SelectedValue="{Binding Path=Auftragsherkunft, Mode=TwoWay}" />
<Label
Grid.Row="3"
Grid.Column="0"
@@ -125,9 +121,10 @@
x:Name="comboBox_Vermittlungsgrundlage"
Grid.Row="3"
Grid.Column="1"
IsEnabled="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}"
ItemsSource="{Binding Path=Vermittlungsgrundlagen}"
SelectedValue="{Binding Path=Vermittlungsgrundlage, Mode=TwoWay}" />
<Label
Grid.Row="4"
Grid.Column="0"
@@ -135,8 +132,9 @@
<dxe:TextEdit
Grid.Row="4"
Grid.Column="1"
EditValue="{Binding Path=Tagessatze, UpdateSourceTrigger=PropertyChanged}" />
EditValue="{Binding Path=Tagessatze, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}" />
<Label
Grid.Row="5"
Grid.Column="0"
@@ -145,9 +143,9 @@
Grid.Row="5"
Grid.Column="1"
EditValue="{Binding Path=Tagessatzhohe, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource TextEditCurrency}"
IsReadOnly="{Binding DataContext.PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}" />
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Style="{StaticResource TextEditCurrency}" />
<Label
Grid.Row="6"
Grid.Column="0"
@@ -155,9 +153,10 @@
<dxe:TextEdit
Grid.Row="6"
Grid.Column="1"
Style="{StaticResource TextEditCurrency}"
IsReadOnly="True" />
EditValue="{Binding Path=HoheDerGeldstrafe, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="True"
Style="{StaticResource TextEditCurrency}" />
<Label
Grid.Row="7"
Grid.Column="0"
@@ -166,9 +165,9 @@
Grid.Row="7"
Grid.Column="1"
EditValue="{Binding Path=ZuLeistendeArbeitsstunden, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource TextEditHours}"
IsReadOnly="{Binding DataContext.PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}" />
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Style="{StaticResource TextEditHours}" />
<Label
Grid.Row="8"
Grid.Column="0"
@@ -176,8 +175,9 @@
<TextBox
Grid.Row="8"
Grid.Column="1"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Text="{Binding Path=Hinweis, UpdateSourceTrigger=PropertyChanged}" />
<Label
Grid.Row="9"
Grid.Column="0"
@@ -186,6 +186,7 @@
Grid.Row="9"
Grid.Column="1"
EditValue="{Binding Path=Termin, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Mask="G"
MaskUseAsDisplayFormat="True"
ShowClearButton="True">
@@ -193,6 +194,7 @@
<dxe:DateEditNavigatorWithTimePickerStyleSettings />
</dxe:DateEdit.StyleSettings>
</dxe:DateEdit>
<Label
Grid.Row="10"
Grid.Column="0"
@@ -202,10 +204,11 @@
Grid.Row="10"
Grid.Column="1"
HorizontalAlignment="Stretch"
IsEnabled="{Binding Path=PermissionFalldatenEdit, Mode=OneTime}"
IsEnabled="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}"
ItemsSource="{Binding Path=FalldatenBearbeitungsstatusTypes}"
SelectedValue="{Binding Path=FalldatenBearbeitungsstatus}"
Style="{StaticResource EnumTranslationNullItemComboBox}" />
<Label
Grid.Row="11"
Grid.Column="0"
@@ -213,8 +216,9 @@
<TextBox
Grid.Row="11"
Grid.Column="1"
IsReadOnly="{Binding DataContext.PermissionFalldatenEdit, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Text="{Binding Path=Auftragsruckgabe, UpdateSourceTrigger=PropertyChanged}" />
<Label
Grid.Row="12"
Grid.Column="0"
@@ -222,8 +226,9 @@
<TextBox
Grid.Row="12"
Grid.Column="1"
IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Text="{Binding Path=Verlauf, UpdateSourceTrigger=PropertyChanged}" />
<Label
Grid.Row="13"
Grid.Column="0"
@@ -231,12 +236,10 @@
<dxe:TextEdit
Grid.Row="13"
Grid.Column="1"
dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
EditValue="{Binding Path=AbgeleisteteStunden, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
Mask="########0.## Std"
MaskType="Numeric"
MaskUseAsDisplayFormat="True" />
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Style="{StaticResource TextEditHours}" />
<Label
Grid.Row="14"
Grid.Column="0"
@@ -244,12 +247,10 @@
<dxe:TextEdit
Grid.Row="14"
Grid.Column="1"
dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
EditValue="{Binding Path=ErsparteHafttage, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
Mask="########0.## Tage"
MaskType="Numeric"
MaskUseAsDisplayFormat="True" />
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Style="{StaticResource TextEditDays}"/>
<Label
Grid.Row="15"
Grid.Column="0"
@@ -257,12 +258,10 @@
<dxe:TextEdit
Grid.Row="15"
Grid.Column="1"
dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
EditValue="{Binding Path=GeleisteteRatenzahlung, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
Mask="########0.00 $"
MaskType="Numeric"
MaskUseAsDisplayFormat="True" />
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Style="{StaticResource TextEditCurrency}"/>
<Label
Grid.Row="16"
Grid.Column="0"
@@ -270,12 +269,10 @@
<dxe:TextEdit
Grid.Row="16"
Grid.Column="1"
dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
EditValue="{Binding Path=GeleisteteEinmalzahlung, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
Mask="########0.00 $"
MaskType="Numeric"
MaskUseAsDisplayFormat="True" />
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Style="{StaticResource TextEditCurrency}" />
<Label
Grid.Row="17"
Grid.Column="0"
@@ -286,7 +283,7 @@
Height="92"
MaxHeight="184"
AcceptsReturn="True"
IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Text="{Binding Path=Bemerkung, UpdateSourceTrigger=PropertyChanged}"
TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" />

2
BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml.cs
View File

@@ -20,6 +20,8 @@ namespace BeWo.View.Controls
/// </summary>
public partial class CustomerVermittlungArbeitControl : UserControl
{
public bool PermissionCustomerGemeinnutzigeArbeitManage { get; } = BeWoApp.HasLoggedOnUserRight(BS.Shared.UserRightType.Customer_GemeinnutzigeArbeit_Manage);
public CustomerVermittlungArbeitControl()
{
InitializeComponent();

3
BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
View File

@@ -1,4 +1,5 @@
<UserControl
x:Name="root"
x:Class="BeWo.View.Detail.CustomerVermittlungArbeitView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -49,7 +50,7 @@
<Button.Visibility>
<MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter}">
<Binding Path="IsSelected" RelativeSource="{RelativeSource AncestorType={x:Type TabItem}}" />
<Binding ElementName="root_control" Path="PermissionCustomerWohnhilfeManage" />
<Binding ElementName="root" Path="PermissionCustomerWohnhilfeManage" />
</MultiBinding>
</Button.Visibility>
</Button>

1
BeWo/View/Detail/CustomerView.xaml.cs
View File

@@ -279,6 +279,7 @@ namespace BeWo.View.Detail
if(DebugConfig.CurrentConfig is object && DebugConfig.CurrentConfig.DebugConfigMode == DebugConfigMode.FeatureCustomerWohnhilfe)
{
tabroot.SelectedItem = tabitem_gemeinnutzigearbeit;
tabroot.SelectedItem = tabitem_wohnhilfe;
}
#endif
}

4
BeWo/ViewModel/CustomerVM.cs
View File

@@ -2037,7 +2037,11 @@ namespace BeWo.ViewModel
CustomerWohnhilfeListVM = new CustomerWohnhilfeListVM(this, pDataContract.CustomerWohnhilfeDC ?? (pDataContract.CustomerWohnhilfeDC = new List<CustomerWohnhilfeDC>()));
CustomerWohnhilfeListVM.AddNewVMToListAndSelect(false);
CustomerGemeinnutzigeArbeitListVM = new CustomerGemeinnutzigeArbeitListVM(pDataContract.CustomerGemeinnutzigeArbeitDC ?? (pDataContract.CustomerGemeinnutzigeArbeitDC = new List<FalldatenDC>()));
CustomerGemeinnutzigeArbeitListVM.AddNewVMToListAndSelect(false);
}
protected override CustomerDC MapToDataContract(CustomerDC pDataContract, bool doCommit)
{

2
BeWo/ViewModel/ListViewModel/AbstractDCListMapperVM.cs
View File

@@ -184,7 +184,7 @@ namespace BeWo.ViewModel.ListViewModel
// Wichtig! NewVM, wenn _NewVM null ist
var vm = NewVM;
_VMList.Add(vm);
VMList.Add(vm);
// _VMList.Sort();
if (select)