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

AwoDortmund DiamantExporter

Browse Source
This commit is contained in:
Alexandra
2022-09-07 15:59:28 +02:00
parent d623eda8df
commit 7690e80d82
4 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ReportImp/AKGG/Quittierungsbeleg.cs
View File

@@ -29,6 +29,14 @@ namespace Akgg
//if (pRO == null)
// return;
var approved = pRO.ApprovedFLSPerWeek;
var stats = GetStatistics(pRO);
if (stats != null)
approved = stats.MinutesApprovedPerWeek / 60;
lblBewilligteStunden.Text = string.Format("{0:0.##} Std./wöchentlich", approved);
if (pRO.Services != null)
{
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
@@ -53,17 +61,7 @@ namespace Akgg
pRO.Services = servicesBillable;
}
var approved = pRO.ApprovedFLSPerWeek;
var stats = GetStatistics(pRO);
if (stats != null)
approved = stats.MinutesApprovedPerWeek / 60;
lblBewilligteStunden.Text = string.Format("{0:0.##} Std./wöchentlich", approved);
bindingSource1.DataSource = pRO;
}
private SupportConceptPeriodStatisticsDC GetStatistics(ServicesOverviewRO ro)

6
ReportImp/AKGG/QuittierungsbelegPK.cs
View File

@@ -1,13 +1,7 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Text.RegularExpressions;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BeWo.Service.ServiceImplementations;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using DevExpress.XtraReports.UI;
namespace Akgg

7
ReportImp/AwoDortmund/Export/DiamantExporter.cs
View File

@@ -97,7 +97,7 @@ namespace AwoDortmund.Export
dtOffenerTreff = ExecuteQuery(otSql, date);
cats = new List<long>();
cats.Add(50); // Offener Treff
cats.Add(50); // Soziotherapie
var soziSql = GetMonatlicheAbrechnungStringForCatsSql(date, cats, null);
dtSoziTreff = ExecuteQuery(soziSql, date);
}
@@ -121,6 +121,11 @@ namespace AwoDortmund.Export
oid2Row.Add(oid, row);
mergedRows.Add(row);
}
//Nach Änderung der Rechnungslogik - Aushebeln des Merge für Soziotherapie und verwandte Leistungen
else if (oid2Row.ContainsKey(oid) && (c2sOid2AssiBetrag.ContainsKey(oid) || c2sOid2SoziBetrag.ContainsKey(oid)))
{
mergedRows.Add(row);
}
else
{
var firstRow = oid2Row[oid];

1
ReportImp/AwoDortmund/Invoicing/CustomInvoiceFactory.cs
View File

@@ -11,7 +11,6 @@ namespace AwoDortmund.Invoicing
public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
{
// hier muss eine Differenzierung rein -> RatPlusTat -> je eine Rechnung für Sozio, Assistenz und Wohngruppenzuschlag erzeugen
foreach (var list in supportConcepts2ServiceRecords.Values)
{
foreach (var sr in list)