diff --git a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/ServiceInvoiceReport.Designer.cs b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/ServiceInvoiceReport.Designer.cs
index 2c64d18c6..32e51e0eb 100644
--- a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/ServiceInvoiceReport.Designer.cs
+++ b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/ServiceInvoiceReport.Designer.cs
@@ -36,6 +36,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel();
@@ -68,7 +69,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
- this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
@@ -99,7 +99,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
//
// bottomMarginBand1
//
- this.bottomMarginBand1.HeightF = 65.12502F;
+ this.bottomMarginBand1.HeightF = 153.1667F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// Page1
@@ -135,6 +135,18 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
+ // xrLabel9
+ //
+ this.xrLabel9.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(451.7501F, 427.7083F);
+ this.xrLabel9.Name = "xrLabel9";
+ this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel9.SizeF = new System.Drawing.SizeF(58.33334F, 17F);
+ this.xrLabel9.StylePriority.UseFont = false;
+ this.xrLabel9.StylePriority.UseTextAlignment = false;
+ this.xrLabel9.Text = "=";
+ this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+ //
// xrLabel4
//
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(10.5834F, 304.4792F);
@@ -451,7 +463,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel1,
this.xrLabel5});
- this.GroupFooter1.HeightF = 54.66665F;
+ this.GroupFooter1.HeightF = 54.66666F;
this.GroupFooter1.Name = "GroupFooter1";
//
// xrLabel1
@@ -482,18 +494,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
- // xrLabel9
- //
- this.xrLabel9.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(451.7501F, 427.7083F);
- this.xrLabel9.Name = "xrLabel9";
- this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel9.SizeF = new System.Drawing.SizeF(58.33334F, 17F);
- this.xrLabel9.StylePriority.UseFont = false;
- this.xrLabel9.StylePriority.UseTextAlignment = false;
- this.xrLabel9.Text = "=";
- this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
- //
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -508,7 +508,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.Font = new System.Drawing.Font("Verdana", 10F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
- this.Margins = new System.Drawing.Printing.Margins(75, 54, 158, 65);
+ this.Margins = new System.Drawing.Printing.Margins(75, 54, 158, 153);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
diff --git a/ReportImp/GrundsteinEV/GrundsteinEV.csproj b/ReportImp/GrundsteinEV/GrundsteinEV.csproj
index 2c2011f4c..e4bffee0a 100644
--- a/ReportImp/GrundsteinEV/GrundsteinEV.csproj
+++ b/ReportImp/GrundsteinEV/GrundsteinEV.csproj
@@ -112,7 +112,7 @@
Teamstundenkonto.cs
-
+
@@ -172,5 +172,6 @@
Teamstundenkonto.cs
+
\ No newline at end of file
diff --git a/ReportImp/GrundsteinEV/Validation/CustomServiceRecordValidator.cs b/ReportImp/GrundsteinEV/Validation/CustomServiceRecordValidator.cs
new file mode 100644
index 000000000..7cc4bf45e
--- /dev/null
+++ b/ReportImp/GrundsteinEV/Validation/CustomServiceRecordValidator.cs
@@ -0,0 +1,17 @@
+using BeWo.Service.Plugins;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GrundsteinEV.Validation
+{
+ class CustomServiceRecordValidator : ServiceRecordValidator
+ {
+ public override string[] GetIgnoreCategoriesForOverlappingCheck()
+ {
+ return new[] { "Arbeitszeiterfassung" };
+ }
+ }
+}
diff --git a/ReportImp/GrundsteinEV/Validation/ServiceRecordValidator.cs b/ReportImp/GrundsteinEV/Validation/ServiceRecordValidator.cs
deleted file mode 100644
index 0fb4c20cc..000000000
--- a/ReportImp/GrundsteinEV/Validation/ServiceRecordValidator.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using BeWo.Data.Access;
-using BeWo.Data.Entities;
-using BeWo.Service.DCEntityMapper;
-using BeWo.Service.Plugins;
-using BS.Shared;
-using BS.Shared.Core;
-using BS.Shared.DataContracts;
-using BS.Shared.DataContracts.Compact;
-using BS.Shared.Extensions;
-using BS.Shared.Services;
-
-namespace GrundsteinEV
-{
- public class CustomServiceRecordValidator : ServiceRecordValidator
- {
- public override string[] GetIgnoreCategoriesForOverlappingCheck()
- {
- return new[] { "Arbeitszeiterfassung" };
- }
- }
-}
\ No newline at end of file