diff --git a/ReportImp/FlexibleJugendarbeitFrankfurtEV/FlexibleJugendarbeitFrankfurtEV.csproj b/ReportImp/FlexibleJugendarbeitFrankfurtEV/FlexibleJugendarbeitFrankfurtEV.csproj
index 7755dce00..e46db4b7a 100644
--- a/ReportImp/FlexibleJugendarbeitFrankfurtEV/FlexibleJugendarbeitFrankfurtEV.csproj
+++ b/ReportImp/FlexibleJugendarbeitFrankfurtEV/FlexibleJugendarbeitFrankfurtEV.csproj
@@ -88,6 +88,7 @@
Resources.resx
+
diff --git a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisEFH.Designer.cs b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisEFH.Designer.cs
index a0677fb13..2a67129f1 100644
--- a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisEFH.Designer.cs
+++ b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisEFH.Designer.cs
@@ -51,6 +51,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
@@ -100,11 +101,12 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
this.FLS = new DevExpress.XtraReports.UI.CalculatedField();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -230,7 +232,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
//
this.xrTableCell50.CanGrow = false;
this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeAbbr")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeLastName")});
this.xrTableCell50.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.xrTableCell50.Name = "xrTableCell50";
this.xrTableCell50.StylePriority.UseBorders = false;
@@ -356,6 +358,10 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell49.Weight = 0.8030731532324924D;
//
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+ //
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -366,6 +372,8 @@ namespace FlexibleJugendarbeitFrankfurtEV
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel9,
+ this.xrLabel17,
this.xrLabel20,
this.xrLabel19,
this.xrLabel24,
@@ -381,7 +389,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.xrLabel4,
this.xrLabel3,
this.xrLabel2});
- this.ReportHeader.HeightF = 208.0417F;
+ this.ReportHeader.HeightF = 230.4167F;
this.ReportHeader.Name = "ReportHeader";
//
// xrLabel20
@@ -390,7 +398,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.xrLabel20.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel20.CanGrow = false;
this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))));
- this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0F, 188.0417F);
+ this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0F, 210.4167F);
this.xrLabel20.Name = "xrLabel20";
this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel20.SizeF = new System.Drawing.SizeF(370.8847F, 20F);
@@ -426,7 +434,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel24.CanGrow = false;
this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
- this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 133.5418F);
+ this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 153.5418F);
this.xrLabel24.Name = "xrLabel24";
this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel24.SizeF = new System.Drawing.SizeF(370.8847F, 20F);
@@ -443,7 +451,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.xrLabel25.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel25.CanGrow = false;
this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
- this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(370.8848F, 133.5418F);
+ this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(370.8851F, 153.5418F);
this.xrLabel25.Name = "xrLabel25";
this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel25.SizeF = new System.Drawing.SizeF(343.3181F, 20.00002F);
@@ -462,7 +470,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel26.CanGrow = false;
this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
- this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(0F, 153.5418F);
+ this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 173.5418F);
this.xrLabel26.Name = "xrLabel26";
this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel26.SizeF = new System.Drawing.SizeF(370.8847F, 20F);
@@ -479,7 +487,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.xrLabel27.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel27.CanGrow = false;
this.xrLabel27.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
- this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(370.8847F, 153.5418F);
+ this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(370.8849F, 173.5418F);
this.xrLabel27.Name = "xrLabel27";
this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel27.SizeF = new System.Drawing.SizeF(343.3183F, 20.00002F);
@@ -544,7 +552,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.StylePriority.UsePadding = false;
this.xrLabel7.StylePriority.UseTextAlignment = false;
- this.xrLabel7.Text = "AZ JHS-AZ WJH";
+ this.xrLabel7.Text = "AZ WJH";
this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel8
@@ -569,7 +577,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel6.CanGrow = false;
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
- this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(370.8847F, 113.5418F);
+ this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(370.8849F, 133.5418F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(343.3183F, 20.00002F);
@@ -606,7 +614,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel4.CanGrow = false;
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
- this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 113.5418F);
+ this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 133.5418F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(370.8847F, 20F);
@@ -1099,9 +1107,41 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.FLS.Expression = "Round([Minutes]/60,2)";
this.FLS.Name = "FLS";
//
- // bindingSource1
+ // xrLabel9
//
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+ this.xrLabel9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel9.CanGrow = false;
+ this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
+ this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(370.8847F, 113.5418F);
+ this.xrLabel9.Name = "xrLabel9";
+ this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.xrLabel9.SizeF = new System.Drawing.SizeF(343.3182F, 20.00002F);
+ this.xrLabel9.StylePriority.UseBackColor = false;
+ this.xrLabel9.StylePriority.UseBorders = false;
+ this.xrLabel9.StylePriority.UseFont = false;
+ this.xrLabel9.StylePriority.UsePadding = false;
+ this.xrLabel9.StylePriority.UseTextAlignment = false;
+ this.xrLabel9.Text = "[CostBearer2SupportConceptList.SupportConcept.Customer.DebitorNumber]";
+ this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ //
+ // xrLabel17
+ //
+ this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel17.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel17.CanGrow = false;
+ this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
+ this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 113.5418F);
+ this.xrLabel17.Name = "xrLabel17";
+ this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.xrLabel17.SizeF = new System.Drawing.SizeF(370.8847F, 20.00002F);
+ this.xrLabel17.StylePriority.UseBackColor = false;
+ this.xrLabel17.StylePriority.UseBorders = false;
+ this.xrLabel17.StylePriority.UseFont = false;
+ this.xrLabel17.StylePriority.UsePadding = false;
+ this.xrLabel17.StylePriority.UseTextAlignment = false;
+ this.xrLabel17.Text = "AZ JHS";
+ this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// LeistungnachweisEFH
//
@@ -1131,8 +1171,8 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1207,5 +1247,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel9;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel17;
}
}
diff --git a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisEFH.cs b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisEFH.cs
index b6ca6b3e9..189664f36 100644
--- a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisEFH.cs
+++ b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisEFH.cs
@@ -59,7 +59,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
{
asd += ", ";
}
- asd += c2p.Person.FirstNameLastName;
+ asd += c2p.Person.LastName;
}
}
}
@@ -85,7 +85,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
{
pRo.MainAttendantCommaSeperated += ", ";
}
- pRo.MainAttendantCommaSeperated += e.Employee.Person.FirstNameLastName;
+ pRo.MainAttendantCommaSeperated += e.Employee.Person.LastName;
}
}
}
diff --git a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisHFP.Designer.cs b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisHFP.Designer.cs
index 361d0230a..323313361 100644
--- a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisHFP.Designer.cs
+++ b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisHFP.Designer.cs
@@ -64,6 +64,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel36 = new DevExpress.XtraReports.UI.XRLabel();
@@ -124,7 +125,6 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.FLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldOPferd = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldFahrer = new DevExpress.XtraReports.UI.CalculatedField();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -287,7 +287,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell6.TextFormatString = "{0:0.00}";
+ this.xrTableCell6.TextFormatString = "{0:0}";
this.xrTableCell6.Weight = 0.078786087915180839D;
//
// GroupHeader1
@@ -570,6 +570,10 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell17.Weight = 0.16510209905516479D;
//
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+ //
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -620,6 +624,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CostBearer2SupportConceptList.SupportConcept.Notice")});
this.xrLabel36.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel36.LocationFloat = new DevExpress.Utils.PointFloat(0.006612142F, 290.8334F);
+ this.xrLabel36.Multiline = true;
this.xrLabel36.Name = "xrLabel36";
this.xrLabel36.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel36.SizeF = new System.Drawing.SizeF(726.0114F, 142.9167F);
@@ -1176,10 +1181,10 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.xrLabel20.StylePriority.UseFont = false;
this.xrLabel20.StylePriority.UsePadding = false;
this.xrLabel20.StylePriority.UseTextAlignment = false;
- xrSummary1.FormatString = "{0:0.00}";
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrLabel20.Summary = xrSummary1;
this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrLabel20.TextFormatString = "{0:0}";
//
// xrLabel19
//
@@ -1532,10 +1537,6 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.fieldFahrer.Expression = "Iif(Contains([ServiceDescription], \'Fahrer\'),Round([Minutes]/60, 2),\'\')\n";
this.fieldFahrer.Name = "fieldFahrer";
//
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
- //
// LeistungnachweisHFP
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
diff --git a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisHFP.cs b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisHFP.cs
index 85d150c43..5e8aef01f 100644
--- a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisHFP.cs
+++ b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisHFP.cs
@@ -49,7 +49,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
else if (sd.ServiceDescription.Contains("Fahrer"))
{
sd.ServiceCategoryAbbr = "";
- sd.FLSUnqualified = Math.Round(sd.Minutes / 60, 2, MidpointRounding.AwayFromZero);
+ sd.FLSUnqualified = 1;
}
servicesBillable.Add(sd);
}
@@ -77,7 +77,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
{
asd += ", ";
}
- asd += c2p.Person.FirstNameLastName;
+ asd += c2p.Person.LastName;
}
}
}
@@ -103,7 +103,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
{
pRo.MainAttendantCommaSeperated += ", ";
}
- pRo.MainAttendantCommaSeperated += e.Employee.Person.FirstNameLastName;
+ pRo.MainAttendantCommaSeperated += e.Employee.Person.LastName;
}
}
}
diff --git a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisJhsAutismus.Designer.cs b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisJhsAutismus.Designer.cs
index 5cdca8314..aefbfac16 100644
--- a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisJhsAutismus.Designer.cs
+++ b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisJhsAutismus.Designer.cs
@@ -50,6 +50,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel36 = new DevExpress.XtraReports.UI.XRLabel();
@@ -108,7 +109,6 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
this.FLS = new DevExpress.XtraReports.UI.CalculatedField();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -368,6 +368,10 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell48.Weight = 0.20530999014636142D;
//
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+ //
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -420,6 +424,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CostBearer2SupportConceptList.SupportConcept.Notice")});
this.xrLabel36.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel36.LocationFloat = new DevExpress.Utils.PointFloat(0F, 306.4584F);
+ this.xrLabel36.Multiline = true;
this.xrLabel36.Name = "xrLabel36";
this.xrLabel36.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel36.SizeF = new System.Drawing.SizeF(726.0114F, 142.9167F);
@@ -1308,10 +1313,6 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.FLS.Expression = "Round([Minutes]/60,2)";
this.FLS.Name = "FLS";
//
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
- //
// LeistungnachweisJhsAutismus
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
diff --git a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisJhsAutismus.cs b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisJhsAutismus.cs
index cdf772078..2ac87553c 100644
--- a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisJhsAutismus.cs
+++ b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisJhsAutismus.cs
@@ -64,7 +64,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
{
asd += ", ";
}
- asd += c2p.Person.FirstNameLastName;
+ asd += c2p.Person.LastName;
}
}
}
@@ -90,7 +90,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
{
pRo.MainAttendantCommaSeperated += ", ";
}
- pRo.MainAttendantCommaSeperated += e.Employee.Person.FirstNameLastName;
+ pRo.MainAttendantCommaSeperated += e.Employee.Person.LastName;
}
}
}
diff --git a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisOderSpree.Designer.cs b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisOderSpree.Designer.cs
index 73447520e..c39cd4a6c 100644
--- a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisOderSpree.Designer.cs
+++ b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisOderSpree.Designer.cs
@@ -254,7 +254,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
// xrTableCell50
//
this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeAbbr")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeLastName")});
this.xrTableCell50.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.xrTableCell50.Name = "xrTableCell50";
this.xrTableCell50.StylePriority.UseBorders = false;
@@ -616,7 +616,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.xrLabel27.StylePriority.UseFont = false;
this.xrLabel27.StylePriority.UsePadding = false;
this.xrLabel27.StylePriority.UseTextAlignment = false;
- this.xrLabel27.Text = "[CostBearer2SupportConceptList.CostBearerContactPerson.FirstNameLastName]";
+ this.xrLabel27.Text = "[CostBearer2SupportConceptList.CostBearerContactPerson.LastName]";
this.xrLabel27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel14
diff --git a/ReportImp/FlexibleJugendarbeitFrankfurtEV/Validation/ServiceRecordValidator.cs b/ReportImp/FlexibleJugendarbeitFrankfurtEV/Validation/ServiceRecordValidator.cs
new file mode 100644
index 000000000..fdf025be1
--- /dev/null
+++ b/ReportImp/FlexibleJugendarbeitFrankfurtEV/Validation/ServiceRecordValidator.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.Plugins;
+using BS.Shared;
+using BS.Shared.DataContracts;
+
+namespace FlexibleJugendarbeitFrankfurtEV.Validation
+{
+ public class CustomServiceRecordValidator : ServiceRecordValidator
+ {
+ public override bool CheckZukunft()
+ {
+ return false;
+ }
+
+ public override List ValidateServiceRecord(ServiceRecordDC newServiceRecord, SupportConceptStatisticsDC statistics,
+ int maxDaysEditServiceRecordsAllowed, IList employeeOids, IList cb2scOids)
+ {
+ var list = base.ValidateServiceRecord(newServiceRecord, statistics, maxDaysEditServiceRecordsAllowed, employeeOids, cb2scOids);
+ if (newServiceRecord.Start.HasValue && newServiceRecord.Start.Value.Date > DateTime.Now.AddDays(5).Date)
+ {
+ list.Add(new ServiceRecordValidationResultDC
+ {
+ ResultType = ServiceRecordValidationResult.Custom,
+ Message = "Das gewählte Datum darf nicht mehr als 5 Tage in der Zukunft liegen."
+ });
+ }
+
+ return list;
+ }
+ }
+}
\ No newline at end of file