diff --git a/ReportImp/Mittelpunkt/Mittelpunkt.csproj b/ReportImp/Mittelpunkt/Mittelpunkt.csproj
index 3de0c8b14..307db377a 100644
--- a/ReportImp/Mittelpunkt/Mittelpunkt.csproj
+++ b/ReportImp/Mittelpunkt/Mittelpunkt.csproj
@@ -31,6 +31,7 @@
4
+
@@ -39,6 +40,7 @@
+
diff --git a/ReportImp/Mittelpunkt/Teamstundenkonto.cs b/ReportImp/Mittelpunkt/Teamstundenkonto.cs
index 2ca406569..197f3c949 100644
--- a/ReportImp/Mittelpunkt/Teamstundenkonto.cs
+++ b/ReportImp/Mittelpunkt/Teamstundenkonto.cs
@@ -1,4 +1,5 @@
using System;
+using System.Linq;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
@@ -30,6 +31,8 @@ namespace Mittelpunkt
{
foreach (var emp in team.EmployeeDetailList)
{
+ emp.Custom4 = emp.Days.Sum(d => d.SpecialHours);
+ nacht += emp.Days.Sum(d => d.SpecialHours);
foreach (var day in emp.Days)
{
// Custom1 Samstagsarbeit 13-21 Uhr
@@ -56,10 +59,6 @@ namespace Mittelpunkt
// Custom3 Feiertagsarbeit
emp.Custom3 += day.HoursHoliday;
feiertag += day.HoursHoliday;
-
- // Custom4 Nachtarbeit 21-05:59 Uhr
- emp.Custom4 += day.SpecialHours;
- nacht += day.SpecialHours;
}
}
}
diff --git a/ReportImp/Mittelpunkt/Teamstundenkonto.designer.cs b/ReportImp/Mittelpunkt/Teamstundenkonto.designer.cs
index 291286ce4..437739a40 100644
--- a/ReportImp/Mittelpunkt/Teamstundenkonto.designer.cs
+++ b/ReportImp/Mittelpunkt/Teamstundenkonto.designer.cs
@@ -36,7 +36,6 @@ namespace Mittelpunkt
DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
- DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
@@ -103,6 +102,8 @@ namespace Mittelpunkt
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -113,8 +114,6 @@ namespace Mittelpunkt
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.ReportFooter1 = new DevExpress.XtraReports.UI.ReportFooterBand();
- this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -361,8 +360,7 @@ namespace Mittelpunkt
this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "MittelbarIst")});
this.cellGesamtGesamt.Name = "cellGesamtGesamt";
- xrSummary3.FormatString = "{0:0.00}";
- this.cellGesamtGesamt.Summary = xrSummary3;
+ this.cellGesamtGesamt.TextFormatString = "{0:0.00}";
this.cellGesamtGesamt.Weight = 0.07034238466171662D;
//
// cellRelationGesamt
@@ -721,6 +719,18 @@ namespace Mittelpunkt
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell1.Weight = 0.1723637517853702D;
//
+ // xrTableCell40
+ //
+ this.xrTableCell40.Multiline = true;
+ this.xrTableCell40.Name = "xrTableCell40";
+ this.xrTableCell40.Weight = 0.091251378285254509D;
+ //
+ // xrTableCell36
+ //
+ this.xrTableCell36.Multiline = true;
+ this.xrTableCell36.Name = "xrTableCell36";
+ this.xrTableCell36.Weight = 0.10550482044001053D;
+ //
// xrTableCell7
//
this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -734,9 +744,9 @@ namespace Mittelpunkt
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.Custom1")});
this.xrTableCell8.Name = "xrTableCell8";
- xrSummary4.FormatString = "{0:0.00}";
- xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
- this.xrTableCell8.Summary = xrSummary4;
+ xrSummary3.FormatString = "{0:0.00}";
+ xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell8.Summary = xrSummary3;
this.xrTableCell8.Weight = 0.081112310652748321D;
//
// xrTableCell9
@@ -744,8 +754,8 @@ namespace Mittelpunkt
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.Custom2")});
this.xrTableCell9.Name = "xrTableCell9";
- xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
- this.xrTableCell9.Summary = xrSummary5;
+ xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell9.Summary = xrSummary4;
this.xrTableCell9.TextFormatString = "{0:0.00}";
this.xrTableCell9.Weight = 0.081112343371616713D;
//
@@ -754,9 +764,9 @@ namespace Mittelpunkt
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.Custom3")});
this.xrTableCell10.Name = "xrTableCell10";
- xrSummary6.FormatString = "{0:0.00}";
- xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
- this.xrTableCell10.Summary = xrSummary6;
+ xrSummary5.FormatString = "{0:0.00}";
+ xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell10.Summary = xrSummary5;
this.xrTableCell10.TextFormatString = "{0:0.00}";
this.xrTableCell10.Weight = 0.081112307920662666D;
//
@@ -765,9 +775,9 @@ namespace Mittelpunkt
this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.Custom4")});
this.xrTableCell11.Name = "xrTableCell11";
- xrSummary7.FormatString = "{0:0.00}";
- xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
- this.xrTableCell11.Summary = xrSummary7;
+ xrSummary6.FormatString = "{0:0.00}";
+ xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell11.Summary = xrSummary6;
this.xrTableCell11.Weight = 0.0811124973215744D;
//
// xrTableCell12
@@ -800,18 +810,6 @@ namespace Mittelpunkt
this.ReportFooter1.HeightF = 43.75F;
this.ReportFooter1.Name = "ReportFooter1";
//
- // xrTableCell36
- //
- this.xrTableCell36.Multiline = true;
- this.xrTableCell36.Name = "xrTableCell36";
- this.xrTableCell36.Weight = 0.10550482044001053D;
- //
- // xrTableCell40
- //
- this.xrTableCell40.Multiline = true;
- this.xrTableCell40.Name = "xrTableCell40";
- this.xrTableCell40.Weight = 0.091251378285254509D;
- //
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);