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

cb

Browse Source
This commit is contained in:
Christian
2023-01-17 00:12:53 +01:00
parent f3cc657a00
commit 4e9e5d53ba
8 changed files with 64 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ReportImp/AutismusKoelnBonn/LeistungsnachweisJugendamt.cs
View File

@@ -244,15 +244,18 @@ namespace AutismusKoelnBonn //BetreutesWohnen Stelzel
if (scap.ServiceCategory == null || scap.ServiceCategory.ServiceCategoryOid == item.ServiceDescription.ServiceCategory.Oid)
if (item.Start.Value < end)
{
minutenIstBisEndeBeleg +=
(item.RoundedDuration *
item.ServiceDescription.ServiceCategory.Percentage) / 100;
var prozent = item.ServiceDescription.ServiceCategory.ProzentAbrechnung;
if (item.ServiceDescription.ProzentAbrechnung.HasValue)
{
prozent = item.ServiceDescription.ProzentAbrechnung.Value;
}
minutenIstBisEndeBeleg += (item.RoundedDuration * prozent) / 100;
if (item.Start.Value < endeVormonat.AddDays(1))
{
minutenIstVormonat +=
(item.RoundedDuration * item.ServiceDescription.ServiceCategory
.Percentage) / 100;
minutenIstVormonat += (item.RoundedDuration * prozent) / 100;
}
}
}

10
ReportImp/LebenshilfeWuerzburgReports/Hilfeplanuebersicht.cs
View File

@@ -276,10 +276,16 @@ namespace BeWo.LebenshilfeWuerzburgReports
private decimal GetBillableDurationInMinutes(ServiceRecord record)
{
decimal rdMinutes = record.RoundedDuration;
if (record.ServiceDescription.ServiceCategory.Percentage != 100)
var prozent = record.ServiceDescription.ServiceCategory.ProzentAbrechnung;
if (record.ServiceDescription.ProzentAbrechnung.HasValue)
{
rdMinutes = (rdMinutes * record.ServiceDescription.ServiceCategory.Percentage) / 100;
prozent = record.ServiceDescription.ProzentAbrechnung.Value;
}
rdMinutes *= prozent / 100;
if (record.GroupEmployeeCount.HasValue)
rdMinutes /= record.GroupEmployeeCount.Value;

14
ReportImp/Nous/LeistungsnachweisFamilienhilfe.cs
View File

@@ -255,15 +255,17 @@ namespace Nous
if (scap.ServiceCategory == null || scap.ServiceCategory.ServiceCategoryOid == item.ServiceDescription.ServiceCategory.Oid)
if (item.Start.Value < end)
{
minutenIstBisEndeBeleg +=
(item.RoundedDuration *
item.ServiceDescription.ServiceCategory.Percentage) / 100;
var prozent = item.ServiceDescription.ServiceCategory.ProzentAbrechnung;
if (item.ServiceDescription.ProzentAbrechnung.HasValue)
{
prozent = item.ServiceDescription.ProzentAbrechnung.Value;
}
minutenIstBisEndeBeleg += (item.RoundedDuration * prozent) / 100;
if (item.Start.Value < endeVormonat.AddDays(1))
{
minutenIstVormonat +=
(item.RoundedDuration * item.ServiceDescription.ServiceCategory
.Percentage) / 100;
minutenIstVormonat += (item.RoundedDuration * prozent) / 100;
}
}

16
ReportImp/PflegedienstWessel/MitarbeiterstundenkontoBerechnung.cs
View File

@@ -22,13 +22,17 @@ namespace PflegedienstWessel
if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null)
{
var p = item.ServiceDescription.ServiceCategory.Percentage;
var p = item.ServiceDescription.ServiceCategory.ProzentAbrechnung;
if (item.ServiceDescription.ProzentAbrechnung.HasValue)
{
p = item.ServiceDescription.ProzentAbrechnung.Value;
//if (item.Relevance.HasValue)
//{
// int test = 0;
//}
if (p != 100 && p > 0 && !item.Relevance.HasValue)
}
//if (item.Relevance.HasValue)
//{
// int test = 0;
//}
if (p != 100 && p > 0 && !item.Relevance.HasValue)
{
item.RoundedDuration *= (p/100);
item.GroupRoundedDuration *= (p / 100);

8
ReportImp/SBBMainzReports/QuittierungsbelegJaMainz.cs
View File

@@ -324,7 +324,13 @@ namespace SBBMainzReports
{
if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null && item.ServiceDescription.ServiceCategory.IsBillable)
{
ist += (item.RoundedDuration * item.ServiceDescription.ServiceCategory.Percentage) / 100;
var p = item.ServiceDescription.ServiceCategory.ProzentAbrechnung;
if (item.ServiceDescription.ProzentAbrechnung.HasValue)
{
p = item.ServiceDescription.ProzentAbrechnung.Value;
}
ist += (item.RoundedDuration * p) / 100;
if (item.GroupOid.HasValue)
groupBookingDict.Add(item.GroupOid.Value, true);

8
ReportImp/SBBMainzReports/QuittierungsbelegJaMainzWiJu.cs
View File

@@ -259,7 +259,13 @@ namespace SBBMainzReports
{
if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null && item.ServiceDescription.ServiceCategory.IsBillable)
{
ist += (item.RoundedDuration * item.ServiceDescription.ServiceCategory.Percentage) / 100;
var p = item.ServiceDescription.ServiceCategory.ProzentAbrechnung;
if (item.ServiceDescription.ProzentAbrechnung.HasValue)
{
p = item.ServiceDescription.ProzentAbrechnung.Value;
}
ist += (item.RoundedDuration * p) / 100;
if (item.GroupOid.HasValue)
groupBookingDict.Add(item.GroupOid.Value, true);

8
ReportImp/SBBMainzReports/QuittierungsbelegJugendamt.cs
View File

@@ -198,7 +198,13 @@ namespace SBBMainzReports
{
if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null && item.ServiceDescription.ServiceCategory.IsBillable)
{
ist += (item.RoundedDuration * item.ServiceDescription.ServiceCategory.Percentage) / 100;
var p = item.ServiceDescription.ServiceCategory.ProzentAbrechnung;
if (item.ServiceDescription.ProzentAbrechnung.HasValue)
{
p = item.ServiceDescription.ProzentAbrechnung.Value;
}
ist += (item.RoundedDuration * p) / 100;
if (item.GroupOid.HasValue)
groupBookingDict.Add(item.GroupOid.Value, true);

10
ReportImp/ZMDLengerichReports/ServicesOverviewReport.cs
View File

@@ -216,8 +216,14 @@ namespace BeWo.ZMDLengerichReports
item.ServiceDescription.ServiceCategory != null &&
item.ServiceDescription.ServiceCategory.IsBillable)
{
minutenIst += (item.RoundedDuration *
item.ServiceDescription.ServiceCategory.Percentage) / 100;
var p = item.ServiceDescription.ServiceCategory.ProzentAbrechnung;
if (item.ServiceDescription.ProzentAbrechnung.HasValue)
{
p = item.ServiceDescription.ProzentAbrechnung.Value;
}
minutenIst += (item.RoundedDuration * p) / 100;
if (item.GroupOid.HasValue)
groupBookingDict.Add(item.GroupOid.Value, true);