diff --git a/ReportImp/AWOMuensterlandRecklinghausen/Reporting/CustomerRelations.cs b/ReportImp/AWOMuensterlandRecklinghausen/Reporting/CustomerRelations.cs index 3a75127ed..2bb098a8f 100644 --- a/ReportImp/AWOMuensterlandRecklinghausen/Reporting/CustomerRelations.cs +++ b/ReportImp/AWOMuensterlandRecklinghausen/Reporting/CustomerRelations.cs @@ -14,6 +14,8 @@ namespace AWOMuensterlandRecklinghausen.Reporting public string Bewilligungsbezeichnungen { get; set; } public Dictionary> Bewilligungen { get; set; } public decimal ApprovedTotal { get; set; } + public string Leistungen { get; set; } + public string Kostensaetze { get; set; } public List Kliententeams { get; set; } public EmployeeDC Schulbegleitung { get; set; } // Hauptbetreuuer diff --git a/ReportImp/AWOMuensterlandRecklinghausen/Reporting/KannAllesWeissAllesRO.cs b/ReportImp/AWOMuensterlandRecklinghausen/Reporting/KannAllesWeissAllesRO.cs index aa943addb..3f4060ee9 100644 --- a/ReportImp/AWOMuensterlandRecklinghausen/Reporting/KannAllesWeissAllesRO.cs +++ b/ReportImp/AWOMuensterlandRecklinghausen/Reporting/KannAllesWeissAllesRO.cs @@ -9,6 +9,7 @@ using BeWo.Report.ReportObjects; using BeWo.Service.DCEntityMapper; using BeWo.Service.ServiceImplementations; using BS.Shared.DataContracts; +using BS.Shared.Extensions; using DevExpress.XtraReports.UI; namespace AWOMuensterlandRecklinghausen.Reporting @@ -495,16 +496,44 @@ namespace AWOMuensterlandRecklinghausen.Reporting } } - if (customer.LastName == "Coerdt") + if (customer.LastName == "Peintner") Console.WriteLine("Test"); // 6 Hilfeplan und Bewilligungen setzen - var hp = allSupportConcepts.OrderByDescending(sc => sc.StartDate).FirstOrDefault(sc => sc.SupportConcept.Customer.Oid == customer.CustomerOid); + var hp = allSupportConcepts.Where(s => s.SupportConcept.IsActive == BS.Shared.ActivationTypeId.Active).OrderByDescending(sc => sc.StartDate).FirstOrDefault(sc => sc.SupportConcept.Customer.Oid == customer.CustomerOid); + if (customer.LastName == "Peintner") + Console.WriteLine("Test"); if (hp != null) { cr.cb2sc = hp; cr.Hilfeplaninfo = hp.AuswahlBezeichnung; cr.Bewilligungsbezeichnungen = ""; + if (hp.SupportConcept.ServiceAccountings != null) + { + int max = 2; + if (hp.SupportConcept.ServiceAccountings.Count < 2) + { + max = hp.SupportConcept.ServiceAccountings.Count; + } + for (int i = 0; i < max; i++) + { + var sa = hp.SupportConcept.ServiceAccountings[i]; + if (!cr.Leistungen.IsNullOrEmpty()) + { + cr.Leistungen += ", "; + } + cr.Leistungen += String.Format("{0}", sa.ServiceDescription.Name); + if (!cr.Kostensaetze.IsNullOrEmpty()) + { + cr.Kostensaetze += ", "; + } + if (sa.ServiceDescription.CostRatePeriods != null && sa.ServiceDescription.CostRatePeriods.Count != 0) + { + var kosten = sa.ServiceDescription.CostRatePeriods.Where(p => p.IsActive == BS.Shared.ActivationTypeId.Active).OrderByDescending(p => p.StartDate).FirstOrDefault(); + cr.Kostensaetze += String.Format("{0:c2}", kosten.CostRateValue ?? 0); + } + } + } // 6.1 Ansprechpartner raussuchen if (hp.CostBearerContactPerson != null) diff --git a/ReportImp/AWOMuensterlandRecklinghausen/SB-ZAS.cs b/ReportImp/AWOMuensterlandRecklinghausen/SB-ZAS.cs index b9e6f1da2..9a771c7d7 100644 --- a/ReportImp/AWOMuensterlandRecklinghausen/SB-ZAS.cs +++ b/ReportImp/AWOMuensterlandRecklinghausen/SB-ZAS.cs @@ -7,9 +7,9 @@ using AWOMuensterlandRecklinghausen.Reporting; namespace AWOMuensterlandRecklinghausen { - public partial class SbZas : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + public partial class ZASListe : DevExpress.XtraReports.UI.XtraReport, IBeWoReport { - public SbZas() + public ZASListe() { InitializeComponent(); diff --git a/ReportImp/AWOMuensterlandRecklinghausen/SB-ZAS.designer.cs b/ReportImp/AWOMuensterlandRecklinghausen/SB-ZAS.designer.cs index e9019797e..7ee619fc7 100644 --- a/ReportImp/AWOMuensterlandRecklinghausen/SB-ZAS.designer.cs +++ b/ReportImp/AWOMuensterlandRecklinghausen/SB-ZAS.designer.cs @@ -1,7 +1,7 @@ using BeWo.Report.ReportObjects; namespace AWOMuensterlandRecklinghausen { - partial class SbZas + partial class ZASListe { /// /// Required designer variable. @@ -47,12 +47,15 @@ namespace AWOMuensterlandRecklinghausen this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -72,12 +75,15 @@ namespace AWOMuensterlandRecklinghausen this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -93,8 +99,6 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -119,10 +123,10 @@ namespace AWOMuensterlandRecklinghausen // xrPageInfo3 // this.xrPageInfo3.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrPageInfo3.LocationFloat = new DevExpress.Utils.PointFloat(333.3333F, 0F); + this.xrPageInfo3.LocationFloat = new DevExpress.Utils.PointFloat(466.4585F, 1.999998F); this.xrPageInfo3.Name = "xrPageInfo3"; this.xrPageInfo3.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; - this.xrPageInfo3.SizeF = new System.Drawing.SizeF(150F, 23F); + this.xrPageInfo3.SizeF = new System.Drawing.SizeF(165.625F, 23F); this.xrPageInfo3.StyleName = "PageInfo"; this.xrPageInfo3.StylePriority.UseFont = false; // @@ -132,10 +136,10 @@ namespace AWOMuensterlandRecklinghausen this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(33.33333F, 0F); this.xrLabel1.Multiline = true; this.xrLabel1.Name = "xrLabel1"; - this.xrLabel1.SizeF = new System.Drawing.SizeF(150F, 25F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(136.9792F, 25F); this.xrLabel1.StyleName = "Title"; this.xrLabel1.StylePriority.UseFont = false; - this.xrLabel1.Text = "ZAS"; + this.xrLabel1.Text = "ZAS-�bersicht"; // // Title // @@ -216,7 +220,7 @@ namespace AWOMuensterlandRecklinghausen this.xrTable2.Name = "xrTable2"; this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2}); - this.xrTable2.SizeF = new System.Drawing.SizeF(3759.345F, 25F); + this.xrTable2.SizeF = new System.Drawing.SizeF(3909.344F, 25F); // // xrTableRow2 // @@ -229,6 +233,8 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell18, this.xrTableCell19, this.xrTableCell20, + this.xrTableCell49, + this.xrTableCell50, this.xrTableCell14, this.xrTableCell13, this.xrTableCell21, @@ -265,6 +271,19 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell12.Weight = 0.16077815712676519D; // + // 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, "AllCustomerRelations.Klient.LastName")}); + this.xrTableCell46.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell46.Name = "xrTableCell46"; + this.xrTableCell46.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 2, 0, 100F); + this.xrTableCell46.StylePriority.UseBorders = false; + this.xrTableCell46.StylePriority.UseFont = false; + this.xrTableCell46.StylePriority.UsePadding = false; + this.xrTableCell46.Weight = 0.66069746422259D; + // // xrTableCell15 // this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); @@ -276,7 +295,7 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell15.StylePriority.UseBorders = false; this.xrTableCell15.StylePriority.UseFont = false; this.xrTableCell15.StylePriority.UsePadding = false; - this.xrTableCell15.Weight = 0.61045480458907131D; + this.xrTableCell15.Weight = 0.5602121449555526D; // // xrTableCell16 // @@ -343,6 +362,32 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell20.StylePriority.UsePadding = false; this.xrTableCell20.Weight = 0.36174945112179369D; // + // xrTableCell49 + // + this.xrTableCell49.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell49.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AllCustomerRelations.Leistungen")}); + this.xrTableCell49.Font = new System.Drawing.Font("Calibri", 11.25F); + this.xrTableCell49.Name = "xrTableCell49"; + this.xrTableCell49.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 2, 0, 100F); + this.xrTableCell49.StylePriority.UseBorders = false; + this.xrTableCell49.StylePriority.UseFont = false; + this.xrTableCell49.StylePriority.UsePadding = false; + this.xrTableCell49.Weight = 0.36174945112179369D; + // + // xrTableCell50 + // + this.xrTableCell50.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AllCustomerRelations.Kostensaetze")}); + this.xrTableCell50.Font = new System.Drawing.Font("Calibri", 11.25F); + this.xrTableCell50.Name = "xrTableCell50"; + this.xrTableCell50.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 2, 0, 100F); + this.xrTableCell50.StylePriority.UseBorders = false; + this.xrTableCell50.StylePriority.UseFont = false; + this.xrTableCell50.StylePriority.UsePadding = false; + this.xrTableCell50.Weight = 0.36174945112179369D; + // // xrTableCell14 // this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); @@ -547,7 +592,7 @@ namespace AWOMuensterlandRecklinghausen this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(3759.345F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(3909.344F, 25F); // // xrTableRow1 // @@ -560,6 +605,8 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell7, this.xrTableCell8, this.xrTableCell9, + this.xrTableCell47, + this.xrTableCell48, this.xrTableCell3, this.xrTableCell2, this.xrTableCell10, @@ -594,6 +641,19 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell1.Weight = 0.1777342760819664D; // + // xrTableCell45 + // + this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell45.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell45.Name = "xrTableCell45"; + this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 2, 0, 100F); + this.xrTableCell45.StylePriority.UseBorders = false; + this.xrTableCell45.StylePriority.UseFont = false; + this.xrTableCell45.StylePriority.UsePadding = false; + this.xrTableCell45.Text = "Klient*in"; + this.xrTableCell45.Weight = 0.73037671906690238D; + // // xrTableCell4 // this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) @@ -605,7 +665,7 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell4.StylePriority.UseFont = false; this.xrTableCell4.StylePriority.UsePadding = false; this.xrTableCell4.Text = "K_Vorname"; - this.xrTableCell4.Weight = 0.67483484828152274D; + this.xrTableCell4.Weight = 0.61929297749614309D; // // xrTableCell5 // @@ -672,6 +732,32 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell9.Text = "Bew_Std"; this.xrTableCell9.Weight = 0.39990092758911011D; // + // xrTableCell47 + // + this.xrTableCell47.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell47.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell47.Name = "xrTableCell47"; + this.xrTableCell47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 2, 0, 100F); + this.xrTableCell47.StylePriority.UseBorders = false; + this.xrTableCell47.StylePriority.UseFont = false; + this.xrTableCell47.StylePriority.UsePadding = false; + this.xrTableCell47.Text = "Leistungen"; + this.xrTableCell47.Weight = 0.39990092758911011D; + // + // xrTableCell48 + // + this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell48.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell48.Name = "xrTableCell48"; + this.xrTableCell48.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 2, 0, 100F); + this.xrTableCell48.StylePriority.UseBorders = false; + this.xrTableCell48.StylePriority.UseFont = false; + this.xrTableCell48.StylePriority.UsePadding = false; + this.xrTableCell48.Text = "Kostensatz"; + this.xrTableCell48.Weight = 0.39990092758911011D; + // // xrTableCell3 // this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) @@ -760,7 +846,7 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell11.StylePriority.UseBorders = false; this.xrTableCell11.StylePriority.UseFont = false; this.xrTableCell11.StylePriority.UsePadding = false; - this.xrTableCell11.Text = "Kostenträger"; + this.xrTableCell11.Text = "Kostentr�ger"; this.xrTableCell11.Weight = 0.85756754463803075D; // // xrTableCell22 @@ -867,37 +953,11 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell43.Text = "SB Status"; this.xrTableCell43.Weight = 1.4959197876967632D; // - // xrTableCell45 - // - this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell45.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell45.Name = "xrTableCell45"; - this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 2, 0, 100F); - this.xrTableCell45.StylePriority.UseBorders = false; - this.xrTableCell45.StylePriority.UseFont = false; - this.xrTableCell45.StylePriority.UsePadding = false; - this.xrTableCell45.Text = "Klient*in"; - this.xrTableCell45.Weight = 0.67483484828152274D; - // - // 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, "AllCustomerRelations.Klient.LastName")}); - this.xrTableCell46.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell46.Name = "xrTableCell46"; - this.xrTableCell46.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 2, 0, 100F); - this.xrTableCell46.StylePriority.UseBorders = false; - this.xrTableCell46.StylePriority.UseFont = false; - this.xrTableCell46.StylePriority.UsePadding = false; - this.xrTableCell46.Weight = 0.61045480458907131D; - // // bindingSource1 // this.bindingSource1.DataSource = typeof(AWOMuensterlandRecklinghausen.Reporting.KannAllesWeissAllesRO); // - // SbZas + // ZASListe // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail, @@ -994,5 +1054,9 @@ namespace AWOMuensterlandRecklinghausen private DevExpress.XtraReports.UI.XRTableCell xrTableCell43; private DevExpress.XtraReports.UI.XRTableCell xrTableCell46; private DevExpress.XtraReports.UI.XRTableCell xrTableCell45; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell49; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell50; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; } }