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

ShowSignatures für ServiceRecord

Browse Source
This commit is contained in:
Waldi
2017-02-09 10:05:55 +01:00
parent e402fdbb41
commit 0be87ac4bd
5 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -1061,7 +1061,7 @@
<!--########################## gridcolumn with checkbox IsChecked="{Binding Path=EditValue}" ##########################################-->
<dxg:GridColumn FieldName="Unterschrift" Header="Unterschrift" AllowEditing="False" Width="70" Visible="False" >
<dxg:GridColumn FieldName="IsUnterschrift" Header="Unterschrift" AllowEditing="False" Width="70" Visible="False" x:Name="UnterschriftenHeader" >
<dxg:GridColumn.CellTemplate>
<DataTemplate>
<CheckBox HorizontalAlignment="Center" VerticalAlignment="Center" />
@@ -1069,7 +1069,6 @@
</dxg:GridColumn.CellTemplate>
</dxg:GridColumn>
<!--##############################################################################################-->
</dxg:GridControl.Columns>

4
BeWo/View/Detail/ServiceRecordView2.xaml.cs
View File

@@ -252,6 +252,10 @@ namespace BeWo.View.Detail
var Settings = BeWoApp.AppSettings;
if (BeWoApp.AppSettings.ShowSignatures)
{
UnterschriftenHeader.Visible = true;
}
if (Settings.IsOnlyYearMonthVisible)
{

21
BeWo/ViewModel/ServiceRecordVM.cs
View File

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

12
Service/Configuration/AppSettings.cs
View File

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