diff --git a/ReportImp/FizHof/Abwesenheiten.Designer.cs b/ReportImp/FizHof/Abwesenheiten.Designer.cs
index e1579a5ee..e8cbf64d6 100644
--- a/ReportImp/FizHof/Abwesenheiten.Designer.cs
+++ b/ReportImp/FizHof/Abwesenheiten.Designer.cs
@@ -30,6 +30,7 @@ namespace FizHof
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
+ DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
@@ -41,7 +42,6 @@ namespace FizHof
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -59,9 +59,12 @@ namespace FizHof
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -75,7 +78,8 @@ namespace FizHof
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableDetail});
- this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+ new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.Detail1.HeightF = 25F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
@@ -89,7 +93,7 @@ namespace FizHof
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowDetail});
- this.xrTableDetail.SizeF = new System.Drawing.SizeF(676.9999F, 25F);
+ this.xrTableDetail.SizeF = new System.Drawing.SizeF(712F, 25F);
this.xrTableDetail.StylePriority.UseBorders = false;
this.xrTableDetail.StylePriority.UsePadding = false;
//
@@ -100,7 +104,8 @@ namespace FizHof
this.xrTableCell7,
this.xrTableCell6,
this.xrTableCell10,
- this.xrTableCell12});
+ this.xrTableCell12,
+ this.xrTableCell11});
this.xrTableRowDetail.Name = "xrTableRowDetail";
this.xrTableRowDetail.Weight = 1D;
//
@@ -111,7 +116,7 @@ namespace FizHof
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.StylePriority.UseFont = false;
this.xrTableCell3.Text = "xrTableCell3";
- this.xrTableCell3.Weight = 0.17540618802667052D;
+ this.xrTableCell3.Weight = 0.13303408653735083D;
//
// xrTableCell7
//
@@ -119,7 +124,7 @@ namespace FizHof
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field1")});
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Text = "xrTableCell7";
- this.xrTableCell7.Weight = 0.23079761582456637D;
+ this.xrTableCell7.Weight = 0.14663997300157439D;
//
// xrTableCell6
//
@@ -132,7 +137,7 @@ namespace FizHof
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.Text = "xrTableCell6";
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
- this.xrTableCell6.Weight = 0.13232402650963049D;
+ this.xrTableCell6.Weight = 0.11361927102689146D;
//
// xrTableCell10
//
@@ -143,7 +148,7 @@ namespace FizHof
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
- this.xrTableCell10.Weight = 0.13232402650963049D;
+ this.xrTableCell10.Weight = 0.11361927102689146D;
//
// xrTableCell12
//
@@ -154,7 +159,7 @@ namespace FizHof
this.xrTableCell12.StylePriority.UsePadding = false;
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
- this.xrTableCell12.Weight = 0.09835043714961697D;
+ this.xrTableCell12.Weight = 0.067461430051362153D;
//
// DetailReport
//
@@ -172,22 +177,18 @@ namespace FizHof
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand;
//
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO);
- //
// xrTableHeader
//
this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableHeader.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrTableHeader.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40.00003F);
this.xrTableHeader.Name = "xrTableHeader";
this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowHeader});
- this.xrTableHeader.SizeF = new System.Drawing.SizeF(677F, 38.54167F);
+ this.xrTableHeader.SizeF = new System.Drawing.SizeF(712F, 38.54167F);
this.xrTableHeader.StylePriority.UseBorders = false;
this.xrTableHeader.StylePriority.UseFont = false;
this.xrTableHeader.StylePriority.UsePadding = false;
@@ -199,7 +200,8 @@ namespace FizHof
this.xrTableCell2,
this.xrTableCell4,
this.xrTableCell8,
- this.xrTableCell1});
+ this.xrTableCell1,
+ this.xrTableCell9});
this.xrTableRowHeader.Name = "xrTableRowHeader";
this.xrTableRowHeader.Weight = 1D;
//
@@ -209,7 +211,7 @@ namespace FizHof
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Nachname";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell5.Weight = 0.17540620384047273D;
+ this.xrTableCell5.Weight = 0.15004385764834469D;
//
// xrTableCell2
//
@@ -217,7 +219,7 @@ namespace FizHof
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "Vorname";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell2.Weight = 0.23079763663220082D;
+ this.xrTableCell2.Weight = 0.16538940141937777D;
//
// xrTableCell4
//
@@ -225,7 +227,7 @@ namespace FizHof
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Beginn";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell4.Weight = 0.13232399336168293D;
+ this.xrTableCell4.Weight = 0.12814665402139083D;
//
// xrTableCell8
//
@@ -233,7 +235,7 @@ namespace FizHof
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.Text = "Ende";
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell8.Weight = 0.13232399336168293D;
+ this.xrTableCell8.Weight = 0.12814665402139086D;
//
// xrTableCell1
//
@@ -244,18 +246,18 @@ namespace FizHof
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "Anzahl\r\nTage (*)";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell1.Weight = 0.098350520859449966D;
+ this.xrTableCell1.Weight = 0.076087082533532233D;
//
// lblHeader
//
- this.lblHeader.Font = new System.Drawing.Font("Arial", 12F);
- this.lblHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10F);
+ this.lblHeader.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
+ this.lblHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
this.lblHeader.Multiline = true;
this.lblHeader.Name = "lblHeader";
- this.lblHeader.SizeF = new System.Drawing.SizeF(677F, 25F);
+ this.lblHeader.SizeF = new System.Drawing.SizeF(712F, 25F);
this.lblHeader.StyleName = "Title";
this.lblHeader.StylePriority.UseFont = false;
- this.lblHeader.Text = "Anzahl Abwesenheitstage";
+ this.lblHeader.Text = "Anzahl Krankheitstage";
//
// ReportHeader
//
@@ -271,7 +273,7 @@ namespace FizHof
this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.Title.BorderWidth = 1F;
- this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
+ this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F);
this.Title.ForeColor = System.Drawing.Color.Black;
this.Title.Name = "Title";
//
@@ -281,7 +283,7 @@ namespace FizHof
this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.FieldCaption.BorderWidth = 1F;
- this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+ this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.FieldCaption.ForeColor = System.Drawing.Color.Black;
this.FieldCaption.Name = "FieldCaption";
//
@@ -291,7 +293,7 @@ namespace FizHof
this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.PageInfo.BorderWidth = 1F;
- this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.PageInfo.ForeColor = System.Drawing.Color.Black;
this.PageInfo.Name = "PageInfo";
//
@@ -301,7 +303,7 @@ namespace FizHof
this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.DataField.BorderWidth = 1F;
- this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
this.DataField.Name = "DataField";
//
@@ -326,15 +328,42 @@ namespace FizHof
//
// xrLabel1
//
- this.xrLabel1.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 8.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+ new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 12.5F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
- this.xrLabel1.SizeF = new System.Drawing.SizeF(677F, 25F);
+ this.xrLabel1.SizeF = new System.Drawing.SizeF(712F, 25F);
this.xrLabel1.StyleName = "Title";
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "* Abzüglich Wochenend- und Feiertage";
//
+ // xrTableCell9
+ //
+ this.xrTableCell9.Multiline = true;
+ this.xrTableCell9.Name = "xrTableCell9";
+ this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.xrTableCell9.StylePriority.UsePadding = false;
+ this.xrTableCell9.StylePriority.UseTextAlignment = false;
+ this.xrTableCell9.Text = "Abwesenheit";
+ this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell9.Weight = 0.26459054927389103D;
+ //
+ // xrTableCell11
+ //
+ this.xrTableCell11.Multiline = true;
+ this.xrTableCell11.Name = "xrTableCell11";
+ this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.xrTableCell11.StylePriority.UsePadding = false;
+ this.xrTableCell11.StylePriority.UseTextAlignment = false;
+ this.xrTableCell11.Text = "[Field3]";
+ this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+ this.xrTableCell11.Weight = 0.23459513254471739D;
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO);
+ //
// Abwesenheiten
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -346,7 +375,7 @@ namespace FizHof
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldFLS});
this.DataSource = this.bindingSource1;
- this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 50);
+ this.Margins = new DevExpress.Drawing.DXMargins(75F, 40F, 50F, 50F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -355,10 +384,12 @@ namespace FizHof
this.FieldCaption,
this.PageInfo,
this.DataField});
- this.Version = "17.1";
+ this.Version = "23.2";
+ xrWatermark1.Id = "Watermark1";
+ this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -394,5 +425,7 @@ namespace FizHof
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
}
}
diff --git a/ReportImp/FizHof/Abwesenheiten.cs b/ReportImp/FizHof/Abwesenheiten.cs
index bca024e3f..ad5d4e51c 100644
--- a/ReportImp/FizHof/Abwesenheiten.cs
+++ b/ReportImp/FizHof/Abwesenheiten.cs
@@ -28,14 +28,14 @@ namespace FizHof
{
var vs = new CustomVacationService();
- ro.Rows = ro.Rows.Where(r => r.Field3.ToString() == "Krankheit").ToList();
- //ro.Rows = ro.Rows.OrderBy(r => r.Field3).ThenBy(r => r.Field2).ToList();
+ ro.Rows = ro.Rows.Where(r => r.Field3.ToString().ToLower().Contains("krank") || r.Field3.ToString().ToLower().Contains("reha")).ToList();
+ ro.Rows = ro.Rows.OrderBy(r => r.Field2).ThenBy(r => r.Field1).ThenBy(r => r.Field4).ToList();
if (ro.Rows != null && ro.Rows.Count > 0)
{
foreach (var row in ro.Rows)
{
- if (row.Field3.ToString() != "Krankheit")
+ if (!row.Field3.ToString().ToLower().Contains("krank") && !row.Field3.ToString().ToLower().Contains("reha"))
continue;
DateTime start = DateTime.Now;
DateTime end = DateTime.Now;
diff --git a/ReportImp/FizHof/Abwesenheiten.resx b/ReportImp/FizHof/Abwesenheiten.resx
index d25f3eba2..d58980a38 100644
--- a/ReportImp/FizHof/Abwesenheiten.resx
+++ b/ReportImp/FizHof/Abwesenheiten.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