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

BeWoDarmstadt/Teamuebersicht - erste Fixversuche

Browse Source 
SupportOID=160191
This commit is contained in:
Alexandra
2026-04-17 08:33:15 +02:00
parent dc842d3d03
commit e29f55d9ef
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ReportImp/BeWoDarmstadt/BeWoDarmstadt.csproj
View File

@@ -82,6 +82,12 @@
</Compile>
<Compile Include="Service\CustomVacationService.cs" />
<Compile Include="Service\ServiceRecordDurationCalculator.cs" />
<Compile Include="TeamuebersichtKA.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="TeamuebersichtKA.designer.cs">
<DependentUpon>TeamuebersichtKA.cs</DependentUpon>
</Compile>
<Compile Include="Teamuebersicht.cs">
<SubType>Component</SubType>
</Compile>
@@ -127,6 +133,10 @@
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="TeamuebersichtKA.resx">
<DependentUpon>TeamuebersichtKA.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Teamuebersicht.resx">
<DependentUpon>Teamuebersicht.cs</DependentUpon>
<SubType>Designer</SubType>

6
ReportImp/BeWoDarmstadt/Teamuebersicht.cs
View File

@@ -59,11 +59,9 @@ namespace BeWoDarmstadt
{
foreach (var sr in scRo.ServiceRecords)
{
if (sr.GroupRoundedDuration != null && sr.GroupRoundedDuration != 0 &&
sr.Start >= pRO.ReportStartDate.Value && sr.Start.Value.Date <= end)
if (sr.GroupRoundedDuration != null && sr.GroupRoundedDuration != 0 && sr.Start >= pRO.ReportStartDate.Value && sr.Start.Value.Date <= end)
scRo.AmountPaid += sr.RoundedDuration / 60;
if (sr.ServiceDescription != null && sr.ServiceDescription.Name == "ZwR" &&
sr.Start >= pRO.ReportStartDate.Value && sr.Start.Value.Date <= end)
if (sr.ServiceDescription != null && sr.ServiceDescription.Name == "ZwR" && sr.Start >= pRO.ReportStartDate.Value && sr.Start.Value.Date <= end)
scRo.AmountTotal += sr.RoundedDuration / 60;
if (sr.Start >= monthStart && sr.Start.Value.Date <= end)
{