diff --git a/ReportImp/LebenshilfeBadKreuznachWohnstaette/AdditionalServiceBookingReport.Designer.cs b/ReportImp/LebenshilfeBadKreuznachWohnstaette/AdditionalServiceBookingReport.Designer.cs
index 1a0644865..a4384519c 100644
--- a/ReportImp/LebenshilfeBadKreuznachWohnstaette/AdditionalServiceBookingReport.Designer.cs
+++ b/ReportImp/LebenshilfeBadKreuznachWohnstaette/AdditionalServiceBookingReport.Designer.cs
@@ -111,6 +111,8 @@
this.xrTableCell64 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell66 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ this.xrTableCell67 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell68 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -183,7 +185,7 @@
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
- this.xrTable1.SizeF = new System.Drawing.SizeF(1117.15F, 20.9665F);
+ this.xrTable1.SizeF = new System.Drawing.SizeF(1119F, 20.9665F);
this.xrTable1.StylePriority.UseBackColor = false;
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
@@ -225,7 +227,8 @@
this.xrTableCell30,
this.xrTableCell31,
this.xrTableCell32,
- this.xrTableCell65});
+ this.xrTableCell65,
+ this.xrTableCell67});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 1D;
//
@@ -443,7 +446,6 @@
// xrPageInfo2
//
this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
- this.xrPageInfo2.Format = "Seite {0} von {1}";
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(620.15F, 22.83331F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F);
@@ -451,6 +453,7 @@
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.StylePriority.UsePadding = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrPageInfo2.TextFormatString = "Seite {0} von {1}";
//
// DetailReport
//
@@ -478,7 +481,7 @@
this.xrTable2.Name = "xrTable2";
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
- this.xrTable2.SizeF = new System.Drawing.SizeF(1117.15F, 20.9665F);
+ this.xrTable2.SizeF = new System.Drawing.SizeF(1119F, 20.9665F);
this.xrTable2.StylePriority.UseBackColor = false;
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
@@ -520,7 +523,8 @@
this.xrTableCell62,
this.xrTableCell63,
this.xrTableCell64,
- this.xrTableCell66});
+ this.xrTableCell66,
+ this.xrTableCell68});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 1D;
//
@@ -866,6 +870,25 @@
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.AdditionalServiceBookingRO);
//
+ // xrTableCell67
+ //
+ this.xrTableCell67.Multiline = true;
+ this.xrTableCell67.Name = "xrTableCell67";
+ this.xrTableCell67.Text = "Abw";
+ this.xrTableCell67.Weight = 0.021892381234793805D;
+ //
+ // xrTableCell68
+ //
+ this.xrTableCell68.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.AbsenceTimeMonthCount")});
+ this.xrTableCell68.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+ this.xrTableCell68.Multiline = true;
+ this.xrTableCell68.Name = "xrTableCell68";
+ this.xrTableCell68.StylePriority.UseFont = false;
+ this.xrTableCell68.Text = "xrTableCell68";
+ this.xrTableCell68.TextFormatString = "{0:0}";
+ this.xrTableCell68.Weight = 0.021892381234793805D;
+ //
// AdditionalServiceBookingReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -879,11 +902,11 @@
this.DataSource = this.bindingSource1;
this.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
this.Landscape = true;
- this.Margins = new DevExpress.Drawing.DXMargins(30, 20, 49, 20);
+ this.Margins = new DevExpress.Drawing.DXMargins(30F, 20F, 49F, 20F);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
- this.Version = "17.1";
+ this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -975,5 +998,7 @@
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell65;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell66;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell67;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell68;
}
}
diff --git a/ReportImp/LebenshilfeBadKreuznachWohnstaette/AdditionalServiceBookingReport.cs b/ReportImp/LebenshilfeBadKreuznachWohnstaette/AdditionalServiceBookingReport.cs
index 5d17134fe..5b83f99e9 100644
--- a/ReportImp/LebenshilfeBadKreuznachWohnstaette/AdditionalServiceBookingReport.cs
+++ b/ReportImp/LebenshilfeBadKreuznachWohnstaette/AdditionalServiceBookingReport.cs
@@ -19,6 +19,10 @@ namespace LebenshilfeBadKreuznachWohnstaette
Enum.TryParse(pRO.Month, out monat);
var monatInt = (int) monat;
var daysInMonth = DateTime.DaysInMonth(pRO.Year, monatInt);
+ foreach (var r in pRO.Rows)
+ {
+ r.AbsenceTimeMonthCount = daysInMonth - r.AttendanceMonthCount;
+ }
xrTableCell30.Visible = daysInMonth >= 29;
xrTableCell31.Visible = daysInMonth >= 30;
diff --git a/ReportImp/LebenshilfeBadKreuznachWohnstaette/AdditionalServiceBookingReport.resx b/ReportImp/LebenshilfeBadKreuznachWohnstaette/AdditionalServiceBookingReport.resx
index 76cdda25e..1af7de150 100644
--- a/ReportImp/LebenshilfeBadKreuznachWohnstaette/AdditionalServiceBookingReport.resx
+++ b/ReportImp/LebenshilfeBadKreuznachWohnstaette/AdditionalServiceBookingReport.resx
@@ -117,7 +117,4 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 17, 17
-
\ No newline at end of file