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

MH: Urlaubskonto Bugfix

Browse Source
This commit is contained in:
HirschleM
2025-04-09 16:29:23 +02:00
parent 3564a0675d
commit b6bf3447b5
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Report/Report.csproj.user
View File

@@ -9,6 +9,6 @@
<ErrorReportUrlHistory />
<FallbackCulture>de-DE</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
<ProjectView>ProjectFiles</ProjectView>
<ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
</Project>

6
Service/Plugins/VacationService.cs
View File

@@ -471,6 +471,10 @@ namespace BeWo.Service.Plugins
abzuziehendeTage = (decimal)leaveDays - tageNachAbzug;
}
#endregion
if (contract == null || contract != null && !contract.EntryDate.HasValue)
{
continue;
}
var contractStart = contract.EntryDate.Value.ToString().Split(' ');
var contractEnd = contract.ContractEndDate != null ? contract.ContractEndDate.Value.ToString().Split(' ') : null;
@@ -654,7 +658,7 @@ namespace BeWo.Service.Plugins
var anzTage = aktuellesKonto.Value.ResturlaubVorjahrTotal > 0 && aktuellesKonto.Value.VerfallenerUrlaub <= 0 ? aktuellesKonto.Value.Resturlaub + aktuellesKonto.Value.ResturlaubVorjahr : aktuellesKonto.Value.Resturlaub;
dcs.Add(new UrlaubskontoDarstellungDC()
{
AnzahlTage = string.Format("={0:0.00}", anzTage),
AnzahlTage = string.Format("{0:0.00}", anzTage),
Erlaeuterung = "Summe der verbleibenden Urlaubstage: ",
Herkunft = "UrlaubskontoEmpOid" + aktuellesKonto.Value.EmployeeOid,
Tooltip = null,

2
Service/Service.csproj.user
View File

@@ -9,6 +9,6 @@
<ErrorReportUrlHistory />
<FallbackCulture>de-DE</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
<ProjectView>ShowAllFiles</ProjectView>
<ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
</Project>