Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

# Conflicts:
#	Service/Plugins/PluginLoader.cs
This commit is contained in:
Christian
2021-06-22 20:55:30 +02:00
731 changed files with 25167 additions and 4845 deletions

View File

@@ -8,6 +8,7 @@ using BS.Shared.Extensions;
using System.Collections.Generic;
using BS.Shared.Core;
using System.Windows;
namespace BeWo.ViewModel
{
@@ -49,6 +50,48 @@ namespace BeWo.ViewModel
private String _Notice;
private EmploymentTypeDC _EmploymentType;
//private Visibility _EmploymentTypeLeaveDaysVisibility;
//private Visibility _LeaveDaysVisibility;
public Visibility EmploymentTypeLeaveDaysVisibility
{
get
{
if (EmploymentType != null && EmploymentType.LeaveDays.HasValue)
{
return Visibility.Visible;
}
return Visibility.Collapsed;
}
//set
//{
// _EmploymentTypeLeaveDaysVisibility = value;
// FirePropertyChanged("EmploymentTypeLeaveDaysVisibility");
// FirePropertyChanged("LeaveDaysVisibility");
//}
}
public Visibility LeaveDaysVisibility
{
get {
if (EmploymentType == null || !EmploymentType.LeaveDays.HasValue)
{
return Visibility.Visible;
}
return Visibility.Collapsed;
}
//set
//{
// _LeaveDaysVisibility = value;
// FirePropertyChanged("EmploymentTypeLeaveDaysVisibility");
// FirePropertyChanged("LeaveDaysVisibility");
//}
}
private IList<ValueListEntryDC> _AllContractTypes;
private IList<CostRatePeriodDC> _AllHourlyRateCostRatePeriods;
@@ -140,6 +183,8 @@ namespace BeWo.ViewModel
this._EmploymentType = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.EmploymentType, value), PropertyName_EmploymentType);
this.FirePropertyChanged(PropertyName_EmploymentType);
FirePropertyChanged("EmploymentTypeLeaveDaysVisibility");
FirePropertyChanged("LeaveDaysVisibility");
}
}
}