diff --git a/Report/DefaultReportCreator.cs b/Report/DefaultReportCreator.cs index b8c982bef..971c6134a 100644 --- a/Report/DefaultReportCreator.cs +++ b/Report/DefaultReportCreator.cs @@ -1192,6 +1192,7 @@ namespace BeWo.Report IBeWoReport report = FindReportImp(); report.SetReportDataSource(ValidationMessageListRO.Create(startDate, endDate, DAOFactory.SearchDAO.GetValidationMessagesForMonth(startDate, endDate).ToList())); + return report as XtraReport; } diff --git a/Report/DefaultReports/ValidationMessagesReport.Designer.cs b/Report/DefaultReports/ValidationMessagesReport.Designer.cs index 0ddcdd4a5..b6206a228 100644 --- a/Report/DefaultReports/ValidationMessagesReport.Designer.cs +++ b/Report/DefaultReports/ValidationMessagesReport.Designer.cs @@ -55,12 +55,12 @@ this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); this.objectDataSource1 = new DevExpress.DataAccess.ObjectBinding.ObjectDataSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); @@ -361,11 +361,25 @@ this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell18.Weight = 2.2683778591568258D; // + // xrTableCell20 + // + this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ValidationMessagesForMonth.ServiceDescription")}); + this.xrTableCell20.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.StylePriority.UseBorders = false; + this.xrTableCell20.StylePriority.UseFont = false; + this.xrTableCell20.StylePriority.UseTextAlignment = false; + this.xrTableCell20.Text = "xrTableCell20"; + this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell20.Weight = 2.2446692076626089D; + // // xrTableCell12 // this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ValidationMessagesForMonth.TimeStamp", "{0:dd.MM.yyyy}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ValidationMessagesForMonth.ServiceRecordStart", "{0:dd.MM.yyyy}")}); this.xrTableCell12.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTableCell12.Name = "xrTableCell12"; this.xrTableCell12.StylePriority.UseBorders = false; @@ -434,20 +448,6 @@ this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell16.Weight = 3.0400974839511146D; // - // xrTableCell20 - // - this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ValidationMessagesForMonth.ServiceDescription")}); - this.xrTableCell20.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell20.Name = "xrTableCell20"; - this.xrTableCell20.StylePriority.UseBorders = false; - this.xrTableCell20.StylePriority.UseFont = false; - this.xrTableCell20.StylePriority.UseTextAlignment = false; - this.xrTableCell20.Text = "xrTableCell20"; - this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell20.Weight = 2.2446692076626089D; - // // objectDataSource1 // this.objectDataSource1.DataSource = typeof(BeWo.Report.ReportObjects.ValidationMessageListRO); diff --git a/ReportImp/AWOMuensterlandRecklinghausen/CustomReportCreator.cs b/ReportImp/AWOMuensterlandRecklinghausen/CustomReportCreator.cs index 073d0d6b1..06dee71ce 100644 --- a/ReportImp/AWOMuensterlandRecklinghausen/CustomReportCreator.cs +++ b/ReportImp/AWOMuensterlandRecklinghausen/CustomReportCreator.cs @@ -192,6 +192,7 @@ namespace AWOMuensterlandRecklinghausen var ro = ValidationMessageListRO.Create(start, end, DAOFactory.SearchDAO.GetValidationMessagesForMonth(start, end).ToList()); var druck = new ValidationMessagesReport(); + druck.Name = "Log der Zeiterfassung"; druck.SetReportDataSource(ro); return druck; } diff --git a/ReportImp/AWOMuensterlandRecklinghausen/Reporting/KannAllesWeissAllesRO.cs b/ReportImp/AWOMuensterlandRecklinghausen/Reporting/KannAllesWeissAllesRO.cs index 08e776987..a3264efc2 100644 --- a/ReportImp/AWOMuensterlandRecklinghausen/Reporting/KannAllesWeissAllesRO.cs +++ b/ReportImp/AWOMuensterlandRecklinghausen/Reporting/KannAllesWeissAllesRO.cs @@ -231,6 +231,11 @@ namespace AWOMuensterlandRecklinghausen.Reporting cr.SchulbegleitungKontaktdaten.VertragsArt = contract.ContractTypeValueListEntry.DisplayName; c = contract; } + else if (contract.EntryDate != null && contract.EntryDate.Value.Date > ro.Berichtsdatum.Date) + { + cr.SchulbegleitungKontaktdaten.VertragsArt = contract.ContractTypeValueListEntry.DisplayName; + c = contract; + } } } if (cr.Klient.LastName == "Fiore" || cr.Klient.LastName == "Frank" || cr.Klient.LastName == "Frerich" || cr.Klient.LastName == "Frische")