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

Neue Attribute Steuerklasse und Anzahl Kinder beim Mitarbeiter und Bruttolohn beim Vertrag

Browse Source
This commit is contained in:
Kojo
2025-08-01 16:52:46 +02:00
parent e327ebea3f
commit 5cde43a41b
17 changed files with 251 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
BeWo/View/Detail/EmployeeView.xaml
View File

@@ -336,6 +336,8 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -396,39 +398,53 @@
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Staatsangehörigkeit
Anzahl Kinder
</Label>
<Label
Grid.Row="8"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Krankenkasse
Staatsangehörigkeit
</Label>
<Label
Grid.Row="9"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Steuernummer
Krankenkasse
</Label>
<Label
Grid.Row="10"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Steuernummer
</Label>
<Label
Grid.Row="11"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Steuerklasse
</Label>
<Label
Grid.Row="12"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Versicherungs Nr.
</Label>
<Label
x:Name="lblArchiviert"
Grid.Row="11"
Grid.Row="13"
Grid.Column="0"
Margin="3,0,3,3"
VerticalAlignment="Center">
Archiviert
</Label>
<Label
Grid.Row="12"
Grid.Row="14"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center"
@@ -436,7 +452,7 @@
<ComboBox
Name="combobox_brush"
Grid.Row="12"
Grid.Row="14"
Grid.Column="1"
Height="23"
Margin="3"
@@ -538,9 +554,15 @@
SelectedValue="{Binding Path=FamilyStatus}"
SelectedValuePath="Key"
Style="{DynamicResource {x:Type uc:NullItemComboBox}}" />
<TextBox
Grid.Row="7"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=ChildCount, UpdateSourceTrigger=PropertyChanged}" />
<uc:NullItemComboBox
x:Name="comboBox_Nationalitaet"
Grid.Row="7"
Grid.Row="8"
Grid.Column="1"
Height="23"
MinWidth="189"
@@ -551,27 +573,32 @@
<TextBox
Grid.Row="8"
Grid.Row="9"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=HealthInsurance, UpdateSourceTrigger=PropertyChanged}" />
<TextBox
Grid.Row="9"
Grid.Row="10"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=TaxNumber, UpdateSourceTrigger=PropertyChanged}" />
<TextBox
Grid.Row="10"
Grid.Row="11"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=TaxClass, UpdateSourceTrigger=PropertyChanged}" />
<TextBox
Grid.Row="12"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=InsuranceNumber, UpdateSourceTrigger=PropertyChanged}" />
<CheckBox
x:Name="chkArchiviert"
Grid.Row="11"
Grid.Row="13"
Grid.Column="1"
Height="23"
Margin="3,6,3,3"
@@ -986,6 +1013,7 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label
Grid.Row="0"
@@ -1078,6 +1106,12 @@
Margin="3"
VerticalAlignment="Center"
Content="{markup:Translate Künd.-frist (Tage)}" />
<Label
Grid.Row="14"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center"
Content="{markup:Translate Bruttogehalt}" />
<Label
Grid.Row="0"
@@ -1154,10 +1188,19 @@
<dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="11" Margin="3" Height="23" EditValue="{Binding Path=ProbationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" IsFloatValue="True" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="12" Margin="3" Height="23" EditValue="{Binding Path=ProbationPeriod2, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="13" Margin="3" Height="23" EditValue="{Binding Path=CancellationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit
Grid.Row="14"
Grid.Column="1"
Height="23"
Margin="3"
EditValue="{Binding Path=GrossSalary, UpdateSourceTrigger=PropertyChanged}"
Mask="c"
MaskType="Numeric"
MaskUseAsDisplayFormat="True" />
<TextBox
Grid.Row="1"
Grid.RowSpan="13"
Grid.RowSpan="14"
Grid.Column="3"
Margin="3"
HorizontalAlignment="Stretch"
@@ -1172,7 +1215,7 @@
TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" />
<TextBlock
Grid.Row="14"
Grid.Row="15"
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="3,15,3,3"

20
BeWo/ViewModel/ContractVM.cs
View File

@@ -21,6 +21,7 @@ namespace BeWo.ViewModel
public static string PropertyName_CancellationPeriod = "CancellationPeriod";
public static string PropertyName_EntryDate = "EntryDate";
public static string PropertyName_ContractEndDate = "ContractEndDate";
public static string PropertyName_GrossSalary = "GrossSalary";
public static string PropertyName_HourlyRate = "HourlyRate";
public static string PropertyName_HourlyRateCostRatePeriod = "HourlyRateCostRatePeriod";
public static string PropertyName_WeeklyFLS = "WeeklyFLS";
@@ -40,6 +41,7 @@ namespace BeWo.ViewModel
private decimal? _WeeklyFLS;
private decimal? _MonthlyFLS;
private decimal? _HourlyRate;
private decimal? _GrossSalary;
private CostRatePeriodDC _HourlyRateCostRatePeriod;
private DateTime? _EntryDate;
private DateTime? _ContractEndDate;
@@ -330,6 +332,22 @@ namespace BeWo.ViewModel
{
get { return !IsHourlyRateTextfieldVisible; }
}
public decimal? GrossSalary
{
get { return this._GrossSalary; }
set
{
if (this.AreDifferent(this._GrossSalary, value))
{
this._GrossSalary = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.GrossSalary, value), PropertyName_GrossSalary);
this.FirePropertyChanged(PropertyName_GrossSalary);
}
}
}
public decimal? HourlyRate
{
get { return this._HourlyRate; }
@@ -485,6 +503,7 @@ namespace BeWo.ViewModel
this._CancellationPeriod = pDataContract.CancellationPeriod;
this._ContractEndDate = pDataContract.ContractEndDate;
this._EntryDate = pDataContract.EntryDate;
this._GrossSalary = pDataContract.GrossSalary;
this._HourlyRate = pDataContract.HourlyRate;
this._HourlyRateCostRatePeriod = pDataContract.HourlyRateCostRateValue;
this._LeaveDays = pDataContract.LeaveDays;
@@ -507,6 +526,7 @@ namespace BeWo.ViewModel
pDataContract.CancellationPeriod = this._CancellationPeriod;
pDataContract.ContractEndDate = this._ContractEndDate;
pDataContract.EntryDate = this._EntryDate;
pDataContract.GrossSalary = this._GrossSalary;
pDataContract.HourlyRate = this._HourlyRate;
pDataContract.HourlyRateCostRateValue = this._HourlyRateCostRatePeriod;
pDataContract.LeaveDays = this._LeaveDays;

42
BeWo/ViewModel/EmployeeVM.cs
View File

@@ -27,6 +27,7 @@ namespace BeWo.ViewModel
public static string PropertyName_BankName = "BankName";
public static string PropertyName_Bic = "Bic";
public static string PropertyName_CancellationPeriod = "CancellationPeriod";
public static string PropertyName_ChildCount = "ChildCount";
public static string PropertyName_Contracts = "Contracts";
public static string PropertyName_CustomerRelations = "CustomerRelations";
public static string PropertyName_DateOfBirth = "DateOfBirth";
@@ -65,6 +66,7 @@ namespace BeWo.ViewModel
public static string PropertyName_Profession = "Profession";
public static string PropertyName_Qualifications = "Qualifications";
public static string PropertyName_Street = "Street";
public static string PropertyName_TaxClass = "TaxClass";
public static string PropertyName_TaxNumber = "TaxNumber";
public static string PropertyName_Text1 = "Text1";
public static string PropertyName_Text2 = "Text2";
@@ -97,6 +99,7 @@ namespace BeWo.ViewModel
private string _BankCode;
private string _BankName;
private string _Bic;
private string _ChildCount;
private ContractListVM _Contracts;
private CustomerEmployeeRelationListVM _CustomerRelations;
private DateTime? _DateOfBirth;
@@ -127,6 +130,7 @@ namespace BeWo.ViewModel
private ObservableSortCollection<ValueListEntryDC> _Qualifications;
private Sex? _Sex;
private string _Street;
private string _TaxClass;
private string _TaxNumber;
private string _Text1;
private string _Text2;
@@ -425,6 +429,23 @@ namespace BeWo.ViewModel
// }
//}
public string ChildCount
{
get { return _ChildCount; }
set
{
if (AreDifferent(_ChildCount, value))
{
_ChildCount = value;
StoreDirtyInformation(AreDifferent(DataContract.ChildCount, value), PropertyName_ChildCount);
FirePropertyChanged(PropertyName_ChildCount);
}
}
}
public CustomerEmployeeRelationListVM CustomerRelations
{
get { return _CustomerRelations; }
@@ -980,6 +1001,23 @@ namespace BeWo.ViewModel
}
}
public string TaxClass
{
get { return _TaxClass; }
set
{
if (AreDifferent(_TaxClass, value))
{
_TaxClass = value;
StoreDirtyInformation(AreDifferent(DataContract.TaxClass, value), PropertyName_TaxClass);
FirePropertyChanged(PropertyName_TaxClass);
}
}
}
public string TaxNumber
{
get { return _TaxNumber; }
@@ -1288,6 +1326,8 @@ namespace BeWo.ViewModel
_Profession = pDataContract.Profession;
_Street = pDataContract.Street;
_TaxNumber = pDataContract.TaxNumber;
_TaxClass = pDataContract.TaxClass;
_ChildCount = pDataContract.ChildCount;
_Town = pDataContract.Town;
_BankName = pDataContract.BankName;
_AccountNumber = pDataContract.AccountNumber;
@@ -1402,6 +1442,8 @@ namespace BeWo.ViewModel
pDataContract.Profession = _Profession;
pDataContract.Street = _Street;
pDataContract.TaxNumber = _TaxNumber;
pDataContract.TaxClass = _TaxClass;
pDataContract.ChildCount = _ChildCount;
pDataContract.Town = _Town;
pDataContract.BankName = _BankName;
pDataContract.AccountNumber = _AccountNumber;

12
Data/Entities/Contract.cs
View File

@@ -17,6 +17,7 @@ namespace BeWo.Data.Entities
public static string PropertyName_EntryDate = "EntryDate";
public static string PropertyName_ContractEndDate = "ContractEndDate";
public static string PropertyName_HourlyRate = "HourlyRate";
public static string PropertyName_GrossSalary = "GrossSalary";
public static string PropertyName_WeeklyFLS = "WeeklyFLS";
public static string PropertyName_MonthlyFLS = "MonthlyFLS";
public static string PropertyName_WeeklyTotalHours = "WeeklyTotalHours";
@@ -31,6 +32,7 @@ namespace BeWo.Data.Entities
private decimal? _WeeklyFLS;
private decimal? _MonthlyFLS;
private decimal? _HourlyRate;
private decimal? _GrossSalary;
private DateTime? _EntryDate;
private DateTime? _ContractEndDate;
private int _CancellationPeriod;
@@ -170,6 +172,16 @@ namespace BeWo.Data.Entities
}
}
public virtual decimal? GrossSalary
{
get { return _GrossSalary; }
set
{
if (base.AreDifferent(_GrossSalary, value))
_GrossSalary = value;
}
}
public virtual long EmployeeOid
{
get { return _EmployeeOid; }

12
Data/Entities/ContractHistory.cs
View File

@@ -15,6 +15,7 @@ namespace BeWo.Data.Entities
public static string PropertyName_ContractHistoryEntryDate = "ContractHistoryEntryDate";
public static string PropertyName_ContractHistoryContractEndDate = "ContractHistoryContractEndDate";
public static string PropertyName_ContractHistoryHourlyRate = "ContractHistoryHourlyRate";
public static string PropertyName_ContractHistoryGrossSalary = "ContractHistoryGrossSalary";
public static string PropertyName_ContractHistoryWeeklyFLS = "ContractHistoryWeeklyFLS";
public static string PropertyName_ContractHistoryMonthlyFLS = "ContractHistoryMonthlyFLS";
public static string PropertyName_ContractHistoryWeeklyTotalHours = "ContractHistoryWeeklyTotalHours";
@@ -31,6 +32,7 @@ namespace BeWo.Data.Entities
private decimal? _WeeklyFLS;
private decimal? _MonthlyFLS;
private decimal? _HourlyRate;
private decimal? _GrossSalary;
private DateTime? _EntryDate;
private DateTime? _ContractEndDate;
private int _CancellationPeriod;
@@ -173,6 +175,16 @@ namespace BeWo.Data.Entities
}
}
public virtual decimal? ContractHistoryGrossSalary
{
get { return _GrossSalary; }
set
{
if (base.AreDifferent(_GrossSalary, value))
_GrossSalary = value;
}
}
public virtual long ContractHistoryEmployeeOid
{
get { return _EmployeeOid; }

36
Data/Entities/Employee.cs
View File

@@ -11,6 +11,8 @@ namespace BeWo.Data.Entities
{
public static string PropertyName_AbsenceTimes = "AbsenceTimes";
public static string PropertyName_ChildCount = "ChildCount";
public static string PropertyName_Employee2CustomerList = "Employee2CustomerList";
public static string PropertyName_HealthInsurance = "HealthInsurance";
@@ -31,6 +33,8 @@ namespace BeWo.Data.Entities
public static string PropertyName_ServiceRecordList = "ServiceRecordList";
public static string PropertyName_TaxClass = "TaxClass";
public static string PropertyName_TaxNumber = "TaxNumber";
public static string PropertyName_ValueList = "ValueList";
@@ -61,7 +65,9 @@ namespace BeWo.Data.Entities
private IList<Contract> _Contracts;
private IList<Arbeitszeit> _Arbeitszeiten;
private string _ChildCount;
private IList<Arbeitszeit> _Arbeitszeiten;
private IList<Employee2Customer> _Employee2CustomerList;
@@ -87,6 +93,8 @@ namespace BeWo.Data.Entities
private IList<ServiceRecord> _ServiceRecordList;
private string _TaxClass;
private string _TaxNumber;
private string _Text1;
@@ -175,6 +183,19 @@ namespace BeWo.Data.Entities
}
}
public virtual string ChildCount
{
get { return _ChildCount; }
set
{
if (AreDifferent(_ChildCount, value))
{
_ChildCount = value;
}
}
}
public virtual IList<Employee2Customer> Employee2CustomerList
{
get { return _Employee2CustomerList ?? (_Employee2CustomerList = new List<Employee2Customer>()); }
@@ -307,6 +328,19 @@ namespace BeWo.Data.Entities
}
}
public virtual string TaxClass
{
get { return _TaxClass; }
set
{
if (AreDifferent(_TaxClass, value))
{
_TaxClass = value;
}
}
}
public virtual string TaxNumber
{
get { return _TaxNumber; }

32
Data/Entities/EmployeeHistory.cs
View File

@@ -17,6 +17,8 @@ namespace BeWo.Data.Entities
private TableID _Employee_Tid;
private string _Employee_PersonnelNumber;
private string _Employee_TaxNumber;
private string _Employee_TaxClass;
private string _Employee_ChildCount;
private string _Employee_HealthInsurance;
private string _Employee_InsuranceNumber;
private decimal _Employee_HourlyRate;
@@ -158,6 +160,36 @@ namespace BeWo.Data.Entities
}
}
public virtual string Employee_TaxClass
{
get
{
return _Employee_TaxClass;
}
set
{
if (AreDifferent(_Employee_TaxClass, value))
{
_Employee_TaxClass = value;
}
}
}
public virtual string Employee_ChildCount
{
get
{
return _Employee_ChildCount;
}
set
{
if (AreDifferent(_Employee_ChildCount, value))
{
_Employee_ChildCount = value;
}
}
}
public virtual string Employee_HealthInsurance
{
get

1
Data/Mappings/Contract.hbm.xml
View File

@@ -15,6 +15,7 @@
<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
<property column="EmployeeOid" type="Int64" name="EmployeeOid" update="false" insert="false"/>
<property column="HourlyRate" type="Decimal" name="HourlyRate" />
<property column="GrossSalary" type="Decimal" name="GrossSalary" />
<property column="WeeklyFLS" type="Decimal" name="WeeklyFLS" />
<property column="MonthlyFLS" type="Decimal" name="MonthlyFLS" />
<property column="WeeklyTotalHours" type="Decimal" name="WeeklyTotalHours" />

1
Data/Mappings/ContractHistory.hbm.xml
View File

@@ -17,6 +17,7 @@
<property column="ChangeType" type="BS.Shared.StatementType, BS.Shared" name="ChangeType" />
<property column="ContractHistoryEmployeeOid" type="Int64" name="ContractHistoryEmployeeOid"/>
<property column="ContractHistoryHourlyRate" type="Decimal" name="ContractHistoryHourlyRate" />
<property column="ContractHistoryGrossSalary" type="Decimal" name="ContractHistoryGrossSalary" />
<property column="ContractHistoryWeeklyFLS" type="Decimal" name="ContractHistoryWeeklyFLS" />
<property column="ContractHistoryMonthlyFLS" type="Decimal" name="ContractHistoryMonthlyFLS" />
<property column="ContractHistoryWeeklyTotalHours" type="Decimal" name="ContractHistoryWeeklyTotalHours" />

2
Data/Mappings/Employee.hbm.xml
View File

@@ -9,6 +9,8 @@
<property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
<property column="PersonnelNumber" type="String" name="PersonnelNumber" length="128" />
<property column="TaxNumber" type="String" name="TaxNumber" length="128" />
<property column="TaxClass" type="String" name="TaxClass" />
<property column="ChildCount" type="String" name="ChildCount" />
<property column="HealthInsurance" type="String" name="HealthInsurance" length="128" />
<property column="InsuranceNumber" type="String" name="InsuranceNumber" length="128" />
<property column="IsQualified" type="Boolean" name="IsQualified" />

2
Data/Mappings/EmployeeHistory.hbm.xml
View File

@@ -22,6 +22,8 @@
<property column="Employee_Tid" type="BS.Shared.TableID, BS.Shared" name="Employee_Tid" />
<property column="Employee_PersonnelNumber" type="string" name="Employee_PersonnelNumber" />
<property column="Employee_TaxNumber" type="string" name="Employee_TaxNumber" />
<property column="Employee_TaxClass" type="string" name="Employee_TaxClass" />
<property column="Employee_ChildCount" type="string" name="Employee_ChildCount" />
<property column="Employee_HealthInsurance" type="string" name="Employee_HealthInsurance" />
<property column="Employee_InsuranceNumber" type="string" name="Employee_InsuranceNumber" />
<property column="Employee_HourlyRate" type="decimal" name="Employee_HourlyRate" />

13
Model/Changes_2025_07_31 Steuerklasse Kinder Bruttogehalt.txt Normal file
View File

@@ -0,0 +1,13 @@
ALTER TABLE `Employee`
ADD COLUMN `TaxClass` varchar(256) NULL DEFAULT NULL AFTER `TaxNumber`,
ADD COLUMN `ChildCount` varchar(256) NULL DEFAULT NULL AFTER `TaxClass`;
ALTER TABLE `EmployeeHistory`
ADD COLUMN `Employee_TaxClass` varchar(256) NULL DEFAULT NULL AFTER `Employee_TaxNumber`,
ADD COLUMN `Employee_ChildCount` varchar(256) NULL DEFAULT NULL AFTER `Employee_TaxClass`;
ALTER TABLE `Contract`
ADD COLUMN `GrossSalary` decimal(18,10) NULL DEFAULT NULL AFTER `CancellationPeriod`;
ALTER TABLE `ContractHistory`
ADD COLUMN `ContractHistoryGrossSalary` decimal(18,10) NULL DEFAULT NULL AFTER `ContractHistoryCancellationPeriod`;

2
Service/DCEntityMapper/ContractDC_Contract.cs
View File

@@ -15,6 +15,7 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.ContractEndDate = pEntity.ContractEndDate;
pDataContract.EntryDate = pEntity.EntryDate;
pDataContract.HourlyRate = pEntity.HourlyRate;
pDataContract.GrossSalary = pEntity.GrossSalary;
pDataContract.LeaveDays = pEntity.LeaveDays;
pDataContract.ProbationPeriod = pEntity.ProbationPeriod;
pDataContract.ProbationPeriod2 = pEntity.ProbationPeriod2;
@@ -54,6 +55,7 @@ namespace BeWo.Service.DCEntityMapper
pEntity.ContractEndDate = pDataContract.ContractEndDate;
pEntity.EntryDate = pDataContract.EntryDate;
pEntity.HourlyRate = pDataContract.HourlyRate;
pEntity.GrossSalary = pDataContract.GrossSalary;
pEntity.LeaveDays = pDataContract.LeaveDays;
pEntity.ProbationPeriod = pDataContract.ProbationPeriod;
pEntity.ProbationPeriod2 = pDataContract.ProbationPeriod2;

4
Service/DCEntityMapper/EmployeeDC_Employee.cs
View File

@@ -36,6 +36,8 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.InsuranceNumber = pEntity.InsuranceNumber;
pDataContract.PersonnelNumber = pEntity.PersonnelNumber;
pDataContract.TaxNumber = pEntity.TaxNumber;
pDataContract.TaxClass= pEntity.TaxClass;
pDataContract.ChildCount = pEntity.ChildCount;
pDataContract.EmployeeVersion = pEntity.Version;
pDataContract.IsQualified = pEntity.IsQualified;
pDataContract.EmployeeColor = pEntity.EmployeeColor;
@@ -153,6 +155,8 @@ namespace BeWo.Service.DCEntityMapper
pEntity.InsuranceNumber = pDataContract.InsuranceNumber;
pEntity.PersonnelNumber = pDataContract.PersonnelNumber;
pEntity.TaxNumber = pDataContract.TaxNumber;
pEntity.TaxClass = pDataContract.TaxClass;
pEntity.ChildCount = pDataContract.ChildCount;
pEntity.IsQualified = pDataContract.IsQualified;
pEntity.EmployeeColor = pDataContract.EmployeeColor;
pEntity.Text1 = pDataContract.Text1;

11
Service/ServiceUtils/History/HistoryCreator.cs
View File

@@ -45,8 +45,10 @@ namespace BeWo.ServiceUtils.History
Employee_Schutzstufe = newEmployee.Schutzstufe,
//Employee_Sequence,
Employee_SystemEntryID = originalEmployee.SystemEntryID,
Employee_TaxNumber = newEmployee.TaxNumber,
Employee_Text1 = newEmployee.Text1,
Employee_TaxNumber = newEmployee.TaxNumber,
Employee_TaxClass = newEmployee.TaxClass,
Employee_ChildCount = newEmployee.ChildCount,
Employee_Text1 = newEmployee.Text1,
Employee_Text2 = newEmployee.Text2,
Employee_Text3 = newEmployee.Text3,
Employee_Text4 = newEmployee.Text4,
@@ -141,8 +143,9 @@ namespace BeWo.ServiceUtils.History
ContractHistoryQualifikationsBedarfValueListEntryOid = contract.QualifikationsBedarfValueListEntry?.ValueListEntryOid,
ContractHistoryWeeklyDays = contract.WeeklyDays,
ContractHistoryWeeklyFLS = contract.WeeklyFLS,
ContractHistoryWeeklyTotalHours = contract.WeeklyTotalHours,
Notice = contract.Notice,
ContractHistoryWeeklyTotalHours = contract.WeeklyTotalHours,
ContractHistoryGrossSalary = contract.GrossSalary,
Notice = contract.Notice,
ChangeType = statementType
};
DAOFactory.GenericDAO.Insert(historyEntry);

3
Shared/DataContracts/ContractDC.cs
View File

@@ -33,6 +33,9 @@ namespace BS.Shared.DataContracts
[DataMember]
public decimal? HourlyRate { get; set; }
[DataMember]
public decimal? GrossSalary { get; set; }
[DataMember]
public DateTime? EntryDate { get; set; }

6
Shared/DataContracts/EmployeeDC.cs
View File

@@ -78,6 +78,12 @@ namespace BS.Shared.DataContracts
[DataMember]
public List<CustomerEmployeeRelationDC> RelatedCustomers { get; set; }
[DataMember]
public string ChildCount { get; set; }
[DataMember]
public string TaxClass { get; set; }
[DataMember]
public string TaxNumber { get; set; }