From f667f8a4d120a2cc206eeef479c384ee750e2456 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 8 Nov 2022 15:50:03 +0100 Subject: [PATCH 1/4] AKGG, ABWElsebrock und ApiBerlin --- .../ServicesOverviewReport.Designer.cs | 72 +-- ReportImp/AKGG/Akgg.csproj | 9 + ReportImp/AKGG/CustomReportCreator.cs | 63 ++ .../AKGG/KilometerAuswertung.Designer.cs | 608 ++++++++++++++++++ ReportImp/AKGG/KilometerAuswertung.cs | 44 ++ ReportImp/AKGG/KilometerAuswertung.resx | 303 +++++++++ .../Validation/ServiceRecordValidator.cs | 75 +++ 7 files changed, 1137 insertions(+), 37 deletions(-) create mode 100644 ReportImp/AKGG/KilometerAuswertung.Designer.cs create mode 100644 ReportImp/AKGG/KilometerAuswertung.cs create mode 100644 ReportImp/AKGG/KilometerAuswertung.resx diff --git a/ReportImp/ABWElsebrock/ServicesOverviewReport.Designer.cs b/ReportImp/ABWElsebrock/ServicesOverviewReport.Designer.cs index 590fb4184..20e6a4951 100644 --- a/ReportImp/ABWElsebrock/ServicesOverviewReport.Designer.cs +++ b/ReportImp/ABWElsebrock/ServicesOverviewReport.Designer.cs @@ -90,9 +90,9 @@ namespace ABWElsebrock this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); - this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldGroup = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -432,11 +432,11 @@ namespace ABWElsebrock // xrLabel12 // this.xrLabel12.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(400.4167F, 25F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(431.42F, 25F); this.xrLabel12.Multiline = true; this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(281.5833F, 24F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(250.58F, 24F); this.xrLabel12.StylePriority.UseBorders = false; this.xrLabel12.StylePriority.UseFont = false; this.xrLabel12.StylePriority.UseTextAlignment = false; @@ -446,10 +446,10 @@ namespace ABWElsebrock // xrLabel2 // this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(400.4167F, 0F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(431.42F, 0F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(281.5833F, 25F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(250.58F, 25F); this.xrLabel2.StylePriority.UseBorderDashStyle = false; this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // @@ -588,6 +588,8 @@ namespace ABWElsebrock // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel23, + this.xrLabel22, this.xrLabel5, this.xrLabel2, this.xrLabel12, @@ -620,9 +622,7 @@ namespace ABWElsebrock this.mitarbeiterName, this.xrLabel9, this.xrLabel13, - this.xrLabel8, - this.xrPageInfo1, - this.xrLabel21}); + this.xrLabel8}); this.GroupHeader2.Font = new System.Drawing.Font("Calibri", 11F); this.GroupHeader2.HeightF = 296.0417F; this.GroupHeader2.Name = "GroupHeader2"; @@ -792,32 +792,6 @@ namespace ABWElsebrock this.xrLabel11.StylePriority.UseTextAlignment = false; this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // - // xrPageInfo1 - // - this.xrPageInfo1.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold); - this.xrPageInfo1.Format = "{0:dd.MM.yyyy}"; - this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(603.875F, 252.9585F); - this.xrPageInfo1.Name = "xrPageInfo1"; - this.xrPageInfo1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); - this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; - this.xrPageInfo1.SizeF = new System.Drawing.SizeF(73.95844F, 23F); - this.xrPageInfo1.StylePriority.UseFont = false; - this.xrPageInfo1.StylePriority.UsePadding = false; - // - // xrLabel21 - // - this.xrLabel21.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(501.8749F, 252.9585F); - this.xrLabel21.Name = "xrLabel21"; - this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); - this.xrLabel21.SizeF = new System.Drawing.SizeF(100F, 23F); - this.xrLabel21.StylePriority.UseFont = false; - this.xrLabel21.StylePriority.UsePadding = false; - this.xrLabel21.StylePriority.UseTextAlignment = false; - this.xrLabel21.Text = "Wesel, "; - this.xrLabel21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrLabel21.TextTrimming = System.Drawing.StringTrimming.None; - // // fieldGroup // this.fieldGroup.DataMember = "Services"; @@ -825,6 +799,30 @@ namespace ABWElsebrock this.fieldGroup.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldGroup.Name = "fieldGroup"; // + // xrLabel22 + // + this.xrLabel22.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(274.094F, 25F); + this.xrLabel22.Multiline = true; + this.xrLabel22.Name = "xrLabel22"; + this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel22.SizeF = new System.Drawing.SizeF(138.4001F, 24F); + this.xrLabel22.StylePriority.UseBorders = false; + this.xrLabel22.StylePriority.UseFont = false; + this.xrLabel22.StylePriority.UseTextAlignment = false; + this.xrLabel22.Text = "Datum"; + this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // xrLabel23 + // + this.xrLabel23.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(274.094F, 0F); + this.xrLabel23.Name = "xrLabel23"; + this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel23.SizeF = new System.Drawing.SizeF(138.4001F, 25F); + this.xrLabel23.StylePriority.UseBorderDashStyle = false; + this.xrLabel23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -922,7 +920,7 @@ namespace ABWElsebrock private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; - private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1; - private DevExpress.XtraReports.UI.XRLabel xrLabel21; + private DevExpress.XtraReports.UI.XRLabel xrLabel23; + private DevExpress.XtraReports.UI.XRLabel xrLabel22; } } diff --git a/ReportImp/AKGG/Akgg.csproj b/ReportImp/AKGG/Akgg.csproj index 2e4ac87e7..2d8b4f247 100644 --- a/ReportImp/AKGG/Akgg.csproj +++ b/ReportImp/AKGG/Akgg.csproj @@ -87,6 +87,12 @@ MitarbeiterstundenkontoJahr.cs + + Component + + + KilometerAuswertung.cs + Component @@ -158,6 +164,9 @@ Designer + + KilometerAuswertung.cs + QuittierungsbelegPK.cs diff --git a/ReportImp/AKGG/CustomReportCreator.cs b/ReportImp/AKGG/CustomReportCreator.cs index d9f6a3d45..71b2ac33e 100644 --- a/ReportImp/AKGG/CustomReportCreator.cs +++ b/ReportImp/AKGG/CustomReportCreator.cs @@ -1,13 +1,76 @@ 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 BeWo.Service.DCEntityMapper; +using BS.Shared.Core; using DevExpress.XtraReports.UI; namespace Akgg { public class CustomReportCreator : DefaultReportCreator { + public override XtraReport CreateQueryReport(long queryOid, string queryReportId) + { + if (queryOid == 200) + return CreateKilometerbeleg(queryOid, queryReportId); + + return base.CreateQueryReport(queryOid, queryReportId); + } + + private XtraReport CreateKilometerbeleg(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); + + + if (qro.Rows.Count > 0) + { + DateTime dt = DateTime.Now; + DateTime.TryParse(qro.Rows[0].Field1.ToString(), out dt); + dt = dt.AddMonths(1).AddDays(-1); + DateTime dtStart = new DateTime(dt.Year, dt.Month, 1); + + long? customerOid = null; + if (qro.Rows[0].Field2 != null && qro.Rows[0].Field2.ToString() != "0") + { + customerOid = Int64.Parse(qro.Rows[0].Field2.ToString()); + //var customer = DAOFactory.GenericDAO.LoadByID(customerOid.Value); + var ro = ServicesOverviewRO.Create(customerOid.Value, dt.Month, dt.Year, false, 0, 0, 1, dt.Day, null); + var druck = new Akgg.Kilometerbeleg(); + druck.SetReportDataSource(ro); + return druck; + } + if (customerOid == null) + { + XtraReport masterReport = new XtraReport(); + masterReport.CreateDocument(); + + var customerList = DAOFactory.GenericDAO.GetAllActive(); + foreach (var c in customerList) + { + var cRo = ServicesOverviewRO.Create(c.Oid.Value, dt.Month, dt.Year, false, 0, 0, 1, dt.Day, null); + var seite1 = new Akgg.Kilometerbeleg(); + seite1.SetReportDataSource(cRo); + seite1.CreateDocument(); + masterReport.Pages.AddRange(seite1.Pages); + } + return masterReport; + } + } + return new XtraReport(); + } + 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, serviceCategoryOid); diff --git a/ReportImp/AKGG/KilometerAuswertung.Designer.cs b/ReportImp/AKGG/KilometerAuswertung.Designer.cs new file mode 100644 index 000000000..abe6f1e1e --- /dev/null +++ b/ReportImp/AKGG/KilometerAuswertung.Designer.cs @@ -0,0 +1,608 @@ +using BeWo.Report.ReportObjects; +namespace Akgg +{ + partial class Kilometerbeleg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components; + + /// + /// 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(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Kilometerbeleg)); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblKategorie = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblBewilligteStunden = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule(); + this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule(); + this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); + this.PageFooter = new DevExpress.XtraReports.UI.PageFooterBand(); + this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); + // + // Detail + // + this.Detail.Expanded = false; + 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; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.GroupHeader1}); + this.DetailReport.DataMember = "Services"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + this.DetailReport.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.DetailReport.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable3}); + this.Detail1.HeightF = 20F; + this.Detail1.Name = "Detail1"; + this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.Detail1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrTable3 + // + this.xrTable3.BorderColor = System.Drawing.Color.Black; + this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(23.31975F, 0F); + this.xrTable3.Name = "xrTable3"; + this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow6}); + this.xrTable3.SizeF = new System.Drawing.SizeF(697.6389F, 20F); + this.xrTable3.StylePriority.UseFont = false; + this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrTableRow6 + // + this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell13, + this.xrTableCell8, + this.xrTableCell7, + this.xrTableCell12, + this.xrTableCell50}); + this.xrTableRow6.Name = "xrTableRow6"; + this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableRow6.Weight = 1D; + // + // xrTableCell13 + // + this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd/MM/yyyy}")}); + this.xrTableCell13.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.StylePriority.UseBorders = false; + this.xrTableCell13.StylePriority.UseFont = false; + this.xrTableCell13.StylePriority.UsePadding = false; + this.xrTableCell13.StylePriority.UseTextAlignment = false; + this.xrTableCell13.Text = "xrTableCell13"; + this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell13.Weight = 0.1151080713251782D; + // + // xrTableCell8 + // + this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.TimeRangeString")}); + this.xrTableCell8.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell8.Weight = 0.1151080713251782D; + // + // xrTableCell7 + // + this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.GefahreneKilometer")}); + this.xrTableCell7.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.StylePriority.UseFont = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell7.Weight = 0.1151080713251782D; + // + // xrTableCell12 + // + this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.ServiceCategory", "{0:0.00}")}); + this.xrTableCell12.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.StylePriority.UseBorders = false; + this.xrTableCell12.StylePriority.UseFont = false; + this.xrTableCell12.StylePriority.UsePadding = false; + this.xrTableCell12.StylePriority.UseTextAlignment = false; + this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell12.Weight = 0.24839044938524055D; + // + // xrTableCell50 + // + this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeFullname")}); + this.xrTableCell50.Font = new System.Drawing.Font("Calibri", 11.25F); + this.xrTableCell50.Name = "xrTableCell50"; + this.xrTableCell50.StylePriority.UseBorders = false; + this.xrTableCell50.StylePriority.UseFont = false; + this.xrTableCell50.StylePriority.UsePadding = false; + this.xrTableCell50.StylePriority.UseTextAlignment = false; + this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell50.Weight = 0.25158803505397809D; + // + // GroupHeader1 + // + this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableServiceRecords1}); + this.GroupHeader1.HeightF = 45F; + this.GroupHeader1.Name = "GroupHeader1"; + this.GroupHeader1.RepeatEveryPage = true; + // + // xrTableServiceRecords1 + // + this.xrTableServiceRecords1.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableServiceRecords1.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableServiceRecords1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(23.31975F, 0F); + this.xrTableServiceRecords1.Name = "xrTableServiceRecords1"; + this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2, + this.xrTableRow1}); + this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(697.6388F, 45F); + this.xrTableServiceRecords1.StylePriority.UseBackColor = false; + this.xrTableServiceRecords1.StylePriority.UseBorders = false; + this.xrTableServiceRecords1.StylePriority.UseFont = false; + this.xrTableServiceRecords1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.xrTableCell2, + this.xrTableCell5, + this.lblKategorie, + this.xrTableCell48}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTableRow2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableRow2.Weight = 0.48945783132530124D; + // + // xrTableCell3 + // + this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell3.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrTableCell3.StylePriority.UseBorders = false; + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.Text = "Datum"; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.xrTableCell3.Weight = 0.26536310905417793D; + // + // xrTableCell2 + // + this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell2.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrTableCell2.StylePriority.UseBorders = false; + this.xrTableCell2.StylePriority.UseFont = false; + this.xrTableCell2.StylePriority.UsePadding = false; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Text = "Uhrzeit"; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.xrTableCell2.Weight = 0.26536310905417793D; + // + // xrTableCell5 + // + this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell5.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrTableCell5.StylePriority.UseBorders = false; + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "gefahrene"; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.xrTableCell5.Weight = 0.26536310905417793D; + // + // lblKategorie + // + this.lblKategorie.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.lblKategorie.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblKategorie.Multiline = true; + this.lblKategorie.Name = "lblKategorie"; + this.lblKategorie.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblKategorie.StylePriority.UseBorders = false; + this.lblKategorie.StylePriority.UseFont = false; + this.lblKategorie.StylePriority.UsePadding = false; + this.lblKategorie.StylePriority.UseTextAlignment = false; + this.lblKategorie.Text = "Leistungskategorie"; + this.lblKategorie.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.lblKategorie.Weight = 0.57262562345803214D; + // + // xrTableCell48 + // + this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell48.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell48.Multiline = true; + this.xrTableCell48.Name = "xrTableCell48"; + this.xrTableCell48.StylePriority.UseBorders = false; + this.xrTableCell48.StylePriority.UseFont = false; + this.xrTableCell48.StylePriority.UseTextAlignment = false; + this.xrTableCell48.Text = "Mitarbeiter"; + this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.xrTableCell48.Weight = 0.57999653282362529D; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1, + this.xrTableCell4, + this.xrTableCell6, + this.lblBewilligteStunden, + this.xrTableCell49}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 0.6118222424782902D; + // + // xrTableCell1 + // + this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.StylePriority.UseBorders = false; + this.xrTableCell1.Weight = 0.26536308774302592D; + // + // xrTableCell4 + // + this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.StylePriority.UseBorders = false; + this.xrTableCell4.Weight = 0.26536308774302592D; + // + // xrTableCell6 + // + this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell6.Font = new System.Drawing.Font("Calibri", 11.25F); + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.StylePriority.UseBorders = false; + this.xrTableCell6.StylePriority.UseFont = false; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.Text = "Kilometer"; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell6.Weight = 0.26536308774302592D; + // + // lblBewilligteStunden + // + this.lblBewilligteStunden.BackColor = System.Drawing.Color.Gainsboro; + this.lblBewilligteStunden.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.lblBewilligteStunden.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblBewilligteStunden.Multiline = true; + this.lblBewilligteStunden.Name = "lblBewilligteStunden"; + this.lblBewilligteStunden.StylePriority.UseBackColor = false; + this.lblBewilligteStunden.StylePriority.UseBorders = false; + this.lblBewilligteStunden.StylePriority.UseFont = false; + this.lblBewilligteStunden.StylePriority.UseTextAlignment = false; + this.lblBewilligteStunden.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.lblBewilligteStunden.Weight = 0.57262560560464493D; + // + // xrTableCell49 + // + this.xrTableCell49.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell49.Font = new System.Drawing.Font("Calibri", 8F); + this.xrTableCell49.Multiline = true; + this.xrTableCell49.Name = "xrTableCell49"; + this.xrTableCell49.StylePriority.UseBorders = false; + this.xrTableCell49.StylePriority.UseFont = false; + this.xrTableCell49.StylePriority.UseTextAlignment = false; + this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell49.Weight = 0.5799965778597268D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // + // formattingRuleStartDate + // + this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; + this.formattingRuleStartDate.DataMember = "ServicesDouble"; + this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; + this.formattingRuleStartDate.Name = "formattingRuleStartDate"; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel7, + this.xrLabel6, + this.xrLabel5, + this.xrLabel2}); + this.ReportHeader.HeightF = 118.5417F; + this.ReportHeader.Name = "ReportHeader"; + // + // xrLabel7 + // + this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalGefahreneKilometerString", "Kilometer gesamt: {0:}")}); + this.xrLabel7.Font = new System.Drawing.Font("Calibri", 11.25F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(23.3194F, 74.77779F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(365.6404F, 25F); + this.xrLabel7.StylePriority.UseFont = false; + // + // xrLabel6 + // + this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel6.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(23.31975F, 50.77779F); + this.xrLabel6.Name = "xrLabel6"; + this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(365.64F, 24F); + this.xrLabel6.StylePriority.UseBackColor = false; + this.xrLabel6.StylePriority.UseBorders = false; + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.StylePriority.UsePadding = false; + this.xrLabel6.StylePriority.UseTextAlignment = false; + this.xrLabel6.Text = "[CustomerName]"; + this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrLabel5 + // + this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel5.Font = new System.Drawing.Font("Calibri", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(388.9597F, 0F); + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(159.9986F, 25F); + this.xrLabel5.StylePriority.UseBackColor = false; + this.xrLabel5.StylePriority.UseBorders = false; + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.StylePriority.UsePadding = false; + this.xrLabel5.StylePriority.UseTextAlignment = false; + this.xrLabel5.Text = "[Month] [Year]"; + this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrLabel2 + // + this.xrLabel2.Font = new System.Drawing.Font("Calibri", 14F, System.Drawing.FontStyle.Bold); + this.xrLabel2.ForeColor = System.Drawing.Color.Black; + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(23.31975F, 0F); + this.xrLabel2.Multiline = true; + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(365.64F, 25F); + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.StylePriority.UseForeColor = false; + this.xrLabel2.StylePriority.UseTextAlignment = false; + this.xrLabel2.Text = "Auswertung über gefahrene Kilometer"; + this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // formattingRuleServiceDesc + // + this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]"; + this.formattingRuleServiceDesc.DataMember = "ServicesDouble"; + this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; + this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc"; + // + // formattingRuleCostBearer + // + this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]"; + this.formattingRuleCostBearer.DataMember = "ServicesDouble"; + this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; + this.formattingRuleCostBearer.Name = "formattingRuleCostBearer"; + // + // formattingRuleEmployeeName + // + this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]"; + this.formattingRuleEmployeeName.DataMember = "ServicesDouble"; + this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; + this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName"; + // + // topMarginBand1 + // + this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPictureBox1}); + this.topMarginBand1.HeightF = 121F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // xrPictureBox1 + // + this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(548.5628F, 0F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(198.4372F, 120.625F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 30F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // fieldKontaktArt + // + this.fieldKontaktArt.DataMember = "Services"; + this.fieldKontaktArt.Expression = "Iif([IsGroup], \'GR\', \'E\')"; + this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; + this.fieldKontaktArt.Name = "fieldKontaktArt"; + // + // PageFooter + // + this.PageFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPageInfo1, + this.xrPageInfo2}); + this.PageFooter.HeightF = 47.95836F; + this.PageFooter.Name = "PageFooter"; + // + // xrPageInfo1 + // + this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(23.31975F, 24.95836F); + this.xrPageInfo1.Name = "xrPageInfo1"; + this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; + this.xrPageInfo1.SizeF = new System.Drawing.SizeF(231.2502F, 23F); + this.xrPageInfo1.StylePriority.UseFont = false; + // + // xrPageInfo2 + // + this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo2.Format = "Seite {0} von {1}"; + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(477.6284F, 24.95836F); + this.xrPageInfo2.Name = "xrPageInfo2"; + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(243.33F, 23F); + this.xrPageInfo2.StylePriority.UseFont = false; + this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // Kilometerbeleg + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.DetailReport, + this.ReportHeader, + this.topMarginBand1, + this.bottomMarginBand1, + this.PageFooter}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.fieldKontaktArt}); + this.DataSource = this.bindingSource1; + this.Font = new System.Drawing.Font("Arial", 10F); + this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { + this.formattingRuleStartDate, + this.formattingRuleServiceDesc, + this.formattingRuleCostBearer, + this.formattingRuleEmployeeName}); + this.Margins = new System.Drawing.Printing.Margins(50, 30, 121, 30); + this.PageHeight = 1169; + this.PageWidth = 827; + this.PaperKind = System.Drawing.Printing.PaperKind.A4; + this.Version = "17.1"; + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + + } + + #endregion + + private DevExpress.XtraReports.UI.DetailBand Detail; + private System.Windows.Forms.BindingSource bindingSource1; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; + private DevExpress.XtraReports.UI.FormattingRule formattingRuleStartDate; + private DevExpress.XtraReports.UI.FormattingRule formattingRuleServiceDesc; + private DevExpress.XtraReports.UI.FormattingRule formattingRuleCostBearer; + private DevExpress.XtraReports.UI.FormattingRule formattingRuleEmployeeName; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; + private DevExpress.XtraReports.UI.XRTable xrTableServiceRecords1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell lblKategorie; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell lblBewilligteStunden; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell49; + private DevExpress.XtraReports.UI.XRLabel xrLabel6; + private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.XRTable xrTable3; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell50; + private DevExpress.XtraReports.UI.CalculatedField fieldKontaktArt; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.PageFooterBand PageFooter; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; + } +} diff --git a/ReportImp/AKGG/KilometerAuswertung.cs b/ReportImp/AKGG/KilometerAuswertung.cs new file mode 100644 index 000000000..60859de77 --- /dev/null +++ b/ReportImp/AKGG/KilometerAuswertung.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.IO; +using System.Text.RegularExpressions; +using BeWo.Report; +using BeWo.Report.ReportObjects; +using BeWo.Service.ServiceImplementations; +using BS.Shared.Core; +using BS.Shared.DataContracts; +using DevExpress.XtraReports.UI; + +namespace Akgg +{ + public partial class Kilometerbeleg : XtraReport, IBeWoReport + { + public Kilometerbeleg() + { + InitializeComponent(); + } + + public void SetReportDataSource(ServicesOverviewRO pRO) + { + + if (pRO.Services != null) + { + List servicesBillable = new List(); + + foreach (var sd in pRO.Services) + { + if (sd.IsBillable) + { + sd.Minutes = sd.Minutes / 60; + servicesBillable.Add(sd); + } + } + + pRO.Services = servicesBillable; + } + + bindingSource1.DataSource = pRO; + } + } +} diff --git a/ReportImp/AKGG/KilometerAuswertung.resx b/ReportImp/AKGG/KilometerAuswertung.resx new file mode 100644 index 000000000..ef4d34edb --- /dev/null +++ b/ReportImp/AKGG/KilometerAuswertung.resx @@ -0,0 +1,303 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 21, 17 + + + + + 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 + + + \ No newline at end of file diff --git a/ReportImp/ApiBerlin/Validation/ServiceRecordValidator.cs b/ReportImp/ApiBerlin/Validation/ServiceRecordValidator.cs index 7d2f69bb6..4346178e6 100644 --- a/ReportImp/ApiBerlin/Validation/ServiceRecordValidator.cs +++ b/ReportImp/ApiBerlin/Validation/ServiceRecordValidator.cs @@ -39,6 +39,81 @@ namespace ApiBerlin.Validation } } + bool isGroupRecord = (cb2scOids != null && cb2scOids.Count > 1) || + (employeeOids != null && employeeOids.Count > 1); + + + DateTime start = newServiceRecord.Start.Value; + bool noTime = (start.Hour == 0 && start.Minute == 0 && start.Second == 1); //Keine Zeit angegeben + var duration = (decimal)newServiceRecord.End.Value.Subtract(newServiceRecord.Start.Value).TotalMinutes; + if (!noTime && duration == 0) + { + noTime = true; + } + newServiceRecord.RoundedDuration = duration; + decimal roundedDuration = duration; + + var srdc = PluginLoader.FindClass(); + if (srdc != null) + { + srdc.CalculateRoundedDuration(newServiceRecord); + + roundedDuration = newServiceRecord.RoundedDuration; + } + + decimal? grd = newServiceRecord.GroupRoundedDuration; + + if (isGroupRecord) + { + var groupcalc = PluginLoader.FindClass(); + + if (groupcalc != null) + { + var gd = groupcalc.CalculateGroupDuration(cb2scOids.Count, employeeOids.Count, duration, cb2scOids.ToArray()); + if (gd == null) + { + grd = roundedDuration; + roundedDuration = Math.Round(roundedDuration / cb2scOids.Count, 0, MidpointRounding.AwayFromZero); + } + else + { + grd = gd.TotalDuration; + roundedDuration = gd.SingleDuration; + } + + } + } + + + //var minuteInterval = cbDC.ActualMinuteIntervall; + //if (minuteInterval > 0) + newServiceRecord.RoundedDuration = roundedDuration; + + + decimal rd = newServiceRecord.RoundedDuration; + + if (!isGroupRecord) + { + ServiceRecordValidationResultDC resultdc = CheckOverlappingEmployeeServiceRecords(newServiceRecord, start, newServiceRecord.Employee.EmployeeOid, rd); + if (resultdc != null) + result.Add(resultdc); + } + else if (employeeOids != null) + { + foreach (long employeeOid in employeeOids) + { + ServiceRecordValidationResultDC resultdc = null; + if (resultdc == null) + { + resultdc = CheckOverlappingEmployeeServiceRecords(newServiceRecord, start, employeeOid, grd ?? rd); + if (resultdc != null) + result.Add(resultdc); + + } + } + } + + return result; } } From 1616fc68ac1413ecb94b543c368cbe5775e4227b Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 8 Nov 2022 15:50:32 +0100 Subject: [PATCH 2/4] AutismusKoelnBonn und DiakonieKKKleve --- ReportImp/AutismusKoelnBonn/BasisRechnung.cs | 24 ++++++-- .../Invoicing/FactorInvoiceCreation.cs | 43 +++++++++++++- .../RechnungFaktor.Designer.cs | 18 +++--- ReportImp/AutismusKoelnBonn/RechnungFaktor.cs | 47 +++++++++++++-- .../AutismusKoelnBonn/SettlementReport.cs | 40 +++++++++---- .../AutismusKoelnBonn/SettlementReport2.cs | 58 ++++++++++++++++++- .../Reporting/DkkkReportCreator.cs | 2 +- 7 files changed, 200 insertions(+), 32 deletions(-) diff --git a/ReportImp/AutismusKoelnBonn/BasisRechnung.cs b/ReportImp/AutismusKoelnBonn/BasisRechnung.cs index 5901933dc..7a90ac760 100644 --- a/ReportImp/AutismusKoelnBonn/BasisRechnung.cs +++ b/ReportImp/AutismusKoelnBonn/BasisRechnung.cs @@ -4,7 +4,7 @@ using BeWo.Data.Access; using BeWo.Data.Entities; using BeWo.Report; using BeWo.Report.ReportObjects; - +using BS.Shared; using DevExpress.XtraReports.UI; namespace AutismusKoelnBonn @@ -22,7 +22,15 @@ namespace AutismusKoelnBonn // jeder Klient ist derzeit wirklich nur in einem Team DateTime start = pRO.AccountingPeriodStart; DateTime end = pRO.AccountingPeriodEnd; - + string poBox = null; + if (pRO.RecipientOrganisation.ToLower() != "selbstzahler" && pRO.InvoiceBase.RecipientContactInformations.Count > 0) + { + foreach (var i in pRO.InvoiceBase.RecipientContactInformations) + { + if (i.ContactType == BS.Shared.ContactType.private_POBox) + poBox = i.ContactValue; + } + } StringBuilder sb = new StringBuilder(); //if (!String.IsNullOrEmpty(pRO.RecipientAddressLine1) && !String.IsNullOrEmpty(pRO.RecipientAddressLine1.Trim()) && pRO.RecipientOrganisation.Contains(pRO.CustomerLastName)) @@ -45,11 +53,15 @@ namespace AutismusKoelnBonn { sb.AppendLine(pRO.RecipientContactPerson); } - if (!String.IsNullOrEmpty(pRO.RecipientPoBox)) + if (pRO.RecipientOrganisation.ToLower() != "selbstzahler" && !String.IsNullOrEmpty(poBox)) + { + sb.AppendLine(poBox); + } + else if (!String.IsNullOrEmpty(pRO.RecipientPoBox)) { sb.AppendLine(pRO.RecipientPoBox); } - if (!String.IsNullOrEmpty(pRO.RecipientStreet) && String.IsNullOrEmpty(pRO.RecipientPoBox)) + else if (!String.IsNullOrEmpty(pRO.RecipientStreet)) { sb.AppendLine(pRO.RecipientStreet); } @@ -66,6 +78,8 @@ namespace AutismusKoelnBonn c = DAOFactory.GenericDAO.LoadByID(pRO.ServiceInvoicePeriods[0].Customer.Oid ?? 0); if (c.Team2CustomerList.Count > 0) team = c.Team2CustomerList[0].Team.Name; + if (c.Person.Sex == Sex.Divers) + pRO.CustomerSalutation = "Liebe*r"; } if (team.Contains("Team Bonn")) @@ -122,6 +136,8 @@ namespace AutismusKoelnBonn lblAnrede.Text = String.Format("Sehr geehrter Herr {0},", pRO.CustomerLastName); else if (!String.IsNullOrEmpty(pRO.CustomerSalutation) && pRO.CustomerSalutation.ToLower().Contains("frau")) lblAnrede.Text = String.Format("Sehr geehrte Frau {0},", pRO.CustomerLastName); + else if (!String.IsNullOrEmpty(pRO.CustomerSalutation) && pRO.CustomerSalutation.ToLower().Contains("liebe")) + lblAnrede.Text = String.Format("{0} {1} {2},", pRO.CustomerSalutation, pRO.CustomerFirstName, pRO.CustomerLastName); } this.bindingSource1.DataSource = pRO; diff --git a/ReportImp/AutismusKoelnBonn/Invoicing/FactorInvoiceCreation.cs b/ReportImp/AutismusKoelnBonn/Invoicing/FactorInvoiceCreation.cs index 89e4d58bb..26bb20a9d 100644 --- a/ReportImp/AutismusKoelnBonn/Invoicing/FactorInvoiceCreation.cs +++ b/ReportImp/AutismusKoelnBonn/Invoicing/FactorInvoiceCreation.cs @@ -1,7 +1,10 @@ -using BeWo.Data.Entities; +using BeWo.Data.Access; +using BeWo.Data.Entities; using BeWo.Service.Invoicing; using BS.Shared.Core; +using BS.Shared.DataContracts; using BS.Shared.DataContracts.Compact; +using BS.Shared.Services; using System; using System.Collections.Generic; using System.Linq; @@ -15,5 +18,43 @@ namespace AutismusKoelnBonn.Invoicing { invoice.InvoiceBase.InvoiceId = "Faktor"; } + + //public override void BerechneSummaryItemsSummen(List newlist, bool addRateFactorToUnitCount) + //{ + // base.BerechneSummaryItemsSummen(newlist, true); + //} + + public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc) + { + var invoiceItem = new InvoiceItem(); + + BillingData bd = calc.GetBillingData(iServiceRecord); + + invoiceItem.ItemDescription = iServiceRecord.ServiceDescription.Name; //iServiceRecord.Employee + " - " + iServiceRecord.ServiceDescription.Name; + invoiceItem.AmountPerUnit = bd.AmountPerUnit; + invoiceItem.UnitCount = bd.UnitCount; + invoiceItem.ItemPeriodStart = bd.BillingPeriodStart; + invoiceItem.ItemPeriodEnd = bd.BillingPeriodEnd; + invoiceItem.AccountingInterval = bd.AccountingInterval; + invoiceItem.ItemDescription = iServiceRecord.ServiceDescription.Name; //iServiceRecord.Employee + " - " + iServiceRecord.ServiceDescription.Name; + invoiceItem.ServiceRecord = DAOFactory.GenericDAO.LoadByID(iServiceRecord.ServiceRecordOid.Value); + if (scap != null) + invoiceItem.SupportConceptApprovalPeriodOid = scap.Oid; + + if (iServiceRecord.ServiceDescription.Name == "Fallpauschale") + { + invoiceItem.AmountTotal = bd.AmountPerUnit * bd.UnitCount; + invoiceItem.RateFactor = null; + invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal; + } + + else + { + invoiceItem.AmountTotal = bd.AmountTotal; + invoiceItem.RateFactor = iServiceRecord.CostBearer.ActualRateFactor; + invoiceItem.GrossAmountTotal = bd.AmountTotal + (bd.AmountTotal * iServiceRecord.CostBearer.ActualRateFactor / 100); + } + return invoiceItem; + } } } \ No newline at end of file diff --git a/ReportImp/AutismusKoelnBonn/RechnungFaktor.Designer.cs b/ReportImp/AutismusKoelnBonn/RechnungFaktor.Designer.cs index 4ea76ecb1..b2034005d 100644 --- a/ReportImp/AutismusKoelnBonn/RechnungFaktor.Designer.cs +++ b/ReportImp/AutismusKoelnBonn/RechnungFaktor.Designer.cs @@ -94,9 +94,9 @@ namespace AutismusKoelnBonn this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.AnteilFaktor = new DevExpress.XtraReports.UI.CalculatedField(); this.StdFaktor = new DevExpress.XtraReports.UI.CalculatedField(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText6)).BeginInit(); @@ -720,6 +720,8 @@ namespace AutismusKoelnBonn this.xrTableCell40.BorderColor = System.Drawing.Color.Black; this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")}); this.xrTableCell40.Font = new System.Drawing.Font("Arial", 10F); this.xrTableCell40.Name = "xrTableCell40"; this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); @@ -775,7 +777,7 @@ namespace AutismusKoelnBonn this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AnteilFaktor", "{0:n2}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Notice", "{0:n2}")}); this.xrTableCell7.Font = new System.Drawing.Font("Arial", 10F); this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); @@ -794,7 +796,7 @@ namespace AutismusKoelnBonn this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.StdFaktor", "{0:n2}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCountString", "{0:n2}")}); this.xrTableCell9.Font = new System.Drawing.Font("Arial", 10F); this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); @@ -812,7 +814,7 @@ namespace AutismusKoelnBonn this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:0.##} €")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AmountPerUnit", "{0:0.00} €")}); this.xrTableCell44.Font = new System.Drawing.Font("Arial", 10F); this.xrTableCell44.Name = "xrTableCell44"; this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); @@ -1014,10 +1016,6 @@ namespace AutismusKoelnBonn this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell6.Weight = 0.52190865825182176D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // // AnteilFaktor // this.AnteilFaktor.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; @@ -1030,6 +1028,10 @@ namespace AutismusKoelnBonn this.StdFaktor.Expression = "[Hours]*1.2"; this.StdFaktor.Name = "StdFaktor"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // // ServiceInvoiceReportFactor // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { diff --git a/ReportImp/AutismusKoelnBonn/RechnungFaktor.cs b/ReportImp/AutismusKoelnBonn/RechnungFaktor.cs index 6f47e0e17..79af5fffd 100644 --- a/ReportImp/AutismusKoelnBonn/RechnungFaktor.cs +++ b/ReportImp/AutismusKoelnBonn/RechnungFaktor.cs @@ -23,10 +23,20 @@ namespace AutismusKoelnBonn // jeder Klient ist derzeit wirklich nur in einem Team DateTime start = pRO.AccountingPeriodStart; DateTime end = pRO.AccountingPeriodEnd; - + + string poBox = null; + if (pRO.InvoiceBase.RecipientContactInformations.Count > 0) + { + foreach (var i in pRO.InvoiceBase.RecipientContactInformations) + { + if (i.ContactType == BS.Shared.ContactType.private_POBox) + poBox = i.ContactValue; + } + } + StringBuilder sb = new StringBuilder(); - //if (!String.IsNullOrEmpty(pRO.RecipientAddressLine1) && !String.IsNullOrEmpty(pRO.RecipientAddressLine1.Trim()) && pRO.RecipientOrganisation.Contains(pRO.CustomerLastName)) + //if (!String.IsNullOrEmpty(pRO.RecipientAddressLine1) && !String.IsNullOrEmpty(pRO.RecipientAddressLine1.Trim()))) //{ // sb.AppendLine(pRO.RecipientAddressLine1); //} @@ -46,11 +56,15 @@ namespace AutismusKoelnBonn { sb.AppendLine(pRO.RecipientContactPerson); } - if (!String.IsNullOrEmpty(pRO.RecipientPoBox)) + if (!String.IsNullOrEmpty(poBox)) + { + sb.AppendLine(poBox); + } + else if (!String.IsNullOrEmpty(pRO.RecipientPoBox)) { sb.AppendLine(pRO.RecipientPoBox); } - if (!String.IsNullOrEmpty(pRO.RecipientStreet) && String.IsNullOrEmpty(pRO.RecipientPoBox)) + else if (!String.IsNullOrEmpty(pRO.RecipientStreet)) { sb.AppendLine(pRO.RecipientStreet); } @@ -97,6 +111,31 @@ namespace AutismusKoelnBonn lblHeaderKoeln.Visible = false; lblTeamKoeln.Visible = false; } + + foreach (var sip in pRO.ServiceInvoicePeriods) + { + foreach (var ii in sip.ServiceInvoiceItems) + { + ii.Notice = ""; + ii.UnitCountString = ""; + double hours = (double)Convert.ToDecimal(ii.Hours ?? 1); + if (ii.ServiceDescription != "Fallpauschale") + { + ii.ServiceDescription = "Fachleistungsstunden"; + if (ii.Hours != null && ii.Hours != 0) + { + + ii.Notice = String.Format("{0:0.00}", hours * 0.2); + ii.UnitCountString = String.Format("{0:0.00}", hours * 1.2); + } + } + else + { + ii.UnitCountString = String.Format("{0:0.00}", hours); + } + } + } + this.bindingSource1.DataSource = pRO; } } diff --git a/ReportImp/AutismusKoelnBonn/SettlementReport.cs b/ReportImp/AutismusKoelnBonn/SettlementReport.cs index 32cecee30..4ea2fc72b 100644 --- a/ReportImp/AutismusKoelnBonn/SettlementReport.cs +++ b/ReportImp/AutismusKoelnBonn/SettlementReport.cs @@ -18,6 +18,17 @@ namespace AutismusKoelnBonn.Alt public void SetReportDataSource(SettlementRO pRO) { + var cb2sc = DAOFactory.GenericDAO.LoadByID(pRO.CostBearer2SupportConceptOid); + string poBox = null; + if (cb2sc.CostBearer.Organisation.Contacts.Count > 0) + { + foreach (var i in cb2sc.CostBearer.Organisation.Contacts) + { + if (i.Type == BS.Shared.ContactType.private_POBox) + poBox = i.Value; + } + } + StringBuilder sb = new StringBuilder(); if (!String.IsNullOrEmpty(pRO.RecipientOrganisation)) @@ -28,19 +39,23 @@ namespace AutismusKoelnBonn.Alt { sb.AppendLine(pRO.RecipientDivision); } - //Angaben aus Rechnungsadresse - //var cb2sc = DAOFactory.GenericDAO.LoadByID(pRO.CostBearer2SupportConceptOid); - //if (!String.IsNullOrEmpty(cb2sc.CostBearer.Organisation.InvoiceAddress.AddressLine1)) - //{ - // sb.AppendLine(cb2sc.CostBearer.Organisation.InvoiceAddress.AddressLine1); - // } - if (!String.IsNullOrEmpty(pRO.RecipientContactPerson)) + //Angaben aus Rechnungsadresse + //var cb2sc = DAOFactory.GenericDAO.LoadByID(pRO.CostBearer2SupportConceptOid); + if (!String.IsNullOrEmpty(cb2sc.CostBearer.Organisation.InvoiceAddress.AddressLine1)) + { + sb.AppendLine(cb2sc.CostBearer.Organisation.InvoiceAddress.AddressLine1); + } + if (!String.IsNullOrEmpty(pRO.RecipientContactPerson)) { sb.AppendLine(pRO.RecipientContactPerson); - } - if (!String.IsNullOrEmpty(pRO.RecipientPoBox)) + } + if (!String.IsNullOrEmpty(poBox)) { - sb.AppendLine(pRO.RecipientStreet); + sb.AppendLine(poBox); + } + else if (!String.IsNullOrEmpty(pRO.RecipientPoBox)) + { + sb.AppendLine(pRO.RecipientPoBox); } else if (!String.IsNullOrEmpty(pRO.RecipientStreet)) { @@ -112,11 +127,12 @@ namespace AutismusKoelnBonn.Alt pRO.AmountRecordedFLSString = String.Format("{0:c}", pRO.AmountRecordedFLS - pRO.Eigenbeteiligung); if (pRO.AbsenceTimes == "") - pRO.AbsenceTimes = String.Format("Stationärer Aufenthalt: keiner / im Monat {0:MM.yyyy}, siehe Quittierungsbeleg.", pRO.AccountingEndDate); + pRO.AbsenceTimes = String.Format("Stationärer Aufenthalt: keiner"); + else + pRO.AbsenceTimes = String.Format("Stationärer Aufenthalt: {0}, siehe Quittierungsbeleg(e).", pRO.AbsenceTimes); string team = "MoveAut Team Köln"; - var cb2sc = DAOFactory.GenericDAO.LoadByID(pRO.CostBearer2SupportConceptOid); var c = cb2sc.SupportConcept.Customer; if (c.Team2CustomerList.Count > 0) team = c.Team2CustomerList[0].Team.Name; diff --git a/ReportImp/AutismusKoelnBonn/SettlementReport2.cs b/ReportImp/AutismusKoelnBonn/SettlementReport2.cs index f28bb2577..98f703abf 100644 --- a/ReportImp/AutismusKoelnBonn/SettlementReport2.cs +++ b/ReportImp/AutismusKoelnBonn/SettlementReport2.cs @@ -7,6 +7,7 @@ using BeWo.Report.ReportObjects; using BeWo.Report; using BeWo.Data.Access; using BeWo.Data.Entities; +using System.Text; namespace AutismusKoelnBonn { @@ -19,7 +20,8 @@ namespace AutismusKoelnBonn public void SetReportDataSource(Settlement2RO pRO) { - + string poBox = null; + string AddressLine1 = null; decimal rateFactor = 1; foreach (var ii in pRO.InvoiceItems) @@ -35,13 +37,26 @@ namespace AutismusKoelnBonn pRO.AmountBillableTotal = pRO.AmountBillableTotal - pRO.Eigenbeteiligung ?? 0; if (pRO.AbsenceTimes == "") - pRO.AbsenceTimes = String.Format("Stationärer Aufenthalt: keiner / im Monat {0:MM.yyyy}, siehe Quittierungsbeleg.", pRO.AccountingEndDate); + pRO.AbsenceTimes = String.Format("Stationärer Aufenthalt: keiner"); + else + pRO.AbsenceTimes = String.Format("Stationärer Aufenthalt: {0}, siehe Quittierungsbeleg(e).", pRO.AbsenceTimes); string team = "MoveAut Team Köln"; if (pRO.InvoiceBaseOid.HasValue) { var ib = DAOFactory.GenericDAO.LoadByID(pRO.InvoiceBaseOid.Value); var c = ib.CostBearer2SupportConcept.SupportConcept.Customer; + if (ib.CostBearer2SupportConcept.CostBearer.Organisation.Contacts.Count > 0) + { + foreach (var i in ib.CostBearer2SupportConcept.CostBearer.Organisation.Contacts) + { + if (i.Type == BS.Shared.ContactType.private_POBox) + poBox = i.Value; + } + } + if (!String.IsNullOrEmpty(ib.CostBearer2SupportConcept.CostBearer.Organisation.InvoiceAddress.AddressLine1)) + AddressLine1 = ib.CostBearer2SupportConcept.CostBearer.Organisation.InvoiceAddress.AddressLine1; + if (c.Team2CustomerList.Count > 0) team = c.Team2CustomerList[0].Team.Name; @@ -77,6 +92,45 @@ namespace AutismusKoelnBonn //} } + StringBuilder sb = new StringBuilder(); + + if (!String.IsNullOrEmpty(pRO.RecipientOrganisation)) + { + sb.AppendLine(pRO.RecipientOrganisation); + } + if (!String.IsNullOrEmpty(pRO.RecipientDivision)) + { + sb.AppendLine(pRO.RecipientDivision); + } + //Angaben aus Rechnungsadresse + //var cb2sc = DAOFactory.GenericDAO.LoadByID(pRO.CostBearer2SupportConceptOid); + if (!String.IsNullOrEmpty(AddressLine1)) + { + sb.AppendLine(AddressLine1); + } + if (!String.IsNullOrEmpty(pRO.RecipientContactPerson)) + { + sb.AppendLine(pRO.RecipientContactPerson); + } + if (!String.IsNullOrEmpty(poBox)) + { + sb.AppendLine(poBox); + } + else if (!String.IsNullOrEmpty(pRO.RecipientPostBox)) + { + sb.AppendLine(pRO.RecipientPostBox); + } + else if (!String.IsNullOrEmpty(pRO.RecipientStreet)) + { + sb.AppendLine(pRO.RecipientStreet); + } + if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown)) + { + sb.AppendLine(pRO.RecipientPostCodeAndTown); + } + + lblAdresse.Text = sb.ToString(); + foreach (var i in pRO.InvoiceItems) { i.DetailDescription = String.Format("Summe der Betreuungsminuten /60x{4:0.00}{3}Faktor in der Zeit von {0:dd.MM.yyyy} bis {1:dd.MM.yyyy} gemäß Anlage: ", diff --git a/ReportImp/DiakonieKKKleve/Reporting/DkkkReportCreator.cs b/ReportImp/DiakonieKKKleve/Reporting/DkkkReportCreator.cs index 94c214d69..a888c747d 100644 --- a/ReportImp/DiakonieKKKleve/Reporting/DkkkReportCreator.cs +++ b/ReportImp/DiakonieKKKleve/Reporting/DkkkReportCreator.cs @@ -125,7 +125,7 @@ namespace DiakonieKKKleve.Reporting } - //report = AddSubServicesOverviewReportToReport(report, new LeistungsnachweisSoziotherapie(), soziRo); + report = AddSubServicesOverviewReportToReport(report, new LeistungsnachweisSoziotherapie(), soziRo); report = AddSubServicesOverviewReportToReport(report, new Stundenzettel(), bewoRo); //report = AddSubServicesOverviewReportToReport(report, new QuittierungsbelegDienstleistung(), dienstRo); From 7c9e356102e23b6906081132d56f4aca1bddc676 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 8 Nov 2022 17:37:51 +0100 Subject: [PATCH 3/4] BudgetnachweisAnhangRO --- .../ReportObjects/BudgetnachweisAnhangRO.cs | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/Report/ReportObjects/BudgetnachweisAnhangRO.cs b/Report/ReportObjects/BudgetnachweisAnhangRO.cs index 278a00b5a..824a0614b 100644 --- a/Report/ReportObjects/BudgetnachweisAnhangRO.cs +++ b/Report/ReportObjects/BudgetnachweisAnhangRO.cs @@ -83,7 +83,7 @@ namespace BeWo.Report.ReportObjects ez.Start = cr.StartDate.Value; ez.Ende = cr.EndDate.Value; - if (ez.Start == DateTime.MinValue) + if (ez.Start == DateTime.MinValue || ez.Start < BewilligtStart) { ez.Start = this.BewilligtStart; } @@ -113,7 +113,7 @@ namespace BeWo.Report.ReportObjects Dictionary monat2Zeile = new Dictionary(); - DateTime monat = new DateTime(this.BewilligtStart.Year, this.BewilligtStart.Month, 1); + DateTime monat = new DateTime(this.BewilligtStart.Year, this.BewilligtStart.Month, this.BewilligtStart.Day); while (monat <= this.BewilligtEnde) { @@ -132,6 +132,8 @@ namespace BeWo.Report.ReportObjects } } + if (monat.Day != 1) + monat = new DateTime(monat.Year, monat.Month, 1); monat = monat.AddMonths(1); monat2Zeile.Add(key, zeile); @@ -151,27 +153,29 @@ namespace BeWo.Report.ReportObjects if (monat2Zeile.ContainsKey(key)) { - monat2Zeile[key].ServiceRecords.Add(srDc); - - decimal minuten = sr.RoundedDuration; - if (sr.ServiceDescription.ServiceCategory.Percentage != 100) + if (monat2Zeile[key].Monat <= sr.Start.Value.Date) { - minuten = (minuten * sr.ServiceDescription.ServiceCategory.Percentage) / 100; - } + monat2Zeile[key].ServiceRecords.Add(srDc); - monat2Zeile[key].SummeMinuten += minuten; - - foreach (var e in this.Entgeltzeitraeume) - { - if (e.Start <= sr.Start.Value.Date && sr.Start.Value.Date <= e.Ende) + decimal minuten = sr.RoundedDuration; + if (sr.ServiceDescription.ServiceCategory.Percentage != 100) { - e.ServiceRecords.Add(srDc); - e.SummeFLMinuten += minuten; + minuten = (minuten * sr.ServiceDescription.ServiceCategory.Percentage) / 100; + } + + monat2Zeile[key].SummeMinuten += minuten; + + + foreach (var e in this.Entgeltzeitraeume) + { + if (e.Start <= sr.Start.Value.Date && sr.Start.Value.Date <= e.Ende) + { + e.ServiceRecords.Add(srDc); + e.SummeFLMinuten += minuten; + } } } - } - - + } } } From 4ddee2491486511ed177166725c45108c9652322 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 9 Nov 2022 09:44:24 +0100 Subject: [PATCH 4/4] cb --- BeWo/BeWo.csproj | 25 - BeWo/BeWo.csproj.user | 4 +- BeWo/BeWoApp.xaml.cs | 4 +- .../AccountingTransactionBookingView.xaml.cs | 18 +- BeWo/View/Detail/EmployeeView.xaml | 4 +- .../Detail/Report/FlexibleReportView.xaml.cs | 2 +- BeWo/View/Detail/SupportConceptView.xaml | 8 +- BeWo/View/Detail/SupportConceptView.xaml.cs | 47 +- .../Zeiterfassung/ServiceRecordEditView.xaml | 4 +- .../ServiceRecordEditView.xaml.cs | 4 +- .../ServiceRecordGroupEditView.xaml | 4 +- .../ServiceRecordGroupEditView.xaml.cs | 1 + .../Zeiterfassung/ServiceRecordView2.xaml | 2 +- .../Search/TextModuleTreeSearchView.xaml.cs | 2 +- BeWo/ViewModel/ServiceRecordVM.cs | 12 +- BeWo/ownChat/ChatDokumentationsView.xaml.cs | 1 + BeWoAllReports.sln | 27 + BeWoPlanerMobil/BeWoPlanerMobil.csproj | 4 +- BeWoPlanerMobil/BeWoPlanerMobil.csproj.user | 4 +- BeWoPlanerMobil/Controllers/ChatController.cs | 164 + BeWoPlanerMobil/Web.config | 2 +- Data/Access/SearchDAO.cs | 8 +- Data/Entities/ServiceRecord.cs | 2 +- Data/Entities/ServiceRecordHistory.cs | 2 +- Data/Mappings/ServiceRecord.hbm.xml | 2 +- Data/Mappings/ServiceRecordHistory.hbm.xml | 2 +- .../EmployeeKilometerauswertungsListRO.cs | 10 +- .../EmployeeKilometerauswertungsRO.cs | 19 +- Report/ReportObjects/FLSReportRO.cs | 5 +- .../KilometerauswertungsListRO.cs | 11 +- .../ReportObjects/KilometerauswertungsRO.cs | 20 +- .../MitarbeiterstundenkontoBerechnung.cs | 4 +- Report/ReportObjects/ServiceRecordListRO.cs | 2 +- Report/ReportObjects/SupportConceptListRO.cs | 3 +- .../AbwMuenster/SettlementReport.Designer.cs | 29 +- ReportImp/AbwMuenster/SettlementReport.cs | 14 + ReportImp/BeWoNordeifel/BeWoNordeifel.csproj | 5 + .../MitarbeiterstundenkontoBerechnung.cs | 12 +- .../Service/CustomVacationService.cs | 22 + .../CaritasHeilbronnHohenlohe.csproj | 84 + .../JahresauswertungHelper.cs | 460 + ...ahresauswertungMissinglist2022.Designer.cs | 8412 +++++++++++++++++ .../JahresauswertungMissinglist2022.cs | 1742 ++++ .../JahresauswertungMissinglist2022.resx | 120 + .../Properties/AssemblyInfo.cs | 36 + .../CaritasLudwigsburgWaiblingenEnz.csproj | 84 + .../JahresauswertungHelper.cs | 460 + ...ahresauswertungMissinglist2022.Designer.cs | 8412 +++++++++++++++++ .../JahresauswertungMissinglist2022.cs | 1743 ++++ .../JahresauswertungMissinglist2022.resx | 120 + .../Properties/AssemblyInfo.cs | 36 + .../Abrechnung/CustomInvoiceCreation.cs | 313 +- .../Export/DatevExporter.cs | 39 +- .../Invoicing/FudInvoiceCreation.cs | 2 +- .../RechnungHortPrivat.Designer.cs | 38 +- .../RechnungHortPrivat.cs | 82 +- ReportImp/PflegedienstWessel/Fahrtkosten.cs | 2 +- .../PflegedienstWessel.csproj | 1 + .../Properties/licenses.licx | 1 + .../Invoicing/PflegeInvoiceCreation.cs | 36 + .../ProfEggersStiftung/RechnungPflege.cs | 35 +- ...KilometerauswertungsListReport.Designer.cs | 506 + .../SeWo/KilometerauswertungsListReport.cs | 18 + .../SeWo/KilometerauswertungsListReport.resx | 123 + ReportImp/SeWo/KilometerauswertungsReport.cs | 20 + .../KilometerauswertungsReport.designer.cs | 488 + .../SeWo/KilometerauswertungsReport.resx | 123 + ReportImp/SeWo/SeWo.csproj | 21 + ReportImp/SeWo/Zeitzuschlagsbeleg.cs | 2 +- .../HilfeplanKontingent.Designer.cs | 598 ++ .../HilfeplanKontingent.cs | 28 + .../HilfeplanKontingent.resx | 126 + .../HilfeplanKontingentRO.cs | 136 + .../Reporting/CustomReportCreator.cs | 64 +- .../UebergangshilfeUnnaEV.csproj | 11 + .../ServiceRecordDC_ServiceRecord.cs | 16 +- ...iceRecordHistoryDC_ServiceRecordHistory.cs | 3 +- Service/Plugins/FlexibleReportService.cs | 3 +- Service/Plugins/PluginLoader.cs | 6 +- .../Plugins/StundenuebersichtAuswertung.cs | 53 +- .../Plugins/SupportConceptAnalysisCreator.cs | 61 +- .../AnalysisServiceImp.cs | 3 +- .../CustomerServiceImp.cs | 9 + .../OperationsServiceImp.cs | 3 +- .../ResourceServiceImp.cs | 6 + Shared/DataContracts/FlexibleReportEntryDC.cs | 3 + Shared/DataContracts/ServiceRecordDC.cs | 6 +- .../ServiceRecordFLSOverviewDC.cs | 5 +- .../DataContracts/ServiceRecordHistoryDC.cs | 5 +- .../DataContracts/SupportConceptOverviewDC.cs | 2 + Shared/Services/Calculations.cs | 4 +- 91 files changed, 24813 insertions(+), 412 deletions(-) create mode 100644 ReportImp/BeWoNordeifel/Service/CustomVacationService.cs create mode 100644 ReportImp/CaritasHeilbronnHohenlohe/CaritasHeilbronnHohenlohe.csproj create mode 100644 ReportImp/CaritasHeilbronnHohenlohe/JahresauswertungHelper.cs create mode 100644 ReportImp/CaritasHeilbronnHohenlohe/JahresauswertungMissinglist2022.Designer.cs create mode 100644 ReportImp/CaritasHeilbronnHohenlohe/JahresauswertungMissinglist2022.cs create mode 100644 ReportImp/CaritasHeilbronnHohenlohe/JahresauswertungMissinglist2022.resx create mode 100644 ReportImp/CaritasHeilbronnHohenlohe/Properties/AssemblyInfo.cs create mode 100644 ReportImp/CaritasLudwigsburgWaiblingenEnz/CaritasLudwigsburgWaiblingenEnz.csproj create mode 100644 ReportImp/CaritasLudwigsburgWaiblingenEnz/JahresauswertungHelper.cs create mode 100644 ReportImp/CaritasLudwigsburgWaiblingenEnz/JahresauswertungMissinglist2022.Designer.cs create mode 100644 ReportImp/CaritasLudwigsburgWaiblingenEnz/JahresauswertungMissinglist2022.cs create mode 100644 ReportImp/CaritasLudwigsburgWaiblingenEnz/JahresauswertungMissinglist2022.resx create mode 100644 ReportImp/CaritasLudwigsburgWaiblingenEnz/Properties/AssemblyInfo.cs create mode 100644 ReportImp/PflegedienstWessel/Properties/licenses.licx create mode 100644 ReportImp/SeWo/KilometerauswertungsListReport.Designer.cs create mode 100644 ReportImp/SeWo/KilometerauswertungsListReport.cs create mode 100644 ReportImp/SeWo/KilometerauswertungsListReport.resx create mode 100644 ReportImp/SeWo/KilometerauswertungsReport.cs create mode 100644 ReportImp/SeWo/KilometerauswertungsReport.designer.cs create mode 100644 ReportImp/SeWo/KilometerauswertungsReport.resx create mode 100644 ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingent.Designer.cs create mode 100644 ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingent.cs create mode 100644 ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingent.resx create mode 100644 ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingentRO.cs diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 4a61fae4f..7d13b2a6b 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -29,31 +29,6 @@ 3.5 - D:\Projects\beyondsoft\BeWoPlaner\Publish\ - true - Web - true - Foreground - 7 - Days - false - true - false - http://app.beyondsoft.de/ - de-DE - BeWoPlaner - beyondSoft GmbH - 2.0.1.217 - true - publish.htm - false - true - 218 - 2.0.1.%2a - false - true - true - true true diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user index 171fc3671..132b5415a 100644 --- a/BeWo/BeWo.csproj.user +++ b/BeWo/BeWo.csproj.user @@ -2,9 +2,9 @@ D:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\|C:\Projects\beyondsoft\BeWoPlaner\Publish\ - http://app.beyondsoft.de/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbdtest/|http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/lha/ + http://app.beyondsoft.de/|http://app.beyondsoft.de/test/|https://app.ownsoft.de/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbdtest/ - + https://app.ownsoft.de/|https://app.ownsoft.de/bewoplaner.application/ de-DE diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index 3df89c1a5..17c4653db 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -48,8 +48,8 @@ namespace BeWo public static LoginControl LoginControl; public static MainControl MainControl; - public static string ShortVersion = "3.10"; - public static string Version = "Version 3.10"; + public static string ShortVersion = "3.11"; + public static string Version = "Version 3.11"; public static int RenderTier = 0; diff --git a/BeWo/View/Detail/AccountingTransactionBookingView.xaml.cs b/BeWo/View/Detail/AccountingTransactionBookingView.xaml.cs index 2b8854707..bb11a377c 100644 --- a/BeWo/View/Detail/AccountingTransactionBookingView.xaml.cs +++ b/BeWo/View/Detail/AccountingTransactionBookingView.xaml.cs @@ -28,6 +28,7 @@ namespace BeWo.View.Detail { public partial class AccountingTransactionBookingView { + private bool saveInProgress = false; public static Visibility InsertedOnAndByVisibility { get @@ -191,8 +192,11 @@ namespace BeWo.View.Detail accountingTransactionGrid.SelectedItem = vm; } + protected override void Save() { + saveInProgress = true; + var lToDos = new List>(); if (ViewModel.AddedCount > 0) @@ -203,7 +207,13 @@ namespace BeWo.View.Detail var oids = s.InsertNewAccountingTransactions(ViewModel.CommitAdded()); var idx = 0; - foreach (var vm in ViewModel.AccountingTransactionVMList.Where(vm => vm.IsNew)) + var newVms = ViewModel.AccountingTransactionVMList.Where(vm => vm.IsNew); + + if (newVms.Count() != oids.Count) + { + int test = 0; + } + foreach (var vm in newVms) { vm.IsNew = false; vm.DataContract.AccountingTransactionVersion = 1; @@ -378,6 +388,7 @@ namespace BeWo.View.Detail { ViewModel.PrototypeVM.Amount = null; ViewModel.PrototypeVM.Notice = string.Empty; + saveInProgress = false; } private void SelectedItemChanged(FlatSupportConceptTreeNodeDC selectedNode) @@ -445,6 +456,10 @@ namespace BeWo.View.Detail private void button_add_Click(object sender, RoutedEventArgs e) { + if (saveInProgress) + { + return; + } var lValid = ValidationTrigger.Validate(rootGrid); if (lValid) @@ -464,6 +479,7 @@ namespace BeWo.View.Detail ViewModel.AccountingTransactionVMList.Add(atvm); + Save(); ViewModel.RefreshAccountingTransactionsForSelectedTreeNode(); } diff --git a/BeWo/View/Detail/EmployeeView.xaml b/BeWo/View/Detail/EmployeeView.xaml index 6a0f0a042..890c47dfd 100644 --- a/BeWo/View/Detail/EmployeeView.xaml +++ b/BeWo/View/Detail/EmployeeView.xaml @@ -469,8 +469,8 @@ - - + + diff --git a/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs b/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs index d5e9dc236..60d57298d 100644 --- a/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs +++ b/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs @@ -714,7 +714,7 @@ namespace BeWo.View.Detail.Report public FlexibleReportEntryType Type { get; set; } - public int? Kilometer { get; set; } + public decimal? Kilometer { get; set; } public decimal? Betrag { get; set; } diff --git a/BeWo/View/Detail/SupportConceptView.xaml b/BeWo/View/Detail/SupportConceptView.xaml index 3900e01a2..9da3bf94b 100644 --- a/BeWo/View/Detail/SupportConceptView.xaml +++ b/BeWo/View/Detail/SupportConceptView.xaml @@ -88,10 +88,10 @@ - - - - + + + + Drucken diff --git a/BeWo/View/Detail/SupportConceptView.xaml.cs b/BeWo/View/Detail/SupportConceptView.xaml.cs index 077a9a938..7449f6657 100644 --- a/BeWo/View/Detail/SupportConceptView.xaml.cs +++ b/BeWo/View/Detail/SupportConceptView.xaml.cs @@ -1626,30 +1626,6 @@ namespace BeWo.View.Detail return newVm; } - private void LinkPrintRating_OnRequestNavigate(object sender, RequestNavigateEventArgs e) - { - var link = sender as Hyperlink; - if (link != null) - { - var rating = link.Tag as RatingVM; - - if (rating != null) - { - var url = BeWoApp.SiteOfOrigin + "/ReportView.aspx" - + "?scOid=" + this.ViewModel.DataContract.SupportConceptOid ?? 0 - + "rOid=" + rating.DataContract.RatingOid ?? 0 - + "&type=" + Utils.EnumName(ReportTypes.RatingReport); - url = BeWoWpfUtils.GetHTMLEncodedURL(url); - - link.NavigateUri = new Uri(url); - BeWoUtils.NavigateToReportUri((sender as System.Windows.Documents.Hyperlink).NavigateUri.ToString(), Translator.Translate("Bewertung")); - } - } - - - - //System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo((sender as System.Windows.Documents.Hyperlink).NavigateUri.ToString())); - } private void BtnDeleteRating_Click(object sender, RoutedEventArgs e) { @@ -1918,6 +1894,29 @@ namespace BeWo.View.Detail } + + + private void linkPdfExport_Click(object sender, RoutedEventArgs e) + { + var link = sender as Hyperlink; + if (link != null) + { + var rating = link.Tag as RatingVM; + + if (rating != null && rating.DataContract.RatingOid.HasValue) + { + var url = BeWoApp.SiteOfOrigin + "/ReportView.aspx" + + "?scOid=" + (this.ViewModel.DataContract.SupportConceptOid ?? 0) + + "&rOid=" + (rating.DataContract.RatingOid ?? 0) + + "&type=" + Utils.EnumName(ReportTypes.RatingReport); + url = BeWoWpfUtils.GetHTMLEncodedURL(url); + + link.NavigateUri = new Uri(url); + BeWoUtils.NavigateToReportUri((sender as System.Windows.Documents.Hyperlink).NavigateUri.ToString(), Translator.Translate("Bewertung")); + } + } + + } } public class ValueListEntryTypeToColorConverter : IValueConverter diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml index b901ade59..b93165d4c 100644 --- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml +++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml @@ -288,8 +288,8 @@ + + KilometerauswertungsListReport.cs + Designer + + + KilometerauswertungsReport.cs + Mitarbeiterarbeitszeitkonto.cs diff --git a/ReportImp/SeWo/Zeitzuschlagsbeleg.cs b/ReportImp/SeWo/Zeitzuschlagsbeleg.cs index fae526358..3a72c1b3f 100644 --- a/ReportImp/SeWo/Zeitzuschlagsbeleg.cs +++ b/ReportImp/SeWo/Zeitzuschlagsbeleg.cs @@ -214,7 +214,7 @@ namespace BeWo.SeWo if (sr.ServiceDescription.Name != "Pause" && !sr.ServiceDescription.ServiceCategory.Name.Contains("Rufbereitschaft")) { - if (sr.ServiceDescription.ServiceCategory.Name == "Verwaltung") + if (sr.ServiceDescription.ServiceCategory.Name == "Verwaltung" || sr.ServiceDescription.ServiceCategory.Name == "Organisation") { return 0; } diff --git a/ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingent.Designer.cs b/ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingent.Designer.cs new file mode 100644 index 000000000..534c94c39 --- /dev/null +++ b/ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingent.Designer.cs @@ -0,0 +1,598 @@ +using BeWo.Report.ReportObjects; +namespace UebergangshilfeUnnaEV +{ + partial class HilfeplanKontingent + { + /// + /// 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(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HilfeplanKontingent)); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + 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.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); + this.ruleNotApprovedAndExpiringNext4Months = new DevExpress.XtraReports.UI.FormattingRule(); + this.ruleNotApprovedAndExpiringNext8Months = new DevExpress.XtraReports.UI.FormattingRule(); + 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.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + 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.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).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.xrLabel2, + this.xrLabel1}); + this.ReportHeader.HeightF = 75F; + this.ReportHeader.Name = "ReportHeader"; + // + // xrLabel1 + // + this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 7.999979F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.SizeF = new System.Drawing.SizeF(509F, 25F); + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Kontingent"; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1}); + this.DetailReport.DataMember = "Rows"; + 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 System.Drawing.Font("Arial", 8F); + 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(640F, 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.xrTableCell22, + this.xrTableCell23, + this.xrTableCell24}); + 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, "Rows.Monat", "{0:MMM. yy}")}); + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.StylePriority.UseBorders = false; + this.xrTableCell18.StylePriority.UseFont = false; + this.xrTableCell18.StylePriority.UseTextAlignment = false; + this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell18.Weight = 0.21641121284301276D; + this.xrTableCell18.WordWrap = false; + // + // xrTableCell19 + // + this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Tage")}); + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.StylePriority.UseFont = false; + this.xrTableCell19.StylePriority.UseTextAlignment = false; + this.xrTableCell19.Text = "Vorname"; + this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell19.Weight = 0.21641120861020208D; + this.xrTableCell19.WordWrap = false; + // + // xrTableCell36 + // + this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.FlsBudget", "{0:0.00}")}); + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.StylePriority.UseTextAlignment = false; + this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell36.Weight = 0.21641121079284262D; + // + // xrTableCell20 + // + this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.SummeFlsBudget", "{0:0.00}")}); + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.StylePriority.UseTextAlignment = false; + this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell20.Weight = 0.21641120378308867D; + // + // xrTableCell21 + // + this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.DifferenzMonatSollIst", "{0:0.00}")}); + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.StylePriority.UseTextAlignment = false; + this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell21.Weight = 0.21641119578169027D; + // + // xrTableCell22 + // + this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.FlsIst", "{0:0.00}")}); + this.xrTableCell22.Name = "xrTableCell22"; + this.xrTableCell22.StylePriority.UseTextAlignment = false; + this.xrTableCell22.Text = "xrTableCell22"; + this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell22.Weight = 0.21641120928029034D; + // + // xrTableCell23 + // + this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.SummeFlsIst", "{0:0.00}")}); + this.xrTableCell23.Name = "xrTableCell23"; + this.xrTableCell23.StylePriority.UseTextAlignment = false; + this.xrTableCell23.Text = "xrTableCell23"; + this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell23.Weight = 0.21641120277592954D; + // + // xrTableCell24 + // + this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.DiffFls", "{0:0.00}")}); + this.xrTableCell24.Name = "xrTableCell24"; + this.xrTableCell24.StylePriority.UseTextAlignment = false; + this.xrTableCell24.Text = "xrTableCell24"; + this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell24.Weight = 0.21641120564356373D; + // + // 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"; + // + // 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 System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.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(640F, 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.xrTableCell5, + this.xrTableCell6, + this.xrTableCell7}); + 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.StylePriority.UseTextAlignment = false; + this.xrTableCell1.Text = "Monat"; + this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight; + this.xrTableCell1.Weight = 0.21641121268082336D; + // + // xrTableCell2 + // + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Text = "Tage"; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight; + this.xrTableCell2.Weight = 0.21641120844801262D; + // + // xrTableCell35 + // + this.xrTableCell35.Name = "xrTableCell35"; + this.xrTableCell35.StylePriority.UseTextAlignment = false; + this.xrTableCell35.Text = "FLS Budget"; + this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight; + this.xrTableCell35.Weight = 0.21641120532909294D; + // + // xrTableCell3 + // + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.Text = "∑ FLS Budget"; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight; + this.xrTableCell3.Weight = 0.21641120853726123D; + // + // xrTableCell4 + // + this.xrTableCell4.Multiline = true; + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.Text = "Differenz\r\nSoll Ist"; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight; + this.xrTableCell4.Weight = 0.21641120569550745D; + // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "Ist FLS"; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight; + this.xrTableCell5.Weight = 0.21641120867208058D; + // + // xrTableCell6 + // + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.Text = "∑ Ist FLS"; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight; + this.xrTableCell6.Weight = 0.21641120277592929D; + // + // xrTableCell7 + // + this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.StylePriority.UseBorders = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "Diff. FLS"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight; + this.xrTableCell7.Weight = 0.21641118439677323D; + // + // 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 = 60F; + 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 System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.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(640F, 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.xrTableCell41, + this.xrTableCell42, + this.xrTableCell43, + this.xrTableCell44}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 1D; + // + // xrTableCell37 + // + this.xrTableCell37.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold); + this.xrTableCell37.Name = "xrTableCell37"; + this.xrTableCell37.StylePriority.UseBorders = false; + this.xrTableCell37.StylePriority.UseFont = false; + this.xrTableCell37.Weight = 0.21641121284301276D; + this.xrTableCell37.WordWrap = false; + // + // xrTableCell38 + // + this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Tage")}); + this.xrTableCell38.Name = "xrTableCell38"; + this.xrTableCell38.StylePriority.UseBorders = false; + this.xrTableCell38.StylePriority.UseFont = false; + this.xrTableCell38.StylePriority.UseTextAlignment = false; + xrSummary1.FormatString = "{0:0}"; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell38.Summary = xrSummary1; + this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell38.Weight = 0.21641120861020208D; + this.xrTableCell38.WordWrap = false; + // + // xrTableCell39 + // + this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.FlsBudget")}); + this.xrTableCell39.Name = "xrTableCell39"; + this.xrTableCell39.StylePriority.UseBorders = false; + this.xrTableCell39.StylePriority.UseTextAlignment = false; + xrSummary2.FormatString = "{0:0.00}"; + xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell39.Summary = xrSummary2; + this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell39.Weight = 0.21641121079284262D; + // + // xrTableCell40 + // + this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.SummeFlsBudget", "{0:0.00}")}); + this.xrTableCell40.Name = "xrTableCell40"; + this.xrTableCell40.StylePriority.UseBorders = false; + this.xrTableCell40.StylePriority.UseTextAlignment = false; + this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell40.Weight = 0.21641120378308867D; + // + // xrTableCell41 + // + this.xrTableCell41.Name = "xrTableCell41"; + this.xrTableCell41.StylePriority.UseBorders = false; + this.xrTableCell41.StylePriority.UseTextAlignment = false; + this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell41.Weight = 0.21641119578169027D; + // + // xrTableCell42 + // + this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.FlsIst")}); + this.xrTableCell42.Name = "xrTableCell42"; + this.xrTableCell42.StylePriority.UseTextAlignment = false; + xrSummary3.FormatString = "{0:0.00}"; + xrSummary3.IgnoreNullValues = true; + xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell42.Summary = xrSummary3; + this.xrTableCell42.Text = "xrTableCell42"; + this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell42.Weight = 0.21641120928029034D; + // + // xrTableCell43 + // + this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.SummeFlsIst", "{0:0.00}")}); + this.xrTableCell43.Name = "xrTableCell43"; + this.xrTableCell43.StylePriority.UseTextAlignment = false; + this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell43.Weight = 0.21641120277592954D; + // + // xrTableCell44 + // + this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.DiffFls", "{0:0.00}")}); + this.xrTableCell44.Name = "xrTableCell44"; + this.xrTableCell44.StylePriority.UseTextAlignment = false; + this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell44.Weight = 0.21641120564356375D; + // + // xrLabel2 + // + this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32.99998F); + this.xrLabel2.Multiline = true; + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.SizeF = new System.Drawing.SizeF(640F, 25F); + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.Text = resources.GetString("xrLabel2.Text"); + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(UebergangshilfeUnnaEV.HilfeplanKontingentRO); + // + // HilfeplanKontingent + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.ReportHeader, + this.DetailReport, + this.PageHeader, + 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 System.Drawing.Printing.Margins(75, 75, 50, 60); + this.PageHeight = 1169; + this.PageWidth = 827; + this.PaperKind = System.Drawing.Printing.PaperKind.A4; + this.Version = "17.1"; + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).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.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 xrTableCell5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + 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 xrTableCell22; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; + 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 xrTableCell41; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell43; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell44; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; + } +} diff --git a/ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingent.cs b/ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingent.cs new file mode 100644 index 000000000..ac6eac73a --- /dev/null +++ b/ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingent.cs @@ -0,0 +1,28 @@ +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; + +namespace UebergangshilfeUnnaEV +{ + public partial class HilfeplanKontingent : DevExpress.XtraReports.UI.XtraReport + { + public HilfeplanKontingent() + { + InitializeComponent(); + } + + public void SetReportDataSource(HilfeplanKontingentRO pRO) + { + //if (pRO.AppointedDate.HasValue && pRO.AppointedDate.Value.Date < DateTime.Now.Date) + //{ + // xrLabel1.Text = String.Format("Hilfeplanübersicht Stand {0:dd.MM.yyyy}", pRO.AppointedDate); + //} + this.bindingSource1.DataSource = pRO; + } + } +} diff --git a/ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingent.resx b/ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingent.resx new file mode 100644 index 000000000..5b7d06e64 --- /dev/null +++ b/ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingent.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + [SupportConceptOverviewDC.CustomerLastName], [SupportConceptOverviewDC.CustomerFirstName] [SupportConceptOverviewDC.ApprovedStartDate!dd.MM.yyyy] bis [SupportConceptOverviewDC.ApprovedEndDate!dd.MM.yyyy] + + + 17, 17 + + \ No newline at end of file diff --git a/ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingentRO.cs b/ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingentRO.cs new file mode 100644 index 000000000..b031607e5 --- /dev/null +++ b/ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingentRO.cs @@ -0,0 +1,136 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Service.Plugins; +using BeWo.Service.ServiceImplementations; +using BS.Shared; +using BS.Shared.DataContracts; + +namespace UebergangshilfeUnnaEV +{ + public class HilfeplanKontingentRO + { + + private List rows = new List(); + + public List Rows + { + get + { + return this.rows; + } + + set + { + this.rows = value; + } + } + + public SupportConceptOverviewDC SupportConceptOverviewDC { get; private set; } + + public static HilfeplanKontingentRO Create(IList oidList) + { + HilfeplanKontingentRO ro = new HilfeplanKontingentRO(); + + + + var service = new SupportConceptAnalysisCreator(); + + List soList = service.GetSupportConceptAnalysis2(oidList, null, null, null, null, null, null, true); + + Dictionary date2Row = new Dictionary(); + + foreach (SupportConceptOverviewDC dc in soList) + { + ro.SupportConceptOverviewDC = dc; + var start = dc.ApprovedStartDate ?? new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1); + var end = dc.ApprovedEndDate ?? new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1).AddMonths(1).AddDays(-1); + + while (start < end) + { + MonthRow row = new MonthRow(); + row.Monat = start; + row.Tage = DateTime.DaysInMonth(start.Year, start.Month); + + var woche = dc.BEApprovedPerWeek; + var tag = woche / 7; + + row.FlsBudget = tag * row.Tage; + + date2Row.Add(String.Format("{0:MMyyyy}", start), row); + ro.Rows.Add(row); + + start = start.AddMonths(1); + } + + foreach (var sr in dc.ServiceRecords) + { + String monthStr = String.Format("{0:MMyyyy}", sr.Start); + + if (date2Row.ContainsKey(monthStr)) + { + var row = date2Row[monthStr]; + + + + var duration = sr.RoundedDuration; + //Gruppen? + row.FlsIst += duration; + + + + } + + } + + } + + decimal summeBudget = 0; + decimal summeIst = 0; + + foreach (var row in ro.Rows) + { + + + row.FlsIst /= 60; + + summeBudget += row.FlsBudget; + summeIst += row.FlsIst; + + + row.SummeFlsBudget = summeBudget; + row.SummeFlsIst = summeIst; + + row.DifferenzMonatSollIst = row.FlsIst - row.FlsBudget; + + row.DiffFls = row.SummeFlsIst - row.SummeFlsBudget; + + } + return ro; + } + + public class MonthRow + { + public DateTime Monat { get; set; } + + public int Tage { get; set; } + + public decimal FlsBudget { get; set; } + + public decimal SummeFlsBudget { get; set; } + + public decimal DifferenzMonatSollIst { get; set; } + + public decimal FlsIst { get; set; } + + public decimal SummeFlsIst { get; set; } + + public decimal DiffFls { get; set; } + + } + + + } +} \ No newline at end of file diff --git a/ReportImp/UebergangshilfeUnnaEV/Reporting/CustomReportCreator.cs b/ReportImp/UebergangshilfeUnnaEV/Reporting/CustomReportCreator.cs index 9e59e3d59..febd7d39d 100644 --- a/ReportImp/UebergangshilfeUnnaEV/Reporting/CustomReportCreator.cs +++ b/ReportImp/UebergangshilfeUnnaEV/Reporting/CustomReportCreator.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Data; using System.IO; using System.Linq; using System.Text; @@ -9,6 +10,7 @@ using BeWo.Data.Entities; using BeWo.Report; using BeWo.Report.ReportObjects; using BeWo.Service.DCEntityMapper; +using BeWo.Service.Plugins; using BeWo.Service.ServiceImplementations; using BS.Shared.Core; using BS.Shared.DataContracts; @@ -18,7 +20,67 @@ namespace UebergangshilfeUnnaEV.Reporting { public class CustomReportCreator : DefaultReportCreator { - public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay) + + public override XtraReport CreateQueryReport(long queryOid, string queryReportId) + { + if (queryOid == 100) + { + return CreateHilfeplanKontingent(queryOid, queryReportId); + } + + return base.CreateQueryReport(queryOid, queryReportId); + } + + private XtraReport CreateHilfeplanKontingent(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); + + + if (qro.Rows.Count > 0) + { + if (qro.Rows[0].Field1 != null && qro.Rows[0].Field1.ToString() != "0") + { + var oid = Int64.Parse(qro.Rows[0].Field1.ToString()); + + List oidList = new List(); + oidList.Add(oid); + + var druck = new HilfeplanKontingent(); + druck.SetReportDataSource(HilfeplanKontingentRO.Create(oidList)); + return druck; + } + + //DateTime dt = DateTime.Now; + //DateTime.TryParse(qro.Rows[0].Field1.ToString(), out dt); + //dt = dt.AddMonths(1).AddDays(-1); + + //long? customerOid = null; + //if (qro.Rows[0].Field2 != null && qro.Rows[0].Field2.ToString() != "0") + //{ + // var oid = Int64.Parse(qro.Rows[0].Field2.ToString()); + // var c = DAOFactory.GenericDAO.LoadByID(customerOid.Value); + + // var ro = (CustomerDataRO.Create(MapperFactory.CustomerDC_Customer.MapToNewDC(customer))); + // var cRo = CreateKlientenStammdatenRO(dt, ro); + // var druck = new Selbsteinschaetzung(); + // druck.SetReportDataSource(cRo); + // return druck; + //} + + } + return new XtraReport(); + } + + + + public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay) { var ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid); diff --git a/ReportImp/UebergangshilfeUnnaEV/UebergangshilfeUnnaEV.csproj b/ReportImp/UebergangshilfeUnnaEV/UebergangshilfeUnnaEV.csproj index b3d7d54fc..8ce60c3fa 100644 --- a/ReportImp/UebergangshilfeUnnaEV/UebergangshilfeUnnaEV.csproj +++ b/ReportImp/UebergangshilfeUnnaEV/UebergangshilfeUnnaEV.csproj @@ -94,6 +94,13 @@ SettlementReport.cs + + Component + + + HilfeplanKontingent.cs + + @@ -143,6 +150,10 @@ SettlementReport.cs Designer + + HilfeplanKontingent.cs + Designer + diff --git a/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs b/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs index dbb107a1e..45e661de7 100644 --- a/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs +++ b/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs @@ -27,8 +27,9 @@ namespace BeWo.Service.DCEntityMapper pDataContract.RTFNotice3 = pEntity.RTFNotice3; pDataContract.RTFNotice4 = pEntity.RTFNotice4; pDataContract.RTFNotice5 = pEntity.RTFNotice5; - pDataContract.DistanceInMeter = pEntity.DistanceInMeter; - pDataContract.Relevance = pEntity.Relevance; + pDataContract.DistanceInMeter = (int?)pEntity.DistanceInMeter; + pDataContract.DistanceInMeterDecimal = pEntity.DistanceInMeter; + pDataContract.Relevance = pEntity.Relevance; pDataContract.SignatureOid = pEntity.SignatureOid; pDataContract.ServiceRecordType = pEntity.ServiceRecordType ?? ServiceRecordTypeId.DefaultActivity; pDataContract.Betrag = pEntity.Betrag; @@ -154,7 +155,16 @@ namespace BeWo.Service.DCEntityMapper pEntity.Start = pDataContract.Start; pEntity.End = pDataContract.End; pEntity.RoundedDuration = pDataContract.RoundedDuration; - pEntity.DistanceInMeter = pDataContract.DistanceInMeter; + if (pDataContract.DistanceInMeter.HasValue) + { + //Um alte Versionen zu unterstützen. In neuen Client Versionen ist DistanceInMeter null; + pEntity.DistanceInMeter = pDataContract.DistanceInMeter; + } + else + { + pEntity.DistanceInMeter = pDataContract.DistanceInMeterDecimal; + } + pEntity.Relevance = pDataContract.Relevance; pEntity.WohnheimbuchungsOid = pDataContract.WohnheimbuchungsOid; pEntity.GroupEmployeeCount = pDataContract.GroupEmployeeCount; diff --git a/Service/DCEntityMapper/ServiceRecordHistoryDC_ServiceRecordHistory.cs b/Service/DCEntityMapper/ServiceRecordHistoryDC_ServiceRecordHistory.cs index 00b785d0b..c5c62e6d2 100644 --- a/Service/DCEntityMapper/ServiceRecordHistoryDC_ServiceRecordHistory.cs +++ b/Service/DCEntityMapper/ServiceRecordHistoryDC_ServiceRecordHistory.cs @@ -38,7 +38,8 @@ namespace BeWo.Service.DCEntityMapper pDataContract.ServiceRecordInsUser = pEntity.ServiceRecordInsUser; pDataContract.ServiceRecordUpdUser = pEntity.UdpUser; pDataContract.Start = pEntity.Start; - pDataContract.DistanceInMeter = pEntity.DistanceInMeter; + pDataContract.DistanceInMeter = (int?)pEntity.DistanceInMeter; + pDataContract.DistanceInMeterDecimal = pEntity.DistanceInMeter; pDataContract.Relevance = pEntity.Relevance; pDataContract.IsCreatedInMobileClient = pEntity.IsCreatedInMobileClient; diff --git a/Service/Plugins/FlexibleReportService.cs b/Service/Plugins/FlexibleReportService.cs index e9f525d0c..4db046bb1 100644 --- a/Service/Plugins/FlexibleReportService.cs +++ b/Service/Plugins/FlexibleReportService.cs @@ -282,7 +282,8 @@ namespace BeWo.Service.Plugins if (zeigeKilometer) { - entry.Kilometer = serviceRecord.DistanceInMeter; + entry.Kilometer = (int?)serviceRecord.DistanceInMeter; + entry.KilometerDecimal = serviceRecord.DistanceInMeter; } if (serviceRecord.Customer != null) diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 4537110a8..1fec0254a 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -329,9 +329,9 @@ namespace BeWo.Service.Plugins //t = "5462295916"; // BeWo Dellbrueck //t = "2120989920"; // Sozialbüro Schüßler und Wilckens GbR //t = "9815376800"; // Haus Dülken GmbH + Co. KG - t = "6917917884"; // AMBEWO Müller/Gerhards - - + //t = "6917917884"; // AMBEWO Müller/Gerhards + t = "5240630948"; // Caritasverband der Diözese Rottenburg-Stuttgart e.V. - Rechtsträger der Caritas Heilbronn Hohenlohe e.V. + t = "7748694330"; //Caritasverband der Diözese Rottenburg-Stuttgart e.V. als Rechtsträger der Caritas Ludwigsburg-Waiblingen-Enz return t; #else if (MultitenancyOperationContextExt.Current != null) diff --git a/Service/Plugins/StundenuebersichtAuswertung.cs b/Service/Plugins/StundenuebersichtAuswertung.cs index 261fba3c2..3118e3115 100644 --- a/Service/Plugins/StundenuebersichtAuswertung.cs +++ b/Service/Plugins/StundenuebersichtAuswertung.cs @@ -670,9 +670,14 @@ namespace BeWo.Service.Plugins { ServiceRecordFLSOverviewDC srDC = new ServiceRecordFLSOverviewDC(); + srDC.ServiceRecordOid = sr.Oid; + srDC.EmployeeOid = sr.EmployeeOid; + srDC.CustomerOid = sr.CustomerOid; + srDC.CostBearer2SupportConceptOid = sr.CostBearer2SupportConceptOid; srDC.Start = sr.Start; srDC.End = sr.End; - srDC.DistanceInMeter = sr.DistanceInMeter; + srDC.DistanceInMeter = (int?)sr.DistanceInMeter; + srDC.DistanceInMeterDecimal = sr.DistanceInMeter; srDC.Notice = sr.Notice; srDC.Notice2 = sr.Notice2; srDC.Notice3 = sr.Notice3; @@ -680,22 +685,7 @@ namespace BeWo.Service.Plugins srDC.Notice5 = sr.Notice5; srDC.InsertedOn = sr.InsTs; srDC.InsUser = sr.InsUser; - if (useRoundedDuration) - { - srDC.RoundedDuration = sr.RoundedDuration; - } - else - { - srDC.RoundedDuration = (decimal)sr.End.Value.Subtract(sr.Start.Value).TotalMinutes; - } - if (sr.ServiceDescription != null) - srDC.ServiceDescription = MapperFactory.ServiceDescriptionDC_ServiceDescription.MapToNewDC(sr.ServiceDescription); - - srDC.ServiceRecordOid = sr.Oid; - srDC.EmployeeOid = sr.EmployeeOid; - srDC.CustomerOid = sr.CustomerOid; - srDC.CostBearer2SupportConceptOid = sr.CostBearer2SupportConceptOid; - + if (useGroupInfo) { srDC.GroupEmployeeCount = sr.GroupEmployeeCount; @@ -704,6 +694,31 @@ namespace BeWo.Service.Plugins srDC.GroupOid = sr.GroupOid; } + if (sr.ServiceDescription != null) + srDC.ServiceDescription = MapperFactory.ServiceDescriptionDC_ServiceDescription.MapToNewDC(sr.ServiceDescription); + + + if (useRoundedDuration) + { + srDC.RoundedDuration = sr.RoundedDuration; + + + if (srDC.GroupOid.HasValue && srDC.GroupRoundedDuration.HasValue && useGroupInfo) + { + srDC.End = srDC.Start.Value.AddMinutes((double)sr.GroupRoundedDuration); + } + else + { + srDC.End = srDC.Start.Value.AddMinutes((double)sr.RoundedDuration); + } + } + else + { + srDC.RoundedDuration = (decimal)sr.End.Value.Subtract(sr.Start.Value).TotalMinutes; + } + + + var durationInString = srDC.RoundedDuration; // Das wird hier unterschieden, weil je nach Auswertung entweder die Dauer der Gruppe (bei Auswertung nach Mitarbeiter) oder der Anteil der Gesamtdauer (bei Auswertung nach Klient) angezeigt werden soll if (srDC.GroupOid.HasValue && srDC.GroupRoundedDuration.HasValue && showGroupMinutes) @@ -711,7 +726,6 @@ namespace BeWo.Service.Plugins durationInString = srDC.GroupRoundedDuration.Value; } - if (srDC.Start != null && srDC.Start.Value.Second == 0) { srDC.TimeRange = String.Format("{0:HH:mm}-{1:HH:mm} ({2:0.##} min.)", srDC.Start, srDC.End, durationInString); @@ -725,6 +739,9 @@ namespace BeWo.Service.Plugins srDC.DateTimeRange = String.Format("{0:dd.MM.} {1}", srDC.Start, srDC.TimeRange); //srDC.TimeRange = srDC.Start.Value.ToShortTimeString() + "-" + srDC.Start.Value.AddMinutes((double)srDC.RoundedDuration).ToShortTimeString() + " (" + (int)srDC.RoundedDuration + " min.)"; + + + return srDC; } diff --git a/Service/Plugins/SupportConceptAnalysisCreator.cs b/Service/Plugins/SupportConceptAnalysisCreator.cs index 68813d9fe..8f0f7f71b 100644 --- a/Service/Plugins/SupportConceptAnalysisCreator.cs +++ b/Service/Plugins/SupportConceptAnalysisCreator.cs @@ -199,8 +199,11 @@ namespace BeWo.Service.Plugins minDt = iCb2Sc.RequestedStartDate.Value.Date; } - iDC.FLSRecordedTillNow = BerechneGeleisteteStunden(iCb2Sc, minDt, maxDt, calc); + var records = GetServiceRecordDCs(iCb2Sc, minDt, maxDt); + iDC.ServiceRecords = records; + iDC.FLSRecordedTillNow = BerechneGeleisteteStunden(records, calc); + //var notBillableAbsenceTimes = calc.GetHoursNotBillableDueToAbsenceTimes(relDC, recordDCs, @@ -767,16 +770,62 @@ namespace BeWo.Service.Plugins } - public virtual decimal BerechneGeleisteteStunden(CostBearer2SupportConcept iCb2Sc, DateTime minDate, DateTime maxDate, Calculations calc) + public virtual decimal BerechneGeleisteteStunden(CostBearer2SupportConcept c2s, DateTime minDate, DateTime maxDate, Calculations calc) { - var recordDCs = (from sr in iCb2Sc.ServiceRecords - where (sr.Start >= minDate && sr.Start < maxDate) - select MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDC(sr)).ToList(); - + var recordDCs = GetServiceRecordDCs(c2s, minDate, maxDate); return calc.GetBillableDurationInMinutes(recordDCs) / 60m; } + public virtual decimal BerechneGeleisteteStunden(List recordDCs, Calculations calc) + { + return calc.GetBillableDurationInMinutes(recordDCs) / 60m; + } + + public virtual List GetServiceRecordDCs(CostBearer2SupportConcept c2s, DateTime minDate, DateTime maxDate) + { + var serviceRecordsInSpan = c2s.ServiceRecords.Where(s => s.Start >= minDate && s.Start < maxDate); + + var dcList = new List(); + + foreach (var sr in serviceRecordsInSpan) + { + dcList.Add(CreateServiceRecordDC(sr)); + } + + return dcList; + } + + public virtual ServiceRecordDC CreateServiceRecordDC(ServiceRecord sr) + { + var dc = new ServiceRecordDC(); + + + dc.ServiceRecordOid = sr.Oid; + dc.ServiceRecordVersion = sr.Version; + dc.Start = sr.Start; + dc.End = sr.End; + dc.DistanceInMeter = (int?)sr.DistanceInMeter; + dc.DistanceInMeterDecimal = sr.DistanceInMeter; + dc.Relevance = sr.Relevance; + dc.Betrag = sr.Betrag; + + if (sr.ServiceDescription != null) + { + dc.ServiceDescription = MapperFactory.ServiceDescriptionDC_ServiceDescription.MapToNewDC(sr.ServiceDescription); + } + + dc.RoundedDuration = sr.RoundedDuration; + + dc.GroupEmployeeCount = sr.GroupEmployeeCount; + dc.GroupPersonCount = sr.GroupPersonCount; + dc.GroupRoundedDuration = sr.GroupRoundedDuration; + dc.GroupOid = sr.GroupOid; + + return dc; + } + + public virtual decimal BerechneGeleisteteStunden(CostBearer2SupportConcept iCb2Sc, long catOid, DateTime minDate, DateTime maxDate, Calculations calc) { diff --git a/Service/ServiceImplementations/AnalysisServiceImp.cs b/Service/ServiceImplementations/AnalysisServiceImp.cs index 395781038..867f2bcc6 100644 --- a/Service/ServiceImplementations/AnalysisServiceImp.cs +++ b/Service/ServiceImplementations/AnalysisServiceImp.cs @@ -710,7 +710,8 @@ namespace BeWo.Service.ServiceImplementations srDC.Start = sr.Start; srDC.End = sr.End; - srDC.DistanceInMeter = sr.DistanceInMeter; + srDC.DistanceInMeter = (int?)sr.DistanceInMeter; + srDC.DistanceInMeterDecimal = sr.DistanceInMeter; srDC.Notice = sr.Notice; srDC.Notice2 = sr.Notice2; srDC.Notice3 = sr.Notice3; diff --git a/Service/ServiceImplementations/CustomerServiceImp.cs b/Service/ServiceImplementations/CustomerServiceImp.cs index be25b5547..a1a11b0f1 100644 --- a/Service/ServiceImplementations/CustomerServiceImp.cs +++ b/Service/ServiceImplementations/CustomerServiceImp.cs @@ -1389,6 +1389,15 @@ namespace BeWo.Service.ServiceImplementations { discontinue = true; hasRecordsOutOfConcept = true; + + foreach (var e in allRecords) + { + if (e.Start < start || e.End >= end) + { + int test = 0; + } + + } } if (discontinue) break; diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs index 4836be09e..6a2811b13 100644 --- a/Service/ServiceImplementations/OperationsServiceImp.cs +++ b/Service/ServiceImplementations/OperationsServiceImp.cs @@ -2541,7 +2541,8 @@ namespace BeWo.Service.ServiceImplementations dc.RoundedDuration = sr.RoundedDuration; - dc.DistanceInMeter = sr.DistanceInMeter; + dc.DistanceInMeter = (int?)sr.DistanceInMeter; + dc.DistanceInMeterDecimal = sr.DistanceInMeter; dc.Betrag = sr.Betrag; dc.InsertedOn = sr.InsTs; dc.InsUser = sr.InsUser; diff --git a/Service/ServiceImplementations/ResourceServiceImp.cs b/Service/ServiceImplementations/ResourceServiceImp.cs index fb3c7ae15..ac56fcb08 100644 --- a/Service/ServiceImplementations/ResourceServiceImp.cs +++ b/Service/ServiceImplementations/ResourceServiceImp.cs @@ -1572,6 +1572,12 @@ namespace BeWo.Service.ServiceImplementations task.StartDate = task.DueDate; task.EndDate = task.DueDate; } + + + if (task.SupportConceptList != null && task.SupportConceptList.Count > 0) + { + task.Subject = String.Format("{0}: {1}", task.SupportConceptList[0].Customer.Person.LastNameFirstName, task.Subject); + } } var monday = DateTime.Today.FirstDateOfWeek(pInvertalStart.AddDays(-1 * pBufferSize).GetIso8601WeekOfYear()); diff --git a/Shared/DataContracts/FlexibleReportEntryDC.cs b/Shared/DataContracts/FlexibleReportEntryDC.cs index d7c36c1b2..0d4cfe95a 100644 --- a/Shared/DataContracts/FlexibleReportEntryDC.cs +++ b/Shared/DataContracts/FlexibleReportEntryDC.cs @@ -63,6 +63,9 @@ namespace BS.Shared.DataContracts [DataMember] public int? Kilometer { get; set; } + [DataMember] + public decimal? KilometerDecimal { get; set; } + [DataMember] public DateTime StartDatum { get; set; } diff --git a/Shared/DataContracts/ServiceRecordDC.cs b/Shared/DataContracts/ServiceRecordDC.cs index 5197592a6..6fe4e8406 100644 --- a/Shared/DataContracts/ServiceRecordDC.cs +++ b/Shared/DataContracts/ServiceRecordDC.cs @@ -108,10 +108,10 @@ namespace BS.Shared.DataContracts public ServiceRecordTypeId ServiceRecordType { get; set; } [DataMember] - public int? DistanceInMeter { get; set; } + public int? DistanceInMeter{ get; set; } - //[DataMember] - //public decimal? DistanceInMeterDec { get; set; } + [DataMember] + public decimal? DistanceInMeterDecimal { get; set; } [DataMember] public string IP { get; set; } diff --git a/Shared/DataContracts/ServiceRecordFLSOverviewDC.cs b/Shared/DataContracts/ServiceRecordFLSOverviewDC.cs index d8903a725..d606e91be 100644 --- a/Shared/DataContracts/ServiceRecordFLSOverviewDC.cs +++ b/Shared/DataContracts/ServiceRecordFLSOverviewDC.cs @@ -63,7 +63,10 @@ namespace BS.Shared.DataContracts [DataMember] public int? DistanceInMeter { get; set; } - [DataMember] + [DataMember] + public decimal? DistanceInMeterDecimal { get; set; } + + [DataMember] public string InsUser { get; set; } [DataMember] diff --git a/Shared/DataContracts/ServiceRecordHistoryDC.cs b/Shared/DataContracts/ServiceRecordHistoryDC.cs index 9ac2e47fb..2f9b14b78 100644 --- a/Shared/DataContracts/ServiceRecordHistoryDC.cs +++ b/Shared/DataContracts/ServiceRecordHistoryDC.cs @@ -104,7 +104,10 @@ namespace BS.Shared.DataContracts [DataMember] public int? DistanceInMeter { get; set; } - [DataMember] + [DataMember] + public decimal? DistanceInMeterDecimal { get; set; } + + [DataMember] public int? Relevance { get; set; } [DataMember] diff --git a/Shared/DataContracts/SupportConceptOverviewDC.cs b/Shared/DataContracts/SupportConceptOverviewDC.cs index 25346a4a7..94b7be26c 100644 --- a/Shared/DataContracts/SupportConceptOverviewDC.cs +++ b/Shared/DataContracts/SupportConceptOverviewDC.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Runtime.Serialization; namespace BS.Shared.DataContracts @@ -139,5 +140,6 @@ namespace BS.Shared.DataContracts [DataMember] public string KorridorStatusFarbe { get; set; } + public IList ServiceRecords { get; set; } } } \ No newline at end of file diff --git a/Shared/Services/Calculations.cs b/Shared/Services/Calculations.cs index bc58458b4..e0b7e1b02 100644 --- a/Shared/Services/Calculations.cs +++ b/Shared/Services/Calculations.cs @@ -915,9 +915,9 @@ namespace BS.Shared.Services if (flatRate != null) { - if (record.DistanceInMeter.HasValue && record.DistanceInMeter.Value > 0) + if (record.DistanceInMeterDecimal.HasValue && record.DistanceInMeterDecimal.Value > 0) { - data.UnitCount = record.DistanceInMeter.Value; + data.UnitCount = record.DistanceInMeterDecimal.Value; } else {