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 into master

Browse Source
This commit is contained in:
Marcel Hirschle
2023-10-16 14:37:02 +02:00
parent 6e11246a7b 4b1ad336e3
commit f32d8441cf
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ReportImp/BetreutesWohnenWoellReports/SettlementReport2.cs
View File

@@ -19,6 +19,7 @@ namespace BeWo.BetreutesWohnenWoellReports
public void SetReportDataSource(Settlement2RO pRO)
{
decimal rateFactor = 1;
bool assistenzRechnung = false;
foreach (var ii in pRO.InvoiceItems)
{
@@ -31,14 +32,16 @@ namespace BeWo.BetreutesWohnenWoellReports
if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0)
{
GroupFooter2.Visible = true;
//if (!ii.ItemDescription.IsNullOrEmpty())
//{
//ii.AbrechnungsText = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte");
//}
ii.AbrechnungsText = ii.AbrechnungsText.Replace("FLS", "Std.");
ii.ItemDescription = "Fehlkontakte";
}
else if (ii.ItemDescription.IsNullOrEmpty())
else if (ii.ItemDescription != null && ii.ItemDescription.ToLower().StartsWith("assistenz"))
{
assistenzRechnung = true;
ii.AbrechnungsText = ii.AbrechnungsText.Replace("FLS", "ASS");
ii.ItemDescription = "Assistenzstunden";
}
else
{
ii.ItemDescription = "Fachleistungsstunden";
}
@@ -46,6 +49,15 @@ namespace BeWo.BetreutesWohnenWoellReports
pRO.RateFactor = (double)rateFactor;
this.Zwischensumme.DataSource = pRO;
if (assistenzRechnung)
{
xrTableCell4.Text = "Bewilligte Assistenzstunden(ASS) gesamt:";
if (pRO.ApprovedFLS != null)
{
pRO.ApprovedFLS = pRO.ApprovedFLS.Replace("FLS", "ASS");
}
}
}
}
}