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

MH: AZ-Nachweis FFS angepasst

Browse Source
This commit is contained in:
Marcel Hirschle
2023-01-03 11:24:58 +01:00
parent e0e5eedf2a
commit cf7dc80a6b
3 changed files with 525 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
BeWo.sln
View File

@@ -573,6 +573,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PsychosozialeHilfenBochum",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AwoDortmund", "ReportImp\AwoDortmund\AwoDortmund.csproj", "{E8EDD4DA-61CC-49E2-8337-5E91D8C47417}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hiba", "ReportImp\Hiba\Hiba.csproj", "{2A5A0FC1-9FC8-42DD-8D88-8CBEBCB2AC71}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -4544,6 +4546,22 @@ Global
{E8EDD4DA-61CC-49E2-8337-5E91D8C47417}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{E8EDD4DA-61CC-49E2-8337-5E91D8C47417}.Release|x86.ActiveCfg = Release|Any CPU
{E8EDD4DA-61CC-49E2-8337-5E91D8C47417}.Release|x86.Build.0 = Release|Any CPU
{2A5A0FC1-9FC8-42DD-8D88-8CBEBCB2AC71}.Debug|.NET.ActiveCfg = Debug|Any CPU
{2A5A0FC1-9FC8-42DD-8D88-8CBEBCB2AC71}.Debug|.NET.Build.0 = Debug|Any CPU
{2A5A0FC1-9FC8-42DD-8D88-8CBEBCB2AC71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2A5A0FC1-9FC8-42DD-8D88-8CBEBCB2AC71}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2A5A0FC1-9FC8-42DD-8D88-8CBEBCB2AC71}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{2A5A0FC1-9FC8-42DD-8D88-8CBEBCB2AC71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{2A5A0FC1-9FC8-42DD-8D88-8CBEBCB2AC71}.Debug|x86.ActiveCfg = Debug|Any CPU
{2A5A0FC1-9FC8-42DD-8D88-8CBEBCB2AC71}.Debug|x86.Build.0 = Debug|Any CPU
{2A5A0FC1-9FC8-42DD-8D88-8CBEBCB2AC71}.Release|.NET.ActiveCfg = Release|Any CPU
{2A5A0FC1-9FC8-42DD-8D88-8CBEBCB2AC71}.Release|.NET.Build.0 = Release|Any CPU
{2A5A0FC1-9FC8-42DD-8D88-8CBEBCB2AC71}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2A5A0FC1-9FC8-42DD-8D88-8CBEBCB2AC71}.Release|Any CPU.Build.0 = Release|Any CPU
{2A5A0FC1-9FC8-42DD-8D88-8CBEBCB2AC71}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{2A5A0FC1-9FC8-42DD-8D88-8CBEBCB2AC71}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{2A5A0FC1-9FC8-42DD-8D88-8CBEBCB2AC71}.Release|x86.ActiveCfg = Release|Any CPU
{2A5A0FC1-9FC8-42DD-8D88-8CBEBCB2AC71}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -4826,6 +4844,7 @@ Global
{ED3DBD24-B774-41E5-A856-99FF78D828A8} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{8CC19D28-E0C0-473F-A465-D2E5990C7789} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{E8EDD4DA-61CC-49E2-8337-5E91D8C47417} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{2A5A0FC1-9FC8-42DD-8D88-8CBEBCB2AC71} = {D8A691C5-146D-4613-86CC-438F02FE9106}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}

6
ReportImp/FreundeskreisSuchthilfe/Mitarbeiterarbeitszeitkonto.cs
View File

@@ -45,6 +45,7 @@ namespace FreundeskreisSuchthilfe.Alt
// Mit foreach durch die Tage laufen, und bis zu jedem Sonntag die Tage in eine Liste sammeln, um dann nach einem Sonntag ein neues Objekt (Datum Sonntag Abend
// für Sortierung) erzeugen, wo in Custom1 dann "Gesamt steht" und die summierten Wochenstunden drin stehen, restlichen Datenfelder können dann leer sein.
decimal wochenstunden = 0;
decimal gesamtstunden = 0;
var daysInMonth = ed.Days.Count;
List<MitarbeiterstundenkontoRO.DayDetail> wochenSummaries = new List<MitarbeiterstundenkontoRO.DayDetail>();
foreach (var day in ed.Days)
@@ -53,8 +54,9 @@ namespace FreundeskreisSuchthilfe.Alt
day.Custom2 = string.Format("{0:0.00}", ed.SollProTag);
day.MinutesTotal = day.MinutesTotal / 60;
day.Custom3 = (day.MinutesTotal - ed.SollProTag > 0) ? string.Format("{0:0.00}", day.MinutesTotal - ed.SollProTag) : "";
day.Custom4 = string.Format("{0:0}", day.PauseInMinuten);
day.Custom4 = day.PauseInMinuten == 0 ? "" : string.Format("{0:0}", day.PauseInMinuten);
wochenstunden += day.MinutesTotal;
gesamtstunden += day.MinutesTotal;
if (day.IstSonntag || day.Date.Day == daysInMonth)
{
var summary = new MitarbeiterstundenkontoRO.DayDetail();
@@ -65,6 +67,8 @@ namespace FreundeskreisSuchthilfe.Alt
wochenstunden = 0;
}
}
ed.Custom1 = gesamtstunden;
foreach (var s in wochenSummaries)
ed.Days.Add(s);
ed.Days = ed.Days.OrderBy(d => d.Date).ToList();

1002
ReportImp/FreundeskreisSuchthilfe/Mitarbeiterarbeitszeitkonto.designer.cs generated
View File

File diff suppressed because it is too large Load Diff