diff --git a/BeWo/Core/Config/AppSettings.cs b/BeWo/Core/Config/AppSettings.cs index 7e34f0a23..a7b7deb14 100644 --- a/BeWo/Core/Config/AppSettings.cs +++ b/BeWo/Core/Config/AppSettings.cs @@ -292,7 +292,9 @@ namespace BeWo.Core.Config public bool ShowDistanceFields { get; set; } - public bool ShowTeamNews { get; set; } + public bool ShowSignatures { get; set; } + + public bool ShowTeamNews { get; set; } public bool ShowMarker { get; set; } diff --git a/BeWo/View/Detail/ServiceRecordView2.xaml b/BeWo/View/Detail/ServiceRecordView2.xaml index 308739510..5960eec61 100644 --- a/BeWo/View/Detail/ServiceRecordView2.xaml +++ b/BeWo/View/Detail/ServiceRecordView2.xaml @@ -1061,7 +1061,7 @@ - + @@ -1069,7 +1069,6 @@ - diff --git a/BeWo/View/Detail/ServiceRecordView2.xaml.cs b/BeWo/View/Detail/ServiceRecordView2.xaml.cs index d0082a949..969af6245 100644 --- a/BeWo/View/Detail/ServiceRecordView2.xaml.cs +++ b/BeWo/View/Detail/ServiceRecordView2.xaml.cs @@ -252,6 +252,10 @@ namespace BeWo.View.Detail var Settings = BeWoApp.AppSettings; + if (BeWoApp.AppSettings.ShowSignatures) + { + UnterschriftenHeader.Visible = true; + } if (Settings.IsOnlyYearMonthVisible) { diff --git a/BeWo/ViewModel/ServiceRecordVM.cs b/BeWo/ViewModel/ServiceRecordVM.cs index 85f459aef..e336f25da 100644 --- a/BeWo/ViewModel/ServiceRecordVM.cs +++ b/BeWo/ViewModel/ServiceRecordVM.cs @@ -190,6 +190,8 @@ namespace BeWo.ViewModel private int? _DurationMonthYearGes; + private bool _isUnterschrift; + private string[] _MonateBinden = {"Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"}; #endregion @@ -969,6 +971,21 @@ namespace BeWo.ViewModel set { _SignatureOid = value; } } + public bool IsUnterschrift + { + get + { + if(_SignatureOid != null) { + return true; + } + else + { + return false; + } + } + set { _isUnterschrift = value; } + } + public int? GroupPersonCount { get { return _GroupPersonCount; } @@ -1824,7 +1841,7 @@ namespace BeWo.ViewModel copy.GroupPersonCount = GroupPersonCount; copy.GroupOid = GroupOid; copy.GroupRoundedDuration = GroupRoundedDuration; - + copy.SignatureOid = SignatureOid; copy.DurationInStunden = DurationInStunden; copy.ServiceRecordFormat = ServiceRecordFormat; @@ -1941,7 +1958,7 @@ namespace BeWo.ViewModel _DurationInStunden = pDataContract.DurationInStunden; _ServiceRecordFormat = pDataContract.ServiceRecordFormat; - + _SignatureOid = pDataContract.SignatureOid; if (pDataContract.Goals != null) { diff --git a/Service/Configuration/AppSettings.cs b/Service/Configuration/AppSettings.cs index 7e6ca7369..2ccac9bae 100644 --- a/Service/Configuration/AppSettings.cs +++ b/Service/Configuration/AppSettings.cs @@ -43,7 +43,9 @@ namespace BeWo.Service.Configuration public bool ShowDistanceFields { get; set; } - public bool ShowCustomerDistanceFields { get; set; } + public bool ShowSignatures { get; set; } + + public bool ShowCustomerDistanceFields { get; set; } public bool ShowAdditionalService { get; set; } @@ -65,6 +67,7 @@ namespace BeWo.Service.Configuration bool isZeiterfassDateNormal = true; bool isZeiterfassungInStdMin = true; bool showServiceRecordsDistanceFields = false; + bool showSignatures = false; bool showCustomerDistanceFields = false; bool showAdditionalService = false; bool showRoundedDurationInEmployeeAnalysis = true; @@ -185,6 +188,12 @@ namespace BeWo.Service.Configuration printerSettingsUsePaperKind = true; } + val = GetSettingValue(mandator.Settings, "ShowSignatures"); + if (val != null && val.Equals("1")) + { + showSignatures = true; + } + } @@ -198,6 +207,7 @@ namespace BeWo.Service.Configuration settings.HilfeplanAuslaufAuswahl = hilfeplanAuslaufAuswahl; settings.AnzTageZeiterfassErfolgt = anzTageZeiterfassErfolgt; settings.ShowDistanceFields = showServiceRecordsDistanceFields; + settings.ShowSignatures = showSignatures; settings.ShowCustomerDistanceFields = showCustomerDistanceFields; settings.ShowAdditionalService = showAdditionalService; settings.ShowRoundedDurationInEmployeeAnalysis = showRoundedDurationInEmployeeAnalysis;