diff --git a/ReportImp/Nous/LeistungsnachweisFamilienhilfe.cs b/ReportImp/Nous/LeistungsnachweisFamilienhilfe.cs index 02bc81804..248cf8d81 100644 --- a/ReportImp/Nous/LeistungsnachweisFamilienhilfe.cs +++ b/ReportImp/Nous/LeistungsnachweisFamilienhilfe.cs @@ -135,44 +135,53 @@ namespace Nous if (adList.Count > 0) { var ad = adList[0]; - cellBewilligtProWoche1.Text = String.Format("{0:0.00}", ad.ApprovedHoursPerWeek); - cellStdBewZeitraum.Text = String.Format("{0:0.00}", ad.ApprovedHoursInTimeSpan); - cellBewilligtProWoche12.Text = String.Format("{0:0.00}", ad.ApprovedHoursPerWeek); - cellBewilligungStart.Text = String.Format("{0:dd.MM.yyyy}", ad.TotalStartDate); - cellBewilligungEnd.Text = String.Format("{0:dd.MM.yyyy}", ad.TotalEndDate); - - cellApprovedTotal1.Text = String.Format("{0:0.00}", ad.ApprovedHoursTotal); - cellStundenVormonat1.Text = String.Format("{0:0.00}", ad.UsedHoursPreviousMonths); - cellRestStunden1.Text = String.Format("{0:0.00}", ad.RemainingHoursTotal); - - approvedHoursTotal += ad.ApprovedHoursTotal; - usedHoursPreviousMonthsTotal += ad.UsedHoursPreviousMonths; - approvedHoursInTimeSpan += ad.ApprovedHoursInTimeSpan; - remainingHoursTotal += ad.RemainingHoursTotal; - - if (adList.Count > 1) + if (ad.ApprovedHoursTotal != 0) { - ad = adList[1]; - cellBewilligtProWoche2.Text = String.Format("{0:0.00}", ad.ApprovedHoursPerWeek); + cellBewilligtProWoche1.Text = String.Format("{0:0.00}", ad.ApprovedHoursPerWeek); - cellBewilligtVon2.Text = String.Format("{0:dd.MM.yyyy}", ad.TimeSpanStartDate); - cellBewilligtBis2.Text = String.Format("{0:dd.MM.yyyy}", ad.TimeSpanEndDate); + cellStdBewZeitraum.Text = String.Format("{0:0.00}", ad.ApprovedHoursInTimeSpan); + cellBewilligtProWoche12.Text = String.Format("{0:0.00}", ad.ApprovedHoursPerWeek); + cellBewilligungStart.Text = String.Format("{0:dd.MM.yyyy}", ad.TotalStartDate); + cellBewilligungEnd.Text = String.Format("{0:dd.MM.yyyy}", ad.TotalEndDate); - cellStdBewZeitraum2.Text = String.Format("{0:0.00}", ad.ApprovedHoursInTimeSpan); - cellBewilligtProWoche22.Text = String.Format("{0:0.00}", ad.ApprovedHoursPerWeek); - cellBewilligungStart2.Text = String.Format("{0:dd.MM.yyyy}", ad.TotalStartDate); - cellBewilligungEnd2.Text = String.Format("{0:dd.MM.yyyy}", ad.TotalEndDate); - - cellApprovedTotal2.Text = String.Format("{0:0.00}", ad.ApprovedHoursTotal); - cellStundenVormonat2.Text = String.Format("{0:0.00}", ad.UsedHoursPreviousMonths); - cellRestStunden2.Text = String.Format("{0:0.00}", ad.RemainingHoursTotal); + cellApprovedTotal1.Text = String.Format("{0:0.00}", ad.ApprovedHoursTotal); + cellStundenVormonat1.Text = String.Format("{0:0.00}", ad.UsedHoursPreviousMonths); + cellRestStunden1.Text = String.Format("{0:0.00}", ad.RemainingHoursTotal); approvedHoursTotal += ad.ApprovedHoursTotal; usedHoursPreviousMonthsTotal += ad.UsedHoursPreviousMonths; approvedHoursInTimeSpan += ad.ApprovedHoursInTimeSpan; remainingHoursTotal += ad.RemainingHoursTotal; } + + + if (adList.Count > 1) + { + ad = adList[1]; + + if (ad.ApprovedHoursTotal != 0) + { + cellBewilligtProWoche2.Text = String.Format("{0:0.00}", ad.ApprovedHoursPerWeek); + + cellBewilligtVon2.Text = String.Format("{0:dd.MM.yyyy}", ad.TimeSpanStartDate); + cellBewilligtBis2.Text = String.Format("{0:dd.MM.yyyy}", ad.TimeSpanEndDate); + + cellStdBewZeitraum2.Text = String.Format("{0:0.00}", ad.ApprovedHoursInTimeSpan); + cellBewilligtProWoche22.Text = String.Format("{0:0.00}", ad.ApprovedHoursPerWeek); + cellBewilligungStart2.Text = String.Format("{0:dd.MM.yyyy}", ad.TotalStartDate); + cellBewilligungEnd2.Text = String.Format("{0:dd.MM.yyyy}", ad.TotalEndDate); + + cellApprovedTotal2.Text = String.Format("{0:0.00}", ad.ApprovedHoursTotal); + cellStundenVormonat2.Text = String.Format("{0:0.00}", ad.UsedHoursPreviousMonths); + cellRestStunden2.Text = String.Format("{0:0.00}", ad.RemainingHoursTotal); + + approvedHoursTotal += ad.ApprovedHoursTotal; + usedHoursPreviousMonthsTotal += ad.UsedHoursPreviousMonths; + approvedHoursInTimeSpan += ad.ApprovedHoursInTimeSpan; + remainingHoursTotal += ad.RemainingHoursTotal; + } + } }