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

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

Browse Source
This commit is contained in:
Alexandra
2024-04-18 13:57:58 +02:00
parent 2534d20507 92359312ea
commit 53a09a3e02
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Report/ReportObjects/AuslastungBerechnung.cs
View File

@@ -420,12 +420,14 @@ namespace BeWo.Report.ReportObjects
var stats = new ServiceRecordStatisticFactory().CreateSupportConceptStatisticsImpl(cb2sc.Oid.Value, DateTime.Now);
if (stats.PeriodStatistics != null && stats.PeriodStatistics.Any(s => s.SupportConceptApprovalPeriod.SupportConceptApprovalPeriodOid == scap.Oid))
scDC.FreiProWoche = stats.PeriodStatistics.First(s => s.SupportConceptApprovalPeriod.SupportConceptApprovalPeriodOid == scap.Oid).MinutesFreePerWeek / 60;
// Prozentwert aus der Bewilligung einbeziehen
if (scap.SupportConceptApprovalPeriod2Employee != null && scap.SupportConceptApprovalPeriod2Employee.Any(s2e => s2e.Employee.Oid == emp.Oid))
{
var faktor = scap.SupportConceptApprovalPeriod2Employee.First(s2e => s2e.Employee.Oid == emp.Oid).Betreuungsschluessel;
scDC.FreiProWoche *= faktor / 100;
}
if (!anteil.IsBetreuungsschluesselAbsolut)
scDC.FreiProWoche *= anteil.AnteilAnBetreuung / 100;
// Minutenwert aus der Bewilligung einbeziehen
else
scDC.FreiProWoche *= anteil.AnteilAnBetreuung / stats.MinutesApprovedPerWeek;
DateTime end = ende;
if (realEnd.HasValue && realEnd.Value < end)