diff --git a/ReportImp/CaritasGuenzburgNeuUlm/CaritasGuenzburgNeuUlm.csproj b/ReportImp/CaritasGuenzburgNeuUlm/CaritasGuenzburgNeuUlm.csproj index 6d337ef3f..d55cb2596 100644 --- a/ReportImp/CaritasGuenzburgNeuUlm/CaritasGuenzburgNeuUlm.csproj +++ b/ReportImp/CaritasGuenzburgNeuUlm/CaritasGuenzburgNeuUlm.csproj @@ -111,6 +111,12 @@ ServicesOverviewReport.cs + + Component + + + KorridorUebersicht.cs + Component @@ -149,6 +155,10 @@ ServicesOverviewReport.cs + + KorridorUebersicht.cs + Designer + Teamstundenkonto.cs diff --git a/ReportImp/CaritasGuenzburgNeuUlm/CustomReportCreator.cs b/ReportImp/CaritasGuenzburgNeuUlm/CustomReportCreator.cs index 33839ee5f..665b30f39 100644 --- a/ReportImp/CaritasGuenzburgNeuUlm/CustomReportCreator.cs +++ b/ReportImp/CaritasGuenzburgNeuUlm/CustomReportCreator.cs @@ -1,13 +1,44 @@ using System; using System.Collections.Generic; +using System.Data; +using System.IO; +using BeWo.Data.Access; +using BeWo.Data.Entities; using BeWo.Report; using BeWo.Report.ReportObjects; +using BS.Shared.Core; using DevExpress.XtraReports.UI; namespace CaritasGuenzburgNeuUlm { public class CustomReportCreator : DefaultReportCreator { + public override XtraReport CreateQueryReport(long queryOid, string queryReportId) + { + if (queryOid == 100) + return CreateKorridorUebersicht(queryOid, queryReportId); + + return base.CreateQueryReport(queryOid, queryReportId); + } + + private XtraReport CreateKorridorUebersicht(long queryOid, string queryReportId) + { + var query = DAOFactory.GenericDAO.LoadByID(queryOid); + + if (query == null) + return new XtraReport(); + + var path = Path.Combine(TempPath, queryReportId + ".xml"); + var table = Utils.XMLDeserialize(path); + var qro = QueryRO.Create(query, table); + + var ro = SupportConceptListRO.Create(null, null, null, null, null, false, null, null); + var druck = new KorridorUebersicht(); + druck.SetReportDataSource(ro); + return druck; + } + + public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay) { List lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay); @@ -66,7 +97,7 @@ namespace CaritasGuenzburgNeuUlm private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid) { IBeWoReport report = null; - if (!String.IsNullOrEmpty(ro.Costbearer) && ro.Costbearer.Contains("Modellprojekt")) + if (!String.IsNullOrEmpty(ro.Costbearer) && ro.Costbearer.Contains("Modellprojekt") || ro.StartDate >= new DateTime(2026, 1, 1)) { report = new CaritasGuenzburgNeuUlm.StundenzettelNeu(); } diff --git a/ReportImp/CaritasGuenzburgNeuUlm/Invoicing/CustomInvoiceFactory.cs b/ReportImp/CaritasGuenzburgNeuUlm/Invoicing/CustomInvoiceFactory.cs index 49afbd055..4473c4adc 100644 --- a/ReportImp/CaritasGuenzburgNeuUlm/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/CaritasGuenzburgNeuUlm/Invoicing/CustomInvoiceFactory.cs @@ -15,7 +15,7 @@ namespace CaritasGuenzburgNeuUlm.Invoicing { foreach (var sr in list) { - if (sr.CostBearer.Name.Contains("Modellprojekt")) + if (sr.CostBearer.Name.Contains("Modellprojekt") || sr.Start.HasValue && sr.Start.Value >= new DateTime(2026, 1, 1)) { return new CustomInvoiceCreation(); } diff --git a/ReportImp/CaritasGuenzburgNeuUlm/KorridorUebersicht.Designer.cs b/ReportImp/CaritasGuenzburgNeuUlm/KorridorUebersicht.Designer.cs new file mode 100644 index 000000000..0255481c5 --- /dev/null +++ b/ReportImp/CaritasGuenzburgNeuUlm/KorridorUebersicht.Designer.cs @@ -0,0 +1,668 @@ +using BeWo.Report.ReportObjects; +namespace CaritasGuenzburgNeuUlm +{ + partial class KorridorUebersicht + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell56 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); + this.ruleNotApprovedAndExpiringNext4Months = new DevExpress.XtraReports.UI.FormattingRule(); + this.ruleNotApprovedAndExpiringNext8Months = new DevExpress.XtraReports.UI.FormattingRule(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.PageHeader = new DevExpress.XtraReports.UI.PageHeaderBand(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell55 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.PageFooter = new DevExpress.XtraReports.UI.PageFooterBand(); + this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.approvedText = new DevExpress.XtraReports.UI.CalculatedField(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); + // + // Detail + // + this.Detail.HeightF = 0F; + this.Detail.Name = "Detail"; + this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPageInfo1, + this.xrLabel1}); + this.ReportHeader.HeightF = 75F; + this.ReportHeader.Name = "ReportHeader"; + // + // xrPageInfo1 + // + this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32.99999F); + this.xrPageInfo1.Name = "xrPageInfo1"; + this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; + this.xrPageInfo1.SizeF = new System.Drawing.SizeF(730F, 23F); + this.xrPageInfo1.StylePriority.UseFont = false; + // + // xrLabel1 + // + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 7.999992F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.SizeF = new System.Drawing.SizeF(730F, 25F); + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Übersicht aktuelle Bewilligungen mit Korridoren"; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1}); + this.DetailReport.DataMember = "SupportConceptDetailList"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2}); + this.Detail1.HeightF = 20F; + this.Detail1.Name = "Detail1"; + // + // xrTable2 + // + this.xrTable2.BackColor = System.Drawing.Color.Transparent; + this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 7F); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 0, 100F); + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2}); + this.xrTable2.SizeF = new System.Drawing.SizeF(730F, 20F); + this.xrTable2.StylePriority.UseBackColor = false; + this.xrTable2.StylePriority.UseBorders = false; + this.xrTable2.StylePriority.UseFont = false; + this.xrTable2.StylePriority.UsePadding = false; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell18, + this.xrTableCell19, + this.xrTableCell36, + this.xrTableCell20, + this.xrTableCell21, + this.xrTableCell23, + this.xrTableCell24, + this.xrTableCell56, + this.xrTableCell30, + this.xrTableCell31}); + this.xrTableRow2.FormattingRules.Add(this.ruleNotApprovedAndExpiringNext4Months); + this.xrTableRow2.FormattingRules.Add(this.ruleNotApprovedAndExpiringNext8Months); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 1D; + // + // xrTableCell18 + // + this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.CustomerLastName")}); + this.xrTableCell18.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.StylePriority.UseBorders = false; + this.xrTableCell18.StylePriority.UseFont = false; + this.xrTableCell18.Text = "Name"; + this.xrTableCell18.Weight = 0.20832763956922373D; + this.xrTableCell18.WordWrap = false; + // + // xrTableCell19 + // + this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.CustomerFirstName")}); + this.xrTableCell19.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.StylePriority.UseFont = false; + this.xrTableCell19.Text = "Vorname"; + this.xrTableCell19.Weight = 0.20832756426677931D; + this.xrTableCell19.WordWrap = false; + // + // xrTableCell36 + // + this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.Costbearer")}); + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.Text = "xrTableCell36"; + this.xrTableCell36.Weight = 0.18807353873326235D; + // + // xrTableCell20 + // + this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.StartDate", "{0:dd/MM/yyyy}")}); + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.StylePriority.UseTextAlignment = false; + this.xrTableCell20.Text = "xrTableCell20"; + this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell20.Weight = 0.17530240654142157D; + // + // xrTableCell21 + // + this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.EndDate", "{0:dd/MM/yyyy}")}); + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.StylePriority.UseTextAlignment = false; + this.xrTableCell21.Text = "xrTableCell21"; + this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell21.Weight = 0.1753024772125103D; + // + // xrTableCell23 + // + this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSTotalRecordedBillable", "{0:0.00}")}); + this.xrTableCell23.Name = "xrTableCell23"; + this.xrTableCell23.StylePriority.UseTextAlignment = false; + this.xrTableCell23.Text = "xrTableCell23"; + this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell23.Weight = 0.17530210571377985D; + // + // xrTableCell24 + // + this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSPerWeekSoll", "{0:0.00}")}); + this.xrTableCell24.Name = "xrTableCell24"; + this.xrTableCell24.StylePriority.UseTextAlignment = false; + this.xrTableCell24.Text = "xrTableCell24"; + this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell24.Weight = 0.17530225498759819D; + // + // xrTableCell56 + // + this.xrTableCell56.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.Custom1")}); + this.xrTableCell56.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell56.Multiline = true; + this.xrTableCell56.Name = "xrTableCell56"; + this.xrTableCell56.StylePriority.UseFont = false; + this.xrTableCell56.StylePriority.UseTextAlignment = false; + this.xrTableCell56.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell56.Weight = 0.1690677292306394D; + // + // xrTableCell30 + // + this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSPerWeekIst", "{0:0.00}")}); + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.StylePriority.UseTextAlignment = false; + this.xrTableCell30.Text = "xrTableCell30"; + this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell30.Weight = 0.17530254653572183D; + // + // xrTableCell31 + // + this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.Custom2", "{0:0.00}")}); + this.xrTableCell31.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.StylePriority.UseFont = false; + this.xrTableCell31.StylePriority.UseTextAlignment = false; + this.xrTableCell31.Text = "xrTableCell31"; + this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell31.Weight = 0.17530248006328572D; + // + // ruleNotApprovedAndExpiringNext4Months + // + this.ruleNotApprovedAndExpiringNext4Months.Condition = "[IsApproved] == False And [OpenMonths] < 4"; + this.ruleNotApprovedAndExpiringNext4Months.DataMember = "SupportConceptDetailList"; + this.ruleNotApprovedAndExpiringNext4Months.Formatting.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); + this.ruleNotApprovedAndExpiringNext4Months.Name = "ruleNotApprovedAndExpiringNext4Months"; + // + // ruleNotApprovedAndExpiringNext8Months + // + this.ruleNotApprovedAndExpiringNext8Months.Condition = "[IsApproved] == False And [OpenMonths] < 8 And [OpenMonths] >= 4"; + this.ruleNotApprovedAndExpiringNext8Months.DataMember = "SupportConceptDetailList"; + this.ruleNotApprovedAndExpiringNext8Months.Formatting.BackColor = System.Drawing.Color.LightBlue; + this.ruleNotApprovedAndExpiringNext8Months.Name = "ruleNotApprovedAndExpiringNext8Months"; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SupportConceptListRO); + // + // PageHeader + // + this.PageHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1}); + this.PageHeader.HeightF = 42F; + this.PageHeader.Name = "PageHeader"; + this.PageHeader.StylePriority.UseBorderColor = false; + this.PageHeader.StylePriority.UseTextAlignment = false; + this.PageHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // xrTable1 + // + this.xrTable1.BackColor = System.Drawing.Color.LightSteelBlue; + this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(730F, 42F); + this.xrTable1.StylePriority.UseBackColor = false; + this.xrTable1.StylePriority.UseBorders = false; + this.xrTable1.StylePriority.UseFont = false; + this.xrTable1.StylePriority.UseTextAlignment = false; + this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1, + this.xrTableCell2, + this.xrTableCell35, + this.xrTableCell3, + this.xrTableCell4, + this.xrTableCell6, + this.xrTableCell7, + this.xrTableCell10, + this.xrTableCell55, + this.xrTableCell13}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 1D; + // + // xrTableCell1 + // + this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.StylePriority.UseBorders = false; + this.xrTableCell1.Text = "Name"; + this.xrTableCell1.Weight = 0.20691758683915815D; + // + // xrTableCell2 + // + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Text = "Vorname"; + this.xrTableCell2.Weight = 0.20691758260634741D; + // + // xrTableCell35 + // + this.xrTableCell35.Name = "xrTableCell35"; + this.xrTableCell35.Text = "Kostenträger"; + this.xrTableCell35.Weight = 0.18680057043490053D; + // + // xrTableCell3 + // + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Text = "Start"; + this.xrTableCell3.Weight = 0.17411593944191309D; + // + // xrTableCell4 + // + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Text = "Ende"; + this.xrTableCell4.Weight = 0.17411594236800579D; + // + // xrTableCell6 + // + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Text = "geleistete FLS abrechenbar"; + this.xrTableCell6.Weight = 0.17411593977114D; + // + // xrTableCell7 + // + this.xrTableCell7.Multiline = true; + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Text = "geleistete FLS\r\nQualifiziert"; + this.xrTableCell7.Weight = 0.17411593877186071D; + // + // xrTableCell10 + // + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Text = "davon in Unter-qualifizierung"; + this.xrTableCell10.Weight = 0.16792310129540655D; + // + // xrTableCell55 + // + this.xrTableCell55.Multiline = true; + this.xrTableCell55.Name = "xrTableCell55"; + this.xrTableCell55.Text = "geleistete FLS\r\nUnterstützend"; + this.xrTableCell55.Weight = 0.17411596700122417D; + // + // xrTableCell13 + // + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Text = "davon in Über-qualifizierung"; + this.xrTableCell13.Weight = 0.17411596268393109D; + // + // PageFooter + // + this.PageFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPageInfo2}); + this.PageFooter.HeightF = 35.00001F; + this.PageFooter.Name = "PageFooter"; + // + // xrPageInfo2 + // + this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(598.0001F, 17.00001F); + this.xrPageInfo2.Name = "xrPageInfo2"; + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(131.9999F, 18F); + this.xrPageInfo2.StylePriority.UseFont = false; + this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrPageInfo2.TextFormatString = "Seite {0} von {1}"; + // + // approvedText + // + this.approvedText.DataMember = "SupportConceptDetailList"; + this.approvedText.Expression = "Iif([IsApproved], \'bewilligt\' , \'nicht bewilligt\')"; + this.approvedText.Name = "approvedText"; + // + // topMarginBand1 + // + this.topMarginBand1.HeightF = 50F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 20F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // GroupFooter1 + // + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable3}); + this.GroupFooter1.HeightF = 20F; + this.GroupFooter1.Name = "GroupFooter1"; + // + // xrTable3 + // + this.xrTable3.BackColor = System.Drawing.Color.Transparent; + this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable3.Name = "xrTable3"; + this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 0, 100F); + this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow3}); + this.xrTable3.SizeF = new System.Drawing.SizeF(730F, 20F); + this.xrTable3.StylePriority.UseBackColor = false; + this.xrTable3.StylePriority.UseBorders = false; + this.xrTable3.StylePriority.UseFont = false; + this.xrTable3.StylePriority.UsePadding = false; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell37, + this.xrTableCell38, + this.xrTableCell39, + this.xrTableCell40, + this.xrTableCell43, + this.xrTableCell44, + this.xrTableCell45, + this.xrTableCell46, + this.xrTableCell47}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 1D; + // + // xrTableCell37 + // + this.xrTableCell37.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell37.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell37.Name = "xrTableCell37"; + this.xrTableCell37.StylePriority.UseBorders = false; + this.xrTableCell37.StylePriority.UseFont = false; + this.xrTableCell37.Weight = 0.47043447579889947D; + this.xrTableCell37.WordWrap = false; + // + // xrTableCell38 + // + this.xrTableCell38.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell38.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell38.Name = "xrTableCell38"; + this.xrTableCell38.StylePriority.UseBorders = false; + this.xrTableCell38.StylePriority.UseFont = false; + this.xrTableCell38.Weight = 0.21234897018698445D; + this.xrTableCell38.WordWrap = false; + // + // xrTableCell39 + // + this.xrTableCell39.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell39.Name = "xrTableCell39"; + this.xrTableCell39.StylePriority.UseBorders = false; + this.xrTableCell39.Weight = 0.19792900024703364D; + // + // xrTableCell40 + // + this.xrTableCell40.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell40.Name = "xrTableCell40"; + this.xrTableCell40.StylePriority.UseBorders = false; + this.xrTableCell40.StylePriority.UseTextAlignment = false; + this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell40.Weight = 0.19792960623726463D; + // + // xrTableCell43 + // + this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSTotalRecordedBillable")}); + this.xrTableCell43.Name = "xrTableCell43"; + this.xrTableCell43.StylePriority.UseTextAlignment = false; + xrSummary1.FormatString = "{0:0.00}"; + xrSummary1.IgnoreNullValues = true; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrTableCell43.Summary = xrSummary1; + this.xrTableCell43.Text = "xrTableCell43"; + this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell43.Weight = 0.19792867016523913D; + // + // xrTableCell44 + // + this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSPerWeekSoll")}); + this.xrTableCell44.Name = "xrTableCell44"; + this.xrTableCell44.StylePriority.UseTextAlignment = false; + xrSummary2.FormatString = "{0:0.00}"; + xrSummary2.IgnoreNullValues = true; + xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrTableCell44.Summary = xrSummary2; + this.xrTableCell44.Text = "xrTableCell44"; + this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell44.Weight = 0.19792918656160247D; + // + // xrTableCell45 + // + this.xrTableCell45.Name = "xrTableCell45"; + this.xrTableCell45.StylePriority.UseBorders = false; + this.xrTableCell45.StylePriority.UseTextAlignment = false; + xrSummary3.FormatString = "{0:0.00}"; + xrSummary3.IgnoreNullValues = true; + this.xrTableCell45.Summary = xrSummary3; + this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell45.Weight = 0.19089007580252415D; + // + // xrTableCell46 + // + this.xrTableCell46.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell46.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSPerWeekIst")}); + this.xrTableCell46.Name = "xrTableCell46"; + this.xrTableCell46.StylePriority.UseBorders = false; + this.xrTableCell46.StylePriority.UseTextAlignment = false; + xrSummary4.FormatString = "{0:0.00}"; + xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrTableCell46.Summary = xrSummary4; + this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell46.Weight = 0.197929489212761D; + // + // xrTableCell47 + // + this.xrTableCell47.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell47.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell47.Name = "xrTableCell47"; + this.xrTableCell47.StylePriority.UseBorders = false; + this.xrTableCell47.StylePriority.UseFont = false; + this.xrTableCell47.StylePriority.UseTextAlignment = false; + this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell47.Weight = 0.19792927324546572D; + // + // KorridorUebersicht + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.ReportHeader, + this.DetailReport, + this.PageHeader, + this.PageFooter, + this.topMarginBand1, + this.bottomMarginBand1, + this.GroupFooter1}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.approvedText}); + this.DataSource = this.bindingSource1; + this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { + this.ruleNotApprovedAndExpiringNext8Months, + this.ruleNotApprovedAndExpiringNext4Months}); + this.Margins = new DevExpress.Drawing.DXMargins(30F, 67F, 50F, 20F); + this.PageHeight = 1169; + this.PageWidth = 827; + this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; + this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + + } + + #endregion + + private DevExpress.XtraReports.UI.DetailBand Detail; + private System.Windows.Forms.BindingSource bindingSource1; + private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.PageHeaderBand PageHeader; + private DevExpress.XtraReports.UI.PageFooterBand PageFooter; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; + private DevExpress.XtraReports.UI.CalculatedField approvedText; + private DevExpress.XtraReports.UI.FormattingRule ruleNotApprovedAndExpiringNext8Months; + private DevExpress.XtraReports.UI.FormattingRule ruleNotApprovedAndExpiringNext4Months; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell35; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; + private DevExpress.XtraReports.UI.XRTable xrTable3; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell38; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell40; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell43; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell44; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell45; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell46; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell56; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell55; + } +} diff --git a/ReportImp/CaritasGuenzburgNeuUlm/KorridorUebersicht.cs b/ReportImp/CaritasGuenzburgNeuUlm/KorridorUebersicht.cs new file mode 100644 index 000000000..d2ff5f7cc --- /dev/null +++ b/ReportImp/CaritasGuenzburgNeuUlm/KorridorUebersicht.cs @@ -0,0 +1,114 @@ +using System; +using System.Drawing; +using System.Collections; +using System.ComponentModel; +using DevExpress.XtraReports.UI; +using BS.Shared.Extensions; +using BeWo.Report.ReportObjects; +using BeWo.Report; +using BeWo.Data.Access; +using System.Linq; +using BS.Shared; +using System.Collections.Generic; +using BeWo.Data.Entities; + +namespace CaritasGuenzburgNeuUlm +{ + public partial class KorridorUebersicht : DevExpress.XtraReports.UI.XtraReport//, IBeWoReport + { + public KorridorUebersicht() + { + InitializeComponent(); + } + + public void SetReportDataSource(SupportConceptListRO pRO) + { + string[] CatsQuali = { "Qualifiziert", "FLS Q1", "FLS Q2" }; + string[] CatsAss = { "Unterstützend", "FLS Q3", "FLS Q4" }; + + Dictionary empQualiDict = new Dictionary(); + foreach (var sc in pRO.SupportConceptDetailList) + { + // die verlängern ihre HPs immer, daher muss das auf die aktuelle Bewilligung laufen + var start = sc.StartDate; + var end = sc.EndDate; + var cb2sc = DAOFactory.GenericDAO.LoadByID(sc.CostBearer2SupportConceptOid); + var scaps = cb2sc.ApprovalPeriodList.Where(ap => ap.StartDate < DateTime.Today && ap.EndDate >= DateTime.Today).ToList(); + if (scaps.Any()) + { + var startScap = scaps.Where(s => s.StartDate.HasValue).Min(s => s.StartDate); + start = startScap ?? start; + sc.StartDate = start; + var endScap = scaps.Where(s => s.StartDate.HasValue).Max(s => s.EndDate); + end = endScap ?? end; + sc.EndDate = end; + } + + // Zur Detailansicht werden alle Zeiterfassungseinträge im Zeitraum gezogen und dann auf Dopplungen aus Gruppenbuchungen gefiltert + var servicerecords = DAOFactory.SearchDAO.FindServiceRecords(null, sc.CostBearer2SupportConceptOid, null, start, end); + servicerecords = servicerecords.Where(e => e.GroupOid == null). + Concat(servicerecords.Where(e => e.GroupOid != null).GroupBy(e => e.GroupOid).Select(g => g.First())).ToList(); + sc.FLSTotalRecordedBillable = servicerecords.Where(r => r.ServiceDescription.ServiceCategory.IsBillable).Sum(r => (r.RoundedDuration) / 60); + decimal zeitFkGesamt = servicerecords.Where(r => CatsQuali.Contains(r.ServiceDescription.ServiceCategory.Name)). + Sum(r => (r.RoundedDuration) / 60); + decimal zeitNFkGesamt = servicerecords.Where(r => CatsAss.Contains(r.ServiceDescription.ServiceCategory.Name)). + Sum(r => (r.RoundedDuration) / 60); + bool fk = true; + decimal uebererbringung = 0; + decimal untererbringung = 0; + decimal quoteUe = 1; + decimal quoteU = 1; + foreach (var sr in servicerecords) + { + if (sr.ServiceDescription.ServiceCategory.IsBillable) + { + if (sr.EmployeeOid.HasValue && empQualiDict.ContainsKey(sr.EmployeeOid.Value)) + { + fk = empQualiDict[sr.EmployeeOid.Value]; + } + else + { + var quali = sr.Employee.ValueList.Where(v => v.Entry.Type == ValueListEntryType.StaffQualificationsType).FirstOrDefault(); + if (quali != null) + { + if (quali.Entry.Value == "Q1" || quali.Entry.Value == "Q2") + { + fk = true; + } + else + { + fk = false; + } + if (!empQualiDict.ContainsKey(sr.EmployeeOid.Value)) + { + empQualiDict.Add(sr.EmployeeOid.Value, fk); + } + } + } + if (fk && CatsAss.Contains(sr.ServiceDescription.ServiceCategory.Name)) + { + untererbringung += sr.RoundedDuration / 60; + } + else if (!fk && CatsQuali.Contains(sr.ServiceDescription.ServiceCategory.Name)) + { + uebererbringung += sr.RoundedDuration / 60; + } + } + } + sc.FLSPerWeekSoll = zeitFkGesamt; + if (uebererbringung > 0 && zeitFkGesamt > 0) + { + quoteUe = Math.Round(uebererbringung / (zeitFkGesamt), 3, MidpointRounding.AwayFromZero); + sc.Custom1 = String.Format("{0:0.0}%", (100 * quoteUe)); + } + sc.FLSPerWeekIst = zeitNFkGesamt; + if (untererbringung > 0 && zeitNFkGesamt > 0) + { + quoteU = Math.Round(untererbringung / (zeitNFkGesamt), 3, MidpointRounding.AwayFromZero); + sc.Custom2 = String.Format("{0:0.0}%", (100 * quoteU)); + } + } + this.bindingSource1.DataSource = pRO; + } + } +} diff --git a/ReportImp/CaritasGuenzburgNeuUlm/KorridorUebersicht.resx b/ReportImp/CaritasGuenzburgNeuUlm/KorridorUebersicht.resx new file mode 100644 index 000000000..d58980a38 --- /dev/null +++ b/ReportImp/CaritasGuenzburgNeuUlm/KorridorUebersicht.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ReportImp/HshCologne/Invoicing/CustomInvoiceCreation.cs b/ReportImp/HshCologne/Invoicing/CustomInvoiceCreation.cs index b3a7d52ec..f1c8b417e 100644 --- a/ReportImp/HshCologne/Invoicing/CustomInvoiceCreation.cs +++ b/ReportImp/HshCologne/Invoicing/CustomInvoiceCreation.cs @@ -230,7 +230,7 @@ namespace HshCologne.Invoicing } else if (qOid.Any(q => q == 1460)) { - stundensatz = preisAK2Jahre; + stundensatz = preisAK; ii.UnitDescription = "Assistenzkraft"; } } diff --git a/ReportImp/LebenshilfeBadKreuznachWohnstaette/Invoicing/CustomInvoiceCreation.cs b/ReportImp/LebenshilfeBadKreuznachWohnstaette/Invoicing/CustomInvoiceCreation.cs index 9ccee7479..58cf7c57e 100644 --- a/ReportImp/LebenshilfeBadKreuznachWohnstaette/Invoicing/CustomInvoiceCreation.cs +++ b/ReportImp/LebenshilfeBadKreuznachWohnstaette/Invoicing/CustomInvoiceCreation.cs @@ -321,11 +321,13 @@ namespace LebenshilfeBadKreuznachWohnstaette.Invoicing if (scap.ServiceCategory.Abbreviation.Contains("TSA")) { bereichTsa = true; - additionalServices = additionalServices.Where(a => a.AdditionalServiceRegion.AdditionalService.Name == "TSA").ToList(); + additionalServices = additionalServices.Where(a => a.AdditionalServiceRegion != null && a.AdditionalServiceRegion.AdditionalService != null && + a.AdditionalServiceRegion.AdditionalService.Name == "TSA").ToList(); } else { - additionalServices = additionalServices.Where(a => a.AdditionalServiceRegion.AdditionalService.Name != "TSA" && !a.AdditionalServiceRegion.AdditionalService.Name.Contains("gelöscht")).ToList(); + additionalServices = additionalServices.Where(a => a.AdditionalServiceRegion != null && a.AdditionalServiceRegion.AdditionalService != null + && a.AdditionalServiceRegion.AdditionalService.Name != "TSA" && !a.AdditionalServiceRegion.AdditionalService.Name.Contains("gelöscht")).ToList(); } Dictionary tagesDict = new Dictionary(); diff --git a/ReportImp/RatPlusTat/BudgetnachweisAnhang.Designer.cs b/ReportImp/RatPlusTat/BudgetnachweisAnhang.Designer.cs index 3456ace05..eaf95492e 100644 --- a/ReportImp/RatPlusTat/BudgetnachweisAnhang.Designer.cs +++ b/ReportImp/RatPlusTat/BudgetnachweisAnhang.Designer.cs @@ -159,7 +159,8 @@ this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable1.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTable1.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -226,7 +227,8 @@ // this.xrTableCell14.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.xrTableCell14.CanGrow = false; - this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell14.Name = "xrTableCell14"; this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); this.xrTableCell14.StylePriority.UseBorders = false; @@ -339,7 +341,8 @@ this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable2.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTable2.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(6.103516E-05F, 0F); this.xrTable2.Name = "xrTable2"; this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -508,7 +511,8 @@ // // xrLabel6 // - this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 112F); this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -568,7 +572,8 @@ // // xrLabel2 // - this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -582,17 +587,18 @@ // // xrLine1 // - this.xrLine1.LineWidth = 2; + this.xrLine1.LineWidth = 2F; this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLine1.Name = "xrLine1"; - this.xrLine1.SizeF = new System.Drawing.SizeF(690F, 2F); + this.xrLine1.SizeF = new System.Drawing.SizeF(690F, 2.083333F); // // xrTable4 // this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable4.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTable4.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 2F); this.xrTable4.Name = "xrTable4"; this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -619,7 +625,8 @@ // xrTableCell35 // this.xrTableCell35.Borders = DevExpress.XtraPrinting.BorderSide.Left; - this.xrTableCell35.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell35.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell35.Name = "xrTableCell35"; this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); this.xrTableCell35.StylePriority.UseBorders = false; @@ -636,7 +643,8 @@ | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "MonatsZeilen.SummeMinuten")}); - this.xrTableCell36.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell36.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell36.Multiline = true; this.xrTableCell36.Name = "xrTableCell36"; this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); @@ -653,7 +661,8 @@ // xrTableCell37 // this.xrTableCell37.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell37.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell37.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell37.Name = "xrTableCell37"; this.xrTableCell37.StylePriority.UseBorders = false; this.xrTableCell37.StylePriority.UseFont = false; @@ -669,7 +678,8 @@ | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "MonatsZeilen.fieldFls")}); - this.xrTableCell38.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell38.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell38.Name = "xrTableCell38"; this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); this.xrTableCell38.StylePriority.UseBorders = false; @@ -685,7 +695,8 @@ // xrTableCell39 // this.xrTableCell39.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrTableCell39.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell39.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell39.Name = "xrTableCell39"; this.xrTableCell39.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); this.xrTableCell39.StylePriority.UseBorders = false; @@ -709,7 +720,8 @@ // xrTableCell30 // this.xrTableCell30.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell30.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell30.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell30.Name = "xrTableCell30"; this.xrTableCell30.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); this.xrTableCell30.StylePriority.UseBorders = false; @@ -722,7 +734,8 @@ // xrTableCell31 // this.xrTableCell31.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrTableCell31.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell31.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell31.Name = "xrTableCell31"; this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); this.xrTableCell31.StylePriority.UseBorders = false; @@ -735,7 +748,8 @@ // xrTableCell32 // this.xrTableCell32.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrTableCell32.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell32.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell32.Name = "xrTableCell32"; this.xrTableCell32.StylePriority.UseBorders = false; this.xrTableCell32.StylePriority.UseFont = false; @@ -746,7 +760,8 @@ // xrTableCell33 // this.xrTableCell33.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrTableCell33.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell33.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell33.Name = "xrTableCell33"; this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); this.xrTableCell33.StylePriority.UseBorders = false; @@ -759,7 +774,8 @@ // xrTableCell34 // this.xrTableCell34.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell34.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell34.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell34.Name = "xrTableCell34"; this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); this.xrTableCell34.StylePriority.UseBorders = false; @@ -931,7 +947,8 @@ // // xrLabel8 // - this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99999F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -1118,7 +1135,8 @@ this.xrTable5.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable5.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTable5.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable5.Name = "xrTable5"; this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -1242,7 +1260,8 @@ // // lblMehrstunden // - this.lblMehrstunden.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.lblMehrstunden.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.lblMehrstunden.LocationFloat = new DevExpress.Utils.PointFloat(0F, 26.00002F); this.lblMehrstunden.Name = "lblMehrstunden"; this.lblMehrstunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -1255,7 +1274,7 @@ // // xrLine2 // - this.xrLine2.LineWidth = 2; + this.xrLine2.LineWidth = 2F; this.xrLine2.LocationFloat = new DevExpress.Utils.PointFloat(592.5F, 20.00001F); this.xrLine2.Name = "xrLine2"; this.xrLine2.SizeF = new System.Drawing.SizeF(79.99994F, 6F); @@ -1265,7 +1284,8 @@ this.xrTable7.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable7.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTable7.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable7.Name = "xrTable7"; this.xrTable7.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -1411,15 +1431,16 @@ this.SummeDifferenz, this.Differenz}); this.DataSource = this.bindingSource1; - this.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.Font = new DevExpress.Drawing.DXFont("Segoe UI", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.Einzahlungstextsichtbarkeitsformatierungsregel, this.Auszahlungstextsichtbarkeitsformatierungsregel}); - this.Margins = new DevExpress.Drawing.DXMargins(70, 65, 50, 50); + this.Margins = new DevExpress.Drawing.DXMargins(70F, 65F, 50F, 50F); this.PageHeight = 1169; this.PageWidth = 827; 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.xrTable4)).EndInit(); diff --git a/ReportImp/RatPlusTat/BudgetnachweisAnhang.cs b/ReportImp/RatPlusTat/BudgetnachweisAnhang.cs index 41f2d1822..1eee0b4d6 100644 --- a/ReportImp/RatPlusTat/BudgetnachweisAnhang.cs +++ b/ReportImp/RatPlusTat/BudgetnachweisAnhang.cs @@ -46,7 +46,7 @@ namespace RatPlusTat } } - e.SummeGesamtMinuten = Math.Round(e.SummeFLStunden,2) * (1 + pRO.RateFactor/100) * e.CostRatePeriod.CostRateValue ?? 0; + e.SummeGesamtMinuten = Math.Round(Math.Round(e.SummeFLStunden,2) * (1 + pRO.RateFactor/100) * e.CostRatePeriod.CostRateValue ?? 0, 2); pRO.SummeGesamtMinuten += e.SummeGesamtMinuten; FLSbisher += e.SummeFLStunden; diff --git a/ReportImp/RatPlusTat/BudgetnachweisAnhang.resx b/ReportImp/RatPlusTat/BudgetnachweisAnhang.resx index 76cdda25e..1af7de150 100644 --- a/ReportImp/RatPlusTat/BudgetnachweisAnhang.resx +++ b/ReportImp/RatPlusTat/BudgetnachweisAnhang.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 diff --git a/ReportImp/Ruhrstern/Export/DatevExporter.cs b/ReportImp/Ruhrstern/Export/DatevExporter.cs index 485a30a3a..f7cd0823a 100644 --- a/ReportImp/Ruhrstern/Export/DatevExporter.cs +++ b/ReportImp/Ruhrstern/Export/DatevExporter.cs @@ -20,33 +20,44 @@ namespace Ruhrstern.Export DateTime dt = DateTime.Now; DateTime.TryParse(query.Parameter[0].Value.ToString(), out dt); - query.FileName = String.Format("Datev Export Ruhrstern {0:yyyyMM}.csv", dt); - query.QueryResult = GetAbrechnungenString(dt); - + if (query.Oid == 100) + { + query.FileName = String.Format("{0:yyyyMM} Datev Export BeWo 207721-30914.csv", dt); + query.QueryResult = GetAbrechnungenString(dt, "BeWo"); + } + else + { + query.FileName = String.Format("{0:yyyyMM} Datev Export JH 207721-69525.csv", dt); + query.QueryResult = GetAbrechnungenString(dt, "JuHi"); + } + return query; } - public static String GetAbrechnungenString(DateTime date) + public static String GetAbrechnungenString(DateTime date, string bereich) { StringBuilder sb = new StringBuilder(); - //sb.AppendLine("Datum;Konto;Gegenkonto;Buchungstext;Belegfeld1;Umsatz Soll;Kostenstelle"); sb.AppendLine("Umsatz (ohne Soll/Haben-Kz);Soll/Haben-Kennzeichen;Konto;Gegenkonto (ohne BU-Schlüssel);Belegdatum;Belegfeld 1;Belegfeld 2;Buchungstext;KOST1 - Kostenstelle"); - //sb.AppendLine("Belegdatum;Belegnummer;Debitorennummer;Kontonummer;Betrag;Buchungstext;Kostenstelle"); - var s = GetMonatlicheBetraegeString(date); - if (!String.IsNullOrWhiteSpace(s)) + if (bereich == "BeWo") { - sb.Append(s); + var s = GetMonatlicheBetraegeString(date); + if (!String.IsNullOrWhiteSpace(s)) + { + sb.Append(s); + } } - s = GetMonatlicheRechnungenString(date); - if (!String.IsNullOrWhiteSpace(s)) + else { - if (sb.Length > 0) - sb.AppendLine(); - - sb.Append(s); + var s = GetMonatlicheRechnungenString(date); + if (!String.IsNullOrWhiteSpace(s)) + { + //if (sb.Length > 0) + // sb.AppendLine(); + sb.Append(s); + } } return sb.ToString(); diff --git a/ReportImp/SKFAlsdorf/SettlementReport.Designer.cs b/ReportImp/SKFAlsdorf/SettlementReport.Designer.cs index 9bd149b71..af7f87a50 100644 --- a/ReportImp/SKFAlsdorf/SettlementReport.Designer.cs +++ b/ReportImp/SKFAlsdorf/SettlementReport.Designer.cs @@ -42,7 +42,6 @@ namespace BeWo.SKFAlsdorf.Alt this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); this.rowErbrachteLeistung = new DevExpress.XtraReports.UI.XRTableRow(); @@ -74,6 +73,7 @@ namespace BeWo.SKFAlsdorf.Alt this.xrTableRow17 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); @@ -123,6 +123,8 @@ namespace BeWo.SKFAlsdorf.Alt this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); @@ -283,12 +285,6 @@ namespace BeWo.SKFAlsdorf.Alt this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell6.Weight = 0.21685899000901443D; // - // ruleRateFactorNull - // - this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; - this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; - this.ruleRateFactorNull.Name = "ruleRateFactorNull"; - // // xrTableRow11 // this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { @@ -638,6 +634,12 @@ namespace BeWo.SKFAlsdorf.Alt this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell17.Weight = 0.21685899000901443D; // + // ruleRateFactorNull + // + this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; + this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; + this.ruleRateFactorNull.Name = "ruleRateFactorNull"; + // // xrLabel6 // this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F); @@ -685,7 +687,8 @@ namespace BeWo.SKFAlsdorf.Alt this.xrLabel3.SizeF = new System.Drawing.SizeF(621.9999F, 16F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerName]"; + this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerName], geb. [CustomerB" + + "irthdayString]"; this.xrLabel3.WordWrap = false; // // xrLabel2 @@ -714,8 +717,9 @@ namespace BeWo.SKFAlsdorf.Alt this.xrTableRow3, this.xrTableRow1, this.xrTableRow6, - this.xrTableRow8}); - this.xrTable2.SizeF = new System.Drawing.SizeF(255F, 134F); + this.xrTableRow8, + this.xrTableRow10}); + this.xrTable2.SizeF = new System.Drawing.SizeF(255F, 151F); this.xrTable2.StylePriority.UseFont = false; // // xrTableRow2 @@ -1134,6 +1138,25 @@ namespace BeWo.SKFAlsdorf.Alt // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell7}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.StylePriority.UseTextAlignment = false; + this.xrTableRow10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableRow10.Weight = 0.11258278145695365D; + // + // xrTableCell7 + // + this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")}); + this.xrTableCell7.Multiline = true; + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell7.TextFormatString = "GP-Nr.: {0}"; + this.xrTableCell7.Weight = 1D; + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1256,5 +1279,7 @@ namespace BeWo.SKFAlsdorf.Alt private DevExpress.XtraReports.UI.XRTableRow xrTableRow16; private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; } } diff --git a/ReportImp/SKFAlsdorf/SettlementReport2.Designer.cs b/ReportImp/SKFAlsdorf/SettlementReport2.Designer.cs index e37e090f3..fd96cf1b9 100644 --- a/ReportImp/SKFAlsdorf/SettlementReport2.Designer.cs +++ b/ReportImp/SKFAlsdorf/SettlementReport2.Designer.cs @@ -123,6 +123,8 @@ namespace BeWo.SKFAlsdorf this.xrTableCell82 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell83 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); @@ -278,7 +280,7 @@ namespace BeWo.SKFAlsdorf this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerFirstName] [CustomerLa" + - "stName]"; + "stName], geb. [CustomerBirthday!dd.MM.yyyy]"; this.xrLabel3.WordWrap = false; // // xrLabel2 @@ -307,8 +309,9 @@ namespace BeWo.SKFAlsdorf this.xrTableRow3, this.xrTableRow1, this.xrTableRow6, - this.xrTableRow8}); - this.xrTable2.SizeF = new System.Drawing.SizeF(255F, 134F); + this.xrTableRow8, + this.xrTableRow7}); + this.xrTable2.SizeF = new System.Drawing.SizeF(255F, 151F); this.xrTable2.StylePriority.UseFont = false; // // xrTableRow2 @@ -1115,6 +1118,26 @@ namespace BeWo.SKFAlsdorf // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); // + // xrTableRow7 + // + this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3}); + this.xrTableRow7.Name = "xrTableRow7"; + this.xrTableRow7.Weight = 0.11258278145695365D; + // + // xrTableCell3 + // + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")}); + this.xrTableCell3.Multiline = true; + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.Text = "xrTableCell3"; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell3.TextFormatString = "GP-Nr.: {0}"; + this.xrTableCell3.Weight = 1D; + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1240,5 +1263,7 @@ namespace BeWo.SKFAlsdorf private DevExpress.XtraReports.UI.XRTableRow xrTableRow51; private DevExpress.XtraReports.UI.XRTableCell xrTableCell82; private DevExpress.XtraReports.UI.XRTableCell xrTableCell83; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; } }