diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 06c21387d..5b079bc18 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -43,12 +43,12 @@ de-DE BeWoPlaner ownSoft GmbH - 2.0.1.281 + 2.0.1.282 true publish.htm false true - 282 + 283 2.0.1.%2a false true @@ -3029,392 +3029,392 @@ False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly diff --git a/BeWo/View/BeWoFileView.xaml.cs b/BeWo/View/BeWoFileView.xaml.cs index 582d036ec..d1d5d830c 100644 --- a/BeWo/View/BeWoFileView.xaml.cs +++ b/BeWo/View/BeWoFileView.xaml.cs @@ -353,9 +353,17 @@ namespace BeWo.View { return; } - drag = treeview.GetDataItemUnderMouse(e) ?? datagrid_documents.GetRow(datagrid_documents.View.GetRowHandleByMouseEventArgs(e)); - _MouseDownPosition = e.GetPosition(this); + var pos = e.GetPosition(treeview); + bool hatAbstand = pos.X < treeview.ActualWidth - 20 || pos.X > treeview.ActualWidth; + + if (hatAbstand) + { + drag = treeview.GetDataItemUnderMouse(e) ?? datagrid_documents.GetRow(datagrid_documents.View.GetRowHandleByMouseEventArgs(e)); + + _MouseDownPosition = e.GetPosition(this); + } + } private void treeview_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e) diff --git a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml index 2adb7dd89..597b51313 100644 --- a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml +++ b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml @@ -137,7 +137,7 @@ FontSize="13" Foreground="#FFFFFF" Initialized="btn_xRechnung_Initialized" - ToolTip="xRechnung erstellen" /> + ToolTip="E-Rechnung erstellen" /> } - +
  • - +
    • using (Html.BeginForm("RedirectToDevTools", "Main", FormMethod.Post)) @@ -471,13 +471,15 @@ -
  • - -
    • - + @if (Model.HasRightToChangePassword) + { +
  • + +
    • + }
  • @using (Html.BeginForm("Logout", "Main", FormMethod.Post, new { id = "normal-logout-form" })) { diff --git a/Data/Models/XRechnung/XRInvoice.cs b/Data/Models/XRechnung/XRInvoice.cs index 3fd5e27ad..d2df20a9d 100644 --- a/Data/Models/XRechnung/XRInvoice.cs +++ b/Data/Models/XRechnung/XRInvoice.cs @@ -13,6 +13,7 @@ namespace BeWo.Data.Models.XRechnung public string Date { get; set; } public string Currency { get; set; } public string Notice { get; set; } + public string CancellationNumber { get; set; } public XRInvoicePeriod Period { get; set; } public XRInvoicePayment Payment { get; set; } diff --git a/Data/Models/XRechnung/XRPosition.cs b/Data/Models/XRechnung/XRPosition.cs index cac17d858..8d796ffc1 100644 --- a/Data/Models/XRechnung/XRPosition.cs +++ b/Data/Models/XRechnung/XRPosition.cs @@ -8,11 +8,11 @@ namespace BeWo.Data.Models.XRechnung { public class XRPosition { - public int Quantity { get; set; } + public decimal Quantity { get; set; } public string QuantityType { get; set; } public string Text { get; set; } - public int Net { get; set; } - public int NetTotal { get; set; } + public decimal Net { get; set; } + public decimal NetTotal { get; set; } public decimal Tax { get; set; } public decimal TaxSum { get; set; } public string TaxType { get; set; } diff --git a/Report/DefaultReports/FLSSollIstReport.Designer.cs b/Report/DefaultReports/FLSSollIstReport.Designer.cs new file mode 100644 index 000000000..0a3606140 --- /dev/null +++ b/Report/DefaultReports/FLSSollIstReport.Designer.cs @@ -0,0 +1,685 @@ +using BeWo.Report.ReportObjects; +namespace BeWo.Report.DefaultReports +{ + partial class FLSSollIstReport + { + /// + /// 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.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupFooter3 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); + this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.Title = new DevExpress.XtraReports.UI.XRControlStyle(); + this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle(); + this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle(); + this.DataField = new DevExpress.XtraReports.UI.XRControlStyle(); + this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.fieldDifferenzWoche1 = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldDifferenzWoche2 = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldDifferenzWoche3 = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldDifferenzWoche4 = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldDifferenzGesamt = new DevExpress.XtraReports.UI.CalculatedField(); + this.formattingRuleDiffNegativ = new DevExpress.XtraReports.UI.FormattingRule(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).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; + // + // xrTableCell1 + // + this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RootObjectList.Name")}); + this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.StylePriority.UseBorderColor = false; + this.xrTableCell1.StylePriority.UseBorders = false; + this.xrTableCell1.StylePriority.UseFont = false; + this.xrTableCell1.Text = "xrTableCell1"; + this.xrTableCell1.Weight = 6.9183673469387754D; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 1D; + // + // xrTable1 + // + this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(560F, 25F); + this.xrTable1.StylePriority.UseBorders = false; + this.xrTable1.StylePriority.UsePadding = false; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1}); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.Detail1.HeightF = 69.66665F; + this.Detail1.KeepTogether = true; + this.Detail1.KeepTogetherWithDetailReports = true; + this.Detail1.Name = "Detail1"; + this.Detail1.StylePriority.UseFont = false; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.DetailReport1}); + this.DetailReport.DataMember = "RootObjectList"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // DetailReport1 + // + this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail2, + this.GroupHeader2, + this.GroupFooter3}); + this.DetailReport1.DataMember = "RootObjectList.Groups"; + this.DetailReport1.DataSource = this.bindingSource1; + this.DetailReport1.Level = 0; + this.DetailReport1.Name = "DetailReport1"; + // + // Detail2 + // + this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable4}); + this.Detail2.HeightF = 25F; + this.Detail2.Name = "Detail2"; + // + // xrTable4 + // + this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable4.Name = "xrTable4"; + this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow4}); + this.xrTable4.SizeF = new System.Drawing.SizeF(500F, 25F); + this.xrTable4.StylePriority.UseBorders = false; + this.xrTable4.StylePriority.UsePadding = false; + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.xrTableCell9, + this.xrTableCell13, + this.xrTableCell4}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 1D; + // + // xrTableCell3 + // + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RootObjectList.Groups.Name", "{0:dd/MM/yyyy}")}); + this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.Text = "xrTableCell3"; + this.xrTableCell3.Weight = 1.3605442176870746D; + // + // xrTableCell9 + // + this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell9.TextFormatString = "{0:0.00}"; + this.xrTableCell9.Weight = 0.68027210884353728D; + // + // xrTableCell13 + // + this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RootObjectList.Groups.IstGesamt")}); + this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); + this.xrTableCell13.Multiline = true; + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrTableCell13.StylePriority.UseFont = false; + this.xrTableCell13.StylePriority.UsePadding = false; + this.xrTableCell13.StylePriority.UseTextAlignment = false; + this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell13.TextFormatString = "{0:0.00}"; + this.xrTableCell13.Weight = 0.6802721088435375D; + // + // xrTableCell4 + // + this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); + this.xrTableCell4.Multiline = true; + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UsePadding = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell4.Weight = 0.6802721088435375D; + // + // GroupHeader2 + // + this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2}); + this.GroupHeader2.HeightF = 25F; + this.GroupHeader2.Name = "GroupHeader2"; + this.GroupHeader2.RepeatEveryPage = true; + // + // xrTable2 + // + this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2}); + this.xrTable2.SizeF = new System.Drawing.SizeF(500F, 25F); + 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.xrTableCell5, + this.xrTableCell7, + this.xrTableCell12, + this.xrTableCell2}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 1D; + // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Text = "Mitarbeiter/in"; + this.xrTableCell5.Weight = 1.3605442176870746D; + // + // xrTableCell7 + // + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "Soll"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell7.Weight = 0.6802721088435375D; + // + // xrTableCell12 + // + this.xrTableCell12.Multiline = true; + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrTableCell12.StylePriority.UsePadding = false; + this.xrTableCell12.StylePriority.UseTextAlignment = false; + this.xrTableCell12.Text = "Ist"; + this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell12.Weight = 0.68027210884353739D; + // + // xrTableCell2 + // + this.xrTableCell2.Multiline = true; + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrTableCell2.StylePriority.UsePadding = false; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Text = "Diff."; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell2.Weight = 0.6802721088435375D; + // + // GroupFooter3 + // + this.GroupFooter3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable3}); + this.GroupFooter3.HeightF = 25F; + this.GroupFooter3.Name = "GroupFooter3"; + // + // xrTable3 + // + this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable3.Name = "xrTable3"; + this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow3}); + this.xrTable3.SizeF = new System.Drawing.SizeF(500F, 25F); + 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.xrTableCell6, + this.xrTableCell8, + this.xrTableCell10, + this.xrTableCell11}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 1D; + // + // xrTableCell6 + // + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Text = "Summe"; + this.xrTableCell6.Weight = 1.3605442176870746D; + // + // xrTableCell8 + // + this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RootObjectList.SollGesamt")}); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrTableCell8.StylePriority.UsePadding = false; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell8.TextFormatString = "{0:0.00}"; + this.xrTableCell8.Weight = 0.6802721088435375D; + // + // xrTableCell10 + // + this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RootObjectList.IstGesamt")}); + this.xrTableCell10.Multiline = true; + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell10.TextFormatString = "{0:0.00}"; + this.xrTableCell10.Weight = 0.68027210884353739D; + // + // xrTableCell11 + // + this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RootObjectList.DifferenzSollIstGesamt")}); + this.xrTableCell11.FormattingRules.Add(this.formattingRuleDiffNegativ); + this.xrTableCell11.Multiline = true; + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrTableCell11.StylePriority.UsePadding = false; + this.xrTableCell11.StylePriority.UseTextAlignment = false; + this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell11.TextFormatString = "{0:0.00}"; + this.xrTableCell11.Weight = 0.6802721088435375D; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel5, + this.xrLabel4, + this.xrLabel3, + this.xrLabel2, + this.xrLabel1}); + this.ReportHeader.HeightF = 50F; + this.ReportHeader.Name = "ReportHeader"; + // + // xrLabel5 + // + this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 12F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(175F, 25F); + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(17F, 25F); + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.StylePriority.UseTextAlignment = false; + this.xrLabel5.Text = "-"; + this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // xrLabel4 + // + this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportEndDate", "{0:dd/MM/yyyy}")}); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 12F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(192.0001F, 25F); + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(367.9999F, 25F); + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.Text = "xrLabel4"; + // + // xrLabel3 + // + this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "{0:dd/MM/yyyy}")}); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 12F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(83F, 25F); + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(92F, 25F); + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.StylePriority.UseTextAlignment = false; + this.xrLabel3.Text = "xrLabel3"; + this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // xrLabel2 + // + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 12F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(83F, 25F); + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.Text = "Zeitraum:"; + // + // xrLabel1 + // + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.SizeF = new System.Drawing.SizeF(560F, 25F); + this.xrLabel1.StyleName = "Title"; + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Auswertung über geleistete Fachleistungsstunden"; + // + // pageFooterBand1 + // + this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPageInfo2, + this.xrPageInfo1}); + this.pageFooterBand1.HeightF = 48F; + this.pageFooterBand1.Name = "pageFooterBand1"; + // + // xrPageInfo2 + // + this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(606.9999F, 25F); + this.xrPageInfo2.Name = "xrPageInfo2"; + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(100F, 23F); + this.xrPageInfo2.StyleName = "PageInfo"; + this.xrPageInfo2.StylePriority.UseFont = false; + this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrPageInfo2.TextFormatString = "Seite {0} von {1}"; + // + // xrPageInfo1 + // + this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(7.999878F, 25F); + this.xrPageInfo1.Name = "xrPageInfo1"; + this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; + this.xrPageInfo1.SizeF = new System.Drawing.SizeF(262.0001F, 23F); + this.xrPageInfo1.StyleName = "PageInfo"; + this.xrPageInfo1.StylePriority.UseFont = false; + // + // Title + // + this.Title.BackColor = System.Drawing.Color.White; + this.Title.BorderColor = System.Drawing.SystemColors.ControlText; + this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.Title.BorderWidth = 1F; + this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F); + this.Title.ForeColor = System.Drawing.Color.Black; + this.Title.Name = "Title"; + // + // FieldCaption + // + this.FieldCaption.BackColor = System.Drawing.Color.White; + this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText; + this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.FieldCaption.BorderWidth = 1F; + this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.FieldCaption.ForeColor = System.Drawing.Color.Black; + this.FieldCaption.Name = "FieldCaption"; + // + // PageInfo + // + this.PageInfo.BackColor = System.Drawing.Color.White; + this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText; + this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.PageInfo.BorderWidth = 1F; + this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); + this.PageInfo.ForeColor = System.Drawing.Color.Black; + this.PageInfo.Name = "PageInfo"; + // + // DataField + // + this.DataField.BackColor = System.Drawing.Color.White; + this.DataField.BorderColor = System.Drawing.SystemColors.ControlText; + this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.DataField.BorderWidth = 1F; + this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); + this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; + this.DataField.Name = "DataField"; + // + // fieldFLS + // + this.fieldFLS.DataMember = "FLSReportGroups"; + this.fieldFLS.Expression = "[TotalFLM] / 60"; + this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldFLS.Name = "fieldFLS"; + // + // topMarginBand1 + // + this.topMarginBand1.HeightF = 50F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 50F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // fieldDifferenzWoche1 + // + this.fieldDifferenzWoche1.DataMember = "RootObjectList.Groups"; + this.fieldDifferenzWoche1.Expression = "[Ist] - [Soll]"; + this.fieldDifferenzWoche1.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldDifferenzWoche1.Name = "fieldDifferenzWoche1"; + // + // fieldDifferenzWoche2 + // + this.fieldDifferenzWoche2.DataMember = "RootObjectList.Groups"; + this.fieldDifferenzWoche2.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldDifferenzWoche2.Name = "fieldDifferenzWoche2"; + // + // fieldDifferenzWoche3 + // + this.fieldDifferenzWoche3.DataMember = "RootObjectList.Groups"; + this.fieldDifferenzWoche3.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldDifferenzWoche3.Name = "fieldDifferenzWoche3"; + // + // fieldDifferenzWoche4 + // + this.fieldDifferenzWoche4.DataMember = "RootObjectList.Groups"; + this.fieldDifferenzWoche4.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldDifferenzWoche4.Name = "fieldDifferenzWoche4"; + // + // fieldDifferenzGesamt + // + this.fieldDifferenzGesamt.DataMember = "RootObjectList.Groups"; + this.fieldDifferenzGesamt.Expression = "[IstGesamt] - [SollGesamt]"; + this.fieldDifferenzGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldDifferenzGesamt.Name = "fieldDifferenzGesamt"; + // + // formattingRuleDiffNegativ + // + this.formattingRuleDiffNegativ.Condition = "[DifferenzSollIstGesamt] < 0"; + this.formattingRuleDiffNegativ.DataMember = "RootObjectList"; + this.formattingRuleDiffNegativ.Formatting.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.formattingRuleDiffNegativ.Name = "formattingRuleDiffNegativ"; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FLSSollIstReportRO); + // + // FLSSollIstReport + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.DetailReport, + this.ReportHeader, + this.pageFooterBand1, + this.topMarginBand1, + this.bottomMarginBand1}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.fieldFLS, + this.fieldDifferenzWoche1, + this.fieldDifferenzWoche2, + this.fieldDifferenzWoche3, + this.fieldDifferenzWoche4, + this.fieldDifferenzGesamt}); + this.DataSource = this.bindingSource1; + this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { + this.formattingRuleDiffNegativ}); + this.Margins = new DevExpress.Drawing.DXMargins(60F, 60F, 50F, 50F); + this.PageHeight = 1169; + this.PageWidth = 827; + this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; + this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] { + this.Title, + this.FieldCaption, + this.PageInfo, + this.DataField}); + this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).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.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1; + private DevExpress.XtraReports.UI.XRControlStyle Title; + private DevExpress.XtraReports.UI.XRControlStyle FieldCaption; + private DevExpress.XtraReports.UI.XRControlStyle PageInfo; + private DevExpress.XtraReports.UI.XRControlStyle DataField; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; + private DevExpress.XtraReports.UI.DetailBand Detail2; + private DevExpress.XtraReports.UI.XRTable xrTable4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; + private DevExpress.XtraReports.UI.CalculatedField fieldFLS; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.CalculatedField fieldDifferenzWoche1; + private DevExpress.XtraReports.UI.CalculatedField fieldDifferenzWoche2; + private DevExpress.XtraReports.UI.CalculatedField fieldDifferenzWoche3; + private DevExpress.XtraReports.UI.CalculatedField fieldDifferenzWoche4; + private DevExpress.XtraReports.UI.CalculatedField fieldDifferenzGesamt; + private DevExpress.XtraReports.UI.XRTable xrTable3; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter3; + private DevExpress.XtraReports.UI.FormattingRule formattingRuleDiffNegativ; + } +} diff --git a/Report/DefaultReports/FLSSollIstReport.cs b/Report/DefaultReports/FLSSollIstReport.cs new file mode 100644 index 000000000..3cea47659 --- /dev/null +++ b/Report/DefaultReports/FLSSollIstReport.cs @@ -0,0 +1,33 @@ +using System; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Report.ReportObjects; +using BeWo.Report; + +namespace BeWo.Report.DefaultReports +{ + public partial class FLSSollIstReport : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + public FLSSollIstReport() + { + InitializeComponent(); + } + + public void SetReportDataSource(FLSSollIstReportRO pRO) + { + //foreach (var group in pRO.FLSReportGroups) + //{ + // foreach (var sr in group.ServiceRecords) + // { + // if (!sr.DistanceInMeter.HasValue && sr.ServiceRecordOid.HasValue) + // { + // var srBO = DAOFactory.GenericDAO.LoadByID(sr.ServiceRecordOid.Value); + // sr.DistanceInMeter = srBO.DistanceInMeter; + // } + // } + //} + this.bindingSource1.DataSource = pRO; + } + + } +} diff --git a/Report/DefaultReports/FLSSollIstReport.resx b/Report/DefaultReports/FLSSollIstReport.resx new file mode 100644 index 000000000..d58980a38 --- /dev/null +++ b/Report/DefaultReports/FLSSollIstReport.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Report/DefaultReports/FLSSollIstWeeklyReport.Designer.cs b/Report/DefaultReports/FLSSollIstWeeklyReport.Designer.cs new file mode 100644 index 000000000..0c586f099 --- /dev/null +++ b/Report/DefaultReports/FLSSollIstWeeklyReport.Designer.cs @@ -0,0 +1,734 @@ +using BeWo.Report.ReportObjects; +namespace BeWo.Report.DefaultReports +{ + partial class FLSSollIstWeeklyReport + { + /// + /// 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.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTableData = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRowData = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRowHeader1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRowHeader2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); + this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.Title = new DevExpress.XtraReports.UI.XRControlStyle(); + this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle(); + this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle(); + this.DataField = new DevExpress.XtraReports.UI.XRControlStyle(); + this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.fieldDifferenzWoche1 = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldDifferenzWoche2 = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldDifferenzWoche3 = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldDifferenzWoche4 = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrTableGesamt = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRowGesamt = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableData)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableGesamt)).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; + // + // xrTableCell1 + // + this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RootObjectList.Name")}); + this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.StylePriority.UseBorderColor = false; + this.xrTableCell1.StylePriority.UseBorders = false; + this.xrTableCell1.StylePriority.UseFont = false; + this.xrTableCell1.Text = "xrTableCell1"; + this.xrTableCell1.Weight = 6.9183673469387754D; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 1D; + // + // xrTable1 + // + this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(560F, 25F); + this.xrTable1.StylePriority.UseBorders = false; + this.xrTable1.StylePriority.UsePadding = false; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1}); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.Detail1.HeightF = 69.66665F; + this.Detail1.Name = "Detail1"; + this.Detail1.StylePriority.UseFont = false; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.DetailReport1}); + this.DetailReport.DataMember = "RootObjectList"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // DetailReport1 + // + this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail2, + this.GroupHeader2, + this.GroupFooter1, + this.GroupHeader1}); + this.DetailReport1.DataMember = "RootObjectList.Groups"; + this.DetailReport1.DataSource = this.bindingSource1; + this.DetailReport1.Level = 0; + this.DetailReport1.Name = "DetailReport1"; + // + // Detail2 + // + this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableData}); + this.Detail2.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.Detail2.HeightF = 25F; + this.Detail2.Name = "Detail2"; + this.Detail2.StylePriority.UseFont = false; + // + // xrTableData + // + this.xrTableData.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableData.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTableData.Name = "xrTableData"; + this.xrTableData.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRowData}); + this.xrTableData.SizeF = new System.Drawing.SizeF(410F, 25F); + this.xrTableData.StylePriority.UseBorders = false; + this.xrTableData.StylePriority.UsePadding = false; + // + // xrTableRowData + // + this.xrTableRowData.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.xrTableCell9, + this.xrTableCell13, + this.xrTableCell4}); + this.xrTableRowData.Name = "xrTableRowData"; + this.xrTableRowData.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F); + this.xrTableRowData.StylePriority.UsePadding = false; + this.xrTableRowData.StylePriority.UseTextAlignment = false; + this.xrTableRowData.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableRowData.Weight = 1D; + // + // xrTableCell3 + // + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RootObjectList.Groups.Name", "{0:dd/MM/yyyy}")}); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.Text = "xrTableCell3"; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell3.Weight = 1.3605442176870746D; + // + // xrTableCell9 + // + this.xrTableCell9.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.StylePriority.UseBackColor = false; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.Tag = "0_Soll"; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell9.Weight = 0.47619047619047611D; + this.xrTableCell9.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.DataCell_BeforePrint); + // + // xrTableCell13 + // + this.xrTableCell13.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.StylePriority.UseBackColor = false; + this.xrTableCell13.StylePriority.UseFont = false; + this.xrTableCell13.StylePriority.UsePadding = false; + this.xrTableCell13.StylePriority.UseTextAlignment = false; + this.xrTableCell13.Tag = "0_Ist"; + this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell13.Weight = 0.47619047619047616D; + this.xrTableCell13.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.DataCell_BeforePrint); + // + // xrTableCell4 + // + this.xrTableCell4.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.StylePriority.UseBackColor = false; + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UsePadding = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.Tag = "0_Diff"; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell4.Weight = 0.47619047619047628D; + this.xrTableCell4.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.DataCell_BeforePrint); + // + // GroupHeader2 + // + this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableHeader}); + this.GroupHeader2.HeightF = 50F; + this.GroupHeader2.Name = "GroupHeader2"; + this.GroupHeader2.RepeatEveryPage = true; + // + // xrTableHeader + // + this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableHeader.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTableHeader.Name = "xrTableHeader"; + this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRowHeader1, + this.xrTableRowHeader2}); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(410F, 50F); + this.xrTableHeader.StylePriority.UseBorders = false; + this.xrTableHeader.StylePriority.UseFont = false; + this.xrTableHeader.StylePriority.UsePadding = false; + // + // xrTableRowHeader1 + // + this.xrTableRowHeader1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell19, + this.xrTableCell20}); + this.xrTableRowHeader1.Name = "xrTableRowHeader1"; + this.xrTableRowHeader1.StylePriority.UseTextAlignment = false; + this.xrTableRowHeader1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableRowHeader1.Weight = 1D; + // + // xrTableCell19 + // + this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell19.Multiline = true; + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.StylePriority.UseBorders = false; + this.xrTableCell19.Weight = 1.3605442176870746D; + // + // xrTableCell20 + // + this.xrTableCell20.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell20.Multiline = true; + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.StylePriority.UseBackColor = false; + this.xrTableCell20.StylePriority.UsePadding = false; + this.xrTableCell20.StylePriority.UseTextAlignment = false; + this.xrTableCell20.Text = "KW 1"; + this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell20.Weight = 1.4285714285714288D; + // + // xrTableRowHeader2 + // + this.xrTableRowHeader2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5, + this.xrTableCell7, + this.xrTableCell12, + this.xrTableCell2}); + this.xrTableRowHeader2.Name = "xrTableRowHeader2"; + this.xrTableRowHeader2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F); + this.xrTableRowHeader2.StylePriority.UsePadding = false; + this.xrTableRowHeader2.StylePriority.UseTextAlignment = false; + this.xrTableRowHeader2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableRowHeader2.Weight = 1D; + // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "Mitarbeiter/in"; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell5.Weight = 1.3605442176870746D; + // + // xrTableCell7 + // + this.xrTableCell7.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.StylePriority.UseBackColor = false; + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "Soll"; + this.xrTableCell7.Weight = 0.47619047619047633D; + // + // xrTableCell12 + // + this.xrTableCell12.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell12.Multiline = true; + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.StylePriority.UseBackColor = false; + this.xrTableCell12.StylePriority.UsePadding = false; + this.xrTableCell12.StylePriority.UseTextAlignment = false; + this.xrTableCell12.Text = "Ist"; + this.xrTableCell12.Weight = 0.47619047619047616D; + // + // xrTableCell2 + // + this.xrTableCell2.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.StylePriority.UseBackColor = false; + this.xrTableCell2.StylePriority.UsePadding = false; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Text = "Diff."; + this.xrTableCell2.Weight = 0.47619047619047639D; + // + // GroupFooter1 + // + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableGesamt}); + this.GroupFooter1.HeightF = 25F; + this.GroupFooter1.Name = "GroupFooter1"; + this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand; + // + // GroupHeader1 + // + this.GroupHeader1.HeightF = 0F; + this.GroupHeader1.Level = 1; + this.GroupHeader1.Name = "GroupHeader1"; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel5, + this.xrLabel4, + this.xrLabel3, + this.xrLabel2, + this.xrLabel1}); + this.ReportHeader.HeightF = 50F; + this.ReportHeader.Name = "ReportHeader"; + // + // xrLabel5 + // + this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 12F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(175F, 25F); + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(17F, 25F); + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.StylePriority.UseTextAlignment = false; + this.xrLabel5.Text = "-"; + this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // xrLabel4 + // + this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportEndDate", "{0:dd/MM/yyyy}")}); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 12F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(192.0001F, 25F); + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(367.9999F, 25F); + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.Text = "xrLabel4"; + // + // xrLabel3 + // + this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "{0:dd/MM/yyyy}")}); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 12F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(83F, 25F); + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(92F, 25F); + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.StylePriority.UseTextAlignment = false; + this.xrLabel3.Text = "xrLabel3"; + this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // xrLabel2 + // + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 12F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(83F, 25F); + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.Text = "Zeitraum:"; + // + // xrLabel1 + // + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.SizeF = new System.Drawing.SizeF(560F, 25F); + this.xrLabel1.StyleName = "Title"; + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Auswertung über geleistete Fachleistungsstunden"; + // + // pageFooterBand1 + // + this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPageInfo2, + this.xrPageInfo1}); + this.pageFooterBand1.HeightF = 48F; + this.pageFooterBand1.Name = "pageFooterBand1"; + // + // xrPageInfo2 + // + this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(900F, 25F); + this.xrPageInfo2.Name = "xrPageInfo2"; + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(140F, 23F); + this.xrPageInfo2.StyleName = "PageInfo"; + this.xrPageInfo2.StylePriority.UseFont = false; + this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrPageInfo2.TextFormatString = "Seite {0} von {1}"; + // + // xrPageInfo1 + // + this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(7.999878F, 25F); + this.xrPageInfo1.Name = "xrPageInfo1"; + this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; + this.xrPageInfo1.SizeF = new System.Drawing.SizeF(192.0001F, 23F); + this.xrPageInfo1.StyleName = "PageInfo"; + this.xrPageInfo1.StylePriority.UseFont = false; + // + // Title + // + this.Title.BackColor = System.Drawing.Color.White; + this.Title.BorderColor = System.Drawing.SystemColors.ControlText; + this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.Title.BorderWidth = 1F; + this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F); + this.Title.ForeColor = System.Drawing.Color.Black; + this.Title.Name = "Title"; + // + // FieldCaption + // + this.FieldCaption.BackColor = System.Drawing.Color.White; + this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText; + this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.FieldCaption.BorderWidth = 1F; + this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.FieldCaption.ForeColor = System.Drawing.Color.Black; + this.FieldCaption.Name = "FieldCaption"; + // + // PageInfo + // + this.PageInfo.BackColor = System.Drawing.Color.White; + this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText; + this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.PageInfo.BorderWidth = 1F; + this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); + this.PageInfo.ForeColor = System.Drawing.Color.Black; + this.PageInfo.Name = "PageInfo"; + // + // DataField + // + this.DataField.BackColor = System.Drawing.Color.White; + this.DataField.BorderColor = System.Drawing.SystemColors.ControlText; + this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.DataField.BorderWidth = 1F; + this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); + this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; + this.DataField.Name = "DataField"; + // + // fieldFLS + // + this.fieldFLS.DataMember = "FLSReportGroups"; + this.fieldFLS.Expression = "[TotalFLM] / 60"; + this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldFLS.Name = "fieldFLS"; + // + // topMarginBand1 + // + this.topMarginBand1.HeightF = 50F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 50F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // fieldDifferenzWoche1 + // + this.fieldDifferenzWoche1.DataMember = "RootObjectList.Groups"; + this.fieldDifferenzWoche1.Expression = "[Ist] - [Soll]"; + this.fieldDifferenzWoche1.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldDifferenzWoche1.Name = "fieldDifferenzWoche1"; + // + // fieldDifferenzWoche2 + // + this.fieldDifferenzWoche2.DataMember = "RootObjectList.Groups"; + this.fieldDifferenzWoche2.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldDifferenzWoche2.Name = "fieldDifferenzWoche2"; + // + // fieldDifferenzWoche3 + // + this.fieldDifferenzWoche3.DataMember = "RootObjectList.Groups"; + this.fieldDifferenzWoche3.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldDifferenzWoche3.Name = "fieldDifferenzWoche3"; + // + // fieldDifferenzWoche4 + // + this.fieldDifferenzWoche4.DataMember = "RootObjectList.Groups"; + this.fieldDifferenzWoche4.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldDifferenzWoche4.Name = "fieldDifferenzWoche4"; + // + // xrTableGesamt + // + this.xrTableGesamt.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableGesamt.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableGesamt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTableGesamt.Name = "xrTableGesamt"; + this.xrTableGesamt.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRowGesamt}); + this.xrTableGesamt.SizeF = new System.Drawing.SizeF(410F, 25F); + this.xrTableGesamt.StylePriority.UseBorders = false; + this.xrTableGesamt.StylePriority.UseFont = false; + this.xrTableGesamt.StylePriority.UsePadding = false; + // + // xrTableRowGesamt + // + this.xrTableRowGesamt.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableRowGesamt.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell10, + this.xrTableCell11, + this.xrTableCell14, + this.xrTableCell15}); + this.xrTableRowGesamt.Name = "xrTableRowGesamt"; + this.xrTableRowGesamt.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F); + this.xrTableRowGesamt.StylePriority.UseBorders = false; + this.xrTableRowGesamt.StylePriority.UsePadding = false; + this.xrTableRowGesamt.StylePriority.UseTextAlignment = false; + this.xrTableRowGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableRowGesamt.Weight = 1D; + // + // xrTableCell10 + // + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrTableCell10.StylePriority.UseBorders = false; + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + this.xrTableCell10.Text = "Gesamt"; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell10.Weight = 1.3605442176870746D; + // + // xrTableCell11 + // + this.xrTableCell11.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.StylePriority.UseBackColor = false; + this.xrTableCell11.StylePriority.UseBorders = false; + this.xrTableCell11.StylePriority.UsePadding = false; + this.xrTableCell11.StylePriority.UseTextAlignment = false; + this.xrTableCell11.Tag = "0_Soll_Gesamt"; + this.xrTableCell11.Weight = 0.47619047619047633D; + this.xrTableCell11.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.DataCell_BeforePrint); + // + // xrTableCell14 + // + this.xrTableCell14.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell14.Multiline = true; + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.StylePriority.UseBackColor = false; + this.xrTableCell14.StylePriority.UseBorders = false; + this.xrTableCell14.StylePriority.UsePadding = false; + this.xrTableCell14.StylePriority.UseTextAlignment = false; + this.xrTableCell14.Tag = "0_Ist_Gesamt"; + this.xrTableCell14.Weight = 0.47619047619047616D; + this.xrTableCell14.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.DataCell_BeforePrint); + // + // xrTableCell15 + // + this.xrTableCell15.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.StylePriority.UseBackColor = false; + this.xrTableCell15.StylePriority.UseBorders = false; + this.xrTableCell15.StylePriority.UsePadding = false; + this.xrTableCell15.StylePriority.UseTextAlignment = false; + this.xrTableCell15.Tag = "0_Diff_Gesamt"; + this.xrTableCell15.Weight = 0.47619047619047639D; + this.xrTableCell15.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.DataCell_BeforePrint); + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FLSSollIstReportRO); + // + // FLSSollIstWeeklyReport + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.DetailReport, + this.ReportHeader, + this.pageFooterBand1, + this.topMarginBand1, + this.bottomMarginBand1}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.fieldFLS, + this.fieldDifferenzWoche1, + this.fieldDifferenzWoche2, + this.fieldDifferenzWoche3, + this.fieldDifferenzWoche4}); + this.DataSource = this.bindingSource1; + this.Landscape = true; + this.Margins = new DevExpress.Drawing.DXMargins(60F, 60F, 50F, 50F); + this.PageHeight = 827; + this.PageWidth = 1169; + this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; + this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] { + this.Title, + this.FieldCaption, + this.PageInfo, + this.DataField}); + this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableData)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableGesamt)).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.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1; + private DevExpress.XtraReports.UI.XRControlStyle Title; + private DevExpress.XtraReports.UI.XRControlStyle FieldCaption; + private DevExpress.XtraReports.UI.XRControlStyle PageInfo; + private DevExpress.XtraReports.UI.XRControlStyle DataField; + private DevExpress.XtraReports.UI.XRTable xrTableHeader; + private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; + private DevExpress.XtraReports.UI.DetailBand Detail2; + private DevExpress.XtraReports.UI.XRTable xrTableData; + private DevExpress.XtraReports.UI.XRTableRow xrTableRowData; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; + private DevExpress.XtraReports.UI.CalculatedField fieldFLS; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.CalculatedField fieldDifferenzWoche1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; + private DevExpress.XtraReports.UI.CalculatedField fieldDifferenzWoche2; + private DevExpress.XtraReports.UI.CalculatedField fieldDifferenzWoche3; + private DevExpress.XtraReports.UI.CalculatedField fieldDifferenzWoche4; + private DevExpress.XtraReports.UI.XRTable xrTableGesamt; + private DevExpress.XtraReports.UI.XRTableRow xrTableRowGesamt; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; + } +} diff --git a/Report/DefaultReports/FLSSollIstWeeklyReport.cs b/Report/DefaultReports/FLSSollIstWeeklyReport.cs new file mode 100644 index 000000000..e0077267e --- /dev/null +++ b/Report/DefaultReports/FLSSollIstWeeklyReport.cs @@ -0,0 +1,224 @@ +using System; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Report.ReportObjects; +using BeWo.Report; +using System.Collections.Generic; +using DevExpress.XtraReports.UI; +using System.Linq; + +namespace BeWo.Report.DefaultReports +{ + public partial class FLSSollIstWeeklyReport : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + public FLSSollIstWeeklyReport() + { + InitializeComponent(); + } + + public void SetReportDataSource(FLSSollIstReportRO pRO) + { + var wochen = new List(); + + if (pRO.RootObjectList.Count > 0) + { + if (pRO.RootObjectList[0].Groups.Count > 0) + { + wochen = pRO.RootObjectList[0].Groups[0].WochenSummen; + } + } + + CreateTableCells(wochen); + + this.bindingSource1.DataSource = pRO; + } + + private void CreateTableCells(List wochen) + { + xrTableHeader.BeginInit(); + xrTableData.BeginInit(); + xrTableGesamt.BeginInit(); + for (int i = 0; i < wochen.Count; i++) + { + if (i > 0) + { + AddSpalten(i, false); + + } + xrTableRowHeader1.Cells[xrTableRowHeader1.Cells.Count - 1].Text = String.Format("KW {0}", wochen[i].KalenderWoche); + } + + //Add Gesamtsummen + AddSpalten(0, true); + xrTableRowHeader1.Cells[xrTableRowHeader1.Cells.Count - 1].Text = "Gesamt"; + + xrTableGesamt.EndInit(); + xrTableData.EndInit(); + xrTableHeader.EndInit(); + + } + + private void AddSpalten(int index, bool gesamt) + { + var backcolor = System.Drawing.Color.White; + + if (index % 2 == 0) + { + backcolor = System.Drawing.Color.Gainsboro; + } + if (gesamt) + { + backcolor = System.Drawing.Color.Wheat; + } + + xrTableHeader.WidthF += 210; + xrTableData.WidthF += 210; + xrTableGesamt.WidthF += 210; + if (xrTableHeader.WidthF >= PageWidth) + { + PaperKind = DevExpress.Drawing.Printing.DXPaperKind.Custom; + PageWidth += 210; + } + var cell = xrTableRowHeader1.Cells[xrTableRowHeader1.Cells.Count - 1]; + + xrTableRowHeader1.Cells.Add(new XRTableCell { Weight = cell.Weight, BackColor = backcolor }); + + xrTableRowHeader2.Cells.Add(new XRTableCell { Weight = xrTableRowHeader2.Cells[xrTableRowHeader2.Cells.Count - 1].Weight, Text = "Soll", BackColor = backcolor }); + xrTableRowHeader2.Cells.Add(new XRTableCell { Weight = xrTableRowHeader2.Cells[xrTableRowHeader2.Cells.Count - 1].Weight, Text = "Ist", BackColor = backcolor }); + xrTableRowHeader2.Cells.Add(new XRTableCell { Weight = xrTableRowHeader2.Cells[xrTableRowHeader2.Cells.Count - 1].Weight, Text = "Diff.", BackColor = backcolor }); + + xrTableRowData.Cells.Add(new XRTableCell { Weight = xrTableRowData.Cells[xrTableRowData.Cells.Count - 1].Weight, Tag = String.Format("{0}_Soll", index), BackColor = backcolor }); + xrTableRowData.Cells.Add(new XRTableCell { Weight = xrTableRowData.Cells[xrTableRowData.Cells.Count - 1].Weight, Tag = String.Format("{0}_Ist", index), BackColor = backcolor }); + xrTableRowData.Cells.Add(new XRTableCell { Weight = xrTableRowData.Cells[xrTableRowData.Cells.Count - 1].Weight, Tag = String.Format("{0}_Diff", index), BackColor = backcolor }); + + xrTableRowGesamt.Cells.Add(new XRTableCell { Weight = xrTableRowGesamt.Cells[xrTableRowGesamt.Cells.Count - 1].Weight, Tag = String.Format("{0}_Soll_Gesamt", index), BackColor = backcolor }); + xrTableRowGesamt.Cells.Add(new XRTableCell { Weight = xrTableRowGesamt.Cells[xrTableRowGesamt.Cells.Count - 1].Weight, Tag = String.Format("{0}_Ist_Gesamt", index), BackColor = backcolor }); + xrTableRowGesamt.Cells.Add(new XRTableCell { Weight = xrTableRowGesamt.Cells[xrTableRowGesamt.Cells.Count - 1].Weight, Tag = String.Format("{0}_Diff_Gesamt", index), BackColor = backcolor }); + + + xrTableRowData.Cells[xrTableRowData.Cells.Count - 1].BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.DataCell_BeforePrint); + xrTableRowData.Cells[xrTableRowData.Cells.Count - 2].BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.DataCell_BeforePrint); + xrTableRowData.Cells[xrTableRowData.Cells.Count - 3].BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.DataCell_BeforePrint); + + xrTableRowGesamt.Cells[xrTableRowGesamt.Cells.Count - 1].BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.DataCell_BeforePrint); + xrTableRowGesamt.Cells[xrTableRowGesamt.Cells.Count - 2].BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.DataCell_BeforePrint); + xrTableRowGesamt.Cells[xrTableRowGesamt.Cells.Count - 3].BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.DataCell_BeforePrint); + + if (gesamt) + { + xrTableRowData.Cells[xrTableRowData.Cells.Count - 1].Tag += "_Summe"; + xrTableRowData.Cells[xrTableRowData.Cells.Count - 2].Tag += "_Summe"; + xrTableRowData.Cells[xrTableRowData.Cells.Count - 3].Tag += "_Summe"; + + xrTableRowGesamt.Cells[xrTableRowGesamt.Cells.Count - 1].Tag += "_Summe"; + xrTableRowGesamt.Cells[xrTableRowGesamt.Cells.Count - 2].Tag += "_Summe"; + xrTableRowGesamt.Cells[xrTableRowGesamt.Cells.Count - 3].Tag += "_Summe"; + + xrTableRowGesamt.Cells[xrTableRowGesamt.Cells.Count - 1].DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RootObjectList.DifferenzSollIstGesamt")}); + xrTableRowGesamt.Cells[xrTableRowGesamt.Cells.Count - 1].TextFormatString = "{0:0.00}"; + xrTableRowGesamt.Cells[xrTableRowGesamt.Cells.Count - 2].DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RootObjectList.IstGesamt")}); + xrTableRowGesamt.Cells[xrTableRowGesamt.Cells.Count - 2].TextFormatString = "{0:0.00}"; + xrTableRowGesamt.Cells[xrTableRowGesamt.Cells.Count - 3].DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RootObjectList.SollGesamt")}); + xrTableRowGesamt.Cells[xrTableRowGesamt.Cells.Count - 3].TextFormatString = "{0:0.00}"; + + } + } + + private void DataCell_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e) + { + XRTableCell cell = sender as XRTableCell; + + // Zugriff auf das aktuelle Datenobjekt + var group = cell.Report.GetCurrentRow() as FLSSollIstReportRO.FLSSollIstReportGroupRO; + var tag = ""; + + if (cell.Tag != null) + { + tag = cell.Tag.ToString(); + } + + var indexStr = ""; + + if (tag.IndexOf("_") > 0) + { + indexStr = tag.Substring(0, tag.IndexOf("_")); + } + + cell.ForeColor = System.Drawing.Color.Black; + + //Im Tag wird der Wochenindex gespeichert + if (group != null && tag != null && Int32.TryParse(indexStr, out var idx)) + { + if (idx >= 0 && idx < group.WochenSummen.Count) + { + var ws = group.WochenSummen[idx]; + + //Prüfe Summen Spalte (letzte Spalte) + if (tag.Contains("Summe")) + { + if (tag.Contains("Gesamt")) + { + if (cell.Text.StartsWith("-")) + { + cell.ForeColor = System.Drawing.Color.Red; + } + } + else if (tag.Contains("Ist")) + { + cell.Text = String.Format("{0:0.00}", group.WochenSummen.Sum(w => w.IstStunden)); + } + } + else + { + if (tag.Contains("Gesamt")) + { + if (tag.Contains("Ist")) + { + cell.Text = String.Format("{0:0.00}", ws.IstStunden); + } + else if (tag.Contains("Soll")) + { + cell.Text = String.Format("{0:0.00}", ws.SollStunden); + } + else if (tag.Contains("Diff")) + { + cell.Text = String.Format("{0:0.00}", ws.Differenz); + + if (ws.Differenz < 0) + { + cell.ForeColor = System.Drawing.Color.Red; + } + } + } + else if (tag.Contains("Ist")) + { + cell.Text = String.Format("{0:0.00}", ws.IstStunden); + } + + } + + } + + } + //if (rowObj is DayDetail myRow && myRow.Date != null) + //{ + // var date = myRow.Date; + + // XRTableRow row = cell.Parent as XRTableRow; + + // System.Drawing.Color backColor = System.Drawing.Color.Transparent; + + // if (date.DayOfWeek == DayOfWeek.Saturday || date.DayOfWeek == DayOfWeek.Sunday) + // backColor = System.Drawing.Color.LightSteelBlue; + // if (vs.IstFeiertag(date)) + // backColor = System.Drawing.Color.Yellow; + + // foreach (XRTableCell c in row.Cells) + // c.BackColor = backColor; + //} + } + } +} diff --git a/Report/DefaultReports/FLSSollIstWeeklyReport.resx b/Report/DefaultReports/FLSSollIstWeeklyReport.resx new file mode 100644 index 000000000..d58980a38 --- /dev/null +++ b/Report/DefaultReports/FLSSollIstWeeklyReport.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Report/DefaultReports/SBDCharacteristicsReport.cs b/Report/DefaultReports/SBDCharacteristicsReport.cs index 569474343..7d7242f5a 100644 --- a/Report/DefaultReports/SBDCharacteristicsReport.cs +++ b/Report/DefaultReports/SBDCharacteristicsReport.cs @@ -7,7 +7,7 @@ using DevExpress.XtraReports.UI; using BeWo.Report; using BeWo.Report.ReportObjects; using BS.Shared.DataContracts; - +using BS.Shared.Core; namespace BeWo.Report.DefaultReports { @@ -59,6 +59,7 @@ namespace BeWo.Report.DefaultReports if ((!az.GueltigVon.HasValue || az.GueltigVon <= DateTime.Now) && (!az.GueltigBis.HasValue || az.GueltigBis >= DateTime.Now) && az.Eintraege != null) { + SortiereArbeitszeiten(az.Eintraege); foreach (var e in az.Eintraege) { AddArbeitszeit(e); @@ -68,6 +69,18 @@ namespace BeWo.Report.DefaultReports } } + private void SortiereArbeitszeiten(List zeiten) + { + zeiten.Sort( + (a, b) => + { + var at1 = DateTimeUtils.GetAssistanceTimeComparisonDateTime(a.UhrzeitVon, a.UhrzeitBis, DateTime.Now.Date.AddDays((int)a.DayOfWeek)); + var at2 = DateTimeUtils.GetAssistanceTimeComparisonDateTime(b.UhrzeitVon, b.UhrzeitBis, DateTime.Now.Date.AddDays((int)b.DayOfWeek)); + + return at1.Start.CompareTo(at2.Start); + }); + } + private void AddArbeitszeit(ArbeitszeitEintragDC ae) { XRTableRow newRow = tableBetreuungszeiten.InsertRowBelow(tableBetreuungszeiten.Rows[tableBetreuungszeiten.Rows.Count - 1]); diff --git a/Report/Report.csproj b/Report/Report.csproj index 0d025b2ce..72dfe8258 100644 --- a/Report/Report.csproj +++ b/Report/Report.csproj @@ -193,6 +193,18 @@ BudgetnachweisDigga.cs + + Component + + + FLSSollIstReport.cs + + + Component + + + FLSSollIstWeeklyReport.cs + Component @@ -553,6 +565,7 @@ + @@ -627,6 +640,14 @@ BudgetnachweisDigga.cs Designer + + FLSSollIstReport.cs + Designer + + + FLSSollIstWeeklyReport.cs + Designer + GkvBegleitzettel.cs Designer diff --git a/Report/ReportObjects/AuslastungBerechnung.cs b/Report/ReportObjects/AuslastungBerechnung.cs index 3375758ff..88b1528a1 100644 --- a/Report/ReportObjects/AuslastungBerechnung.cs +++ b/Report/ReportObjects/AuslastungBerechnung.cs @@ -397,6 +397,8 @@ namespace BeWo.Report.ReportObjects } // "Frei pro Woche" aus der Zeiterfassungsstatistik hinzufügen var stats = new ServiceRecordStatisticFactory().CreateSupportConceptStatisticsImpl(cb2sc.Oid.Value, EndDate); + scDC.FreiProWocheDurchschnittUberGesamtZeitraum = Math.Round(stats.MinutesFreePerWeekAverage / 60, 2, MidpointRounding.AwayFromZero); + if (stats.PeriodStatistics != null && stats.PeriodStatistics.Any(s => s.SupportConceptApprovalPeriod.SupportConceptApprovalPeriodOid == scap.Oid)) { var stat = stats.PeriodStatistics.First(s => s.SupportConceptApprovalPeriod.SupportConceptApprovalPeriodOid == scap.Oid); @@ -410,6 +412,7 @@ namespace BeWo.Report.ReportObjects { scDC.FreiProWoche *= anteil.AnteilAnBetreuung / 100; scDC.FreiProMonat *= anteil.AnteilAnBetreuung / 100; + scDC.FreiProWocheDurchschnittUberGesamtZeitraum *= anteil.AnteilAnBetreuung / 100; } // Minutenwert aus der Bewilligung einbeziehen else @@ -419,6 +422,7 @@ namespace BeWo.Report.ReportObjects { scDC.FreiProWoche *= anteil.AnteilAnBetreuung / minProWoche; scDC.FreiProMonat *= anteil.AnteilAnBetreuung / minProWoche; + scDC.FreiProWocheDurchschnittUberGesamtZeitraum *= anteil.AnteilAnBetreuung / minProWoche; } } } diff --git a/Report/ReportObjects/FLSSollIstReportRO.cs b/Report/ReportObjects/FLSSollIstReportRO.cs new file mode 100644 index 000000000..c33799d1c --- /dev/null +++ b/Report/ReportObjects/FLSSollIstReportRO.cs @@ -0,0 +1,195 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Service.DCEntityMapper; +using BS.Shared; +using BS.Shared.DataContracts; +using BS.Shared.Extensions; + +namespace BeWo.Report.ReportObjects +{ + public class FLSSollIstReportRO + { + public DateTime? ReportEndDate { get; set; } + + public DateTime? ReportStartDate { get; set; } + + public List RootObjectList { get; set; } = new List(); + + + + public class FLSSollIstRootRO + { + public string Name { get; set; } + + public long ObjectOid { get; set; } + + public List Groups { get; set; } = new List(); + public decimal SollGesamt { get; set; } + public decimal IstGesamt { get; set; } + public decimal DifferenzSollIstGesamt { get; set; } + + public String CustomValue1 { get; set; } + + public String CustomValue2 { get; set; } + + public String CustomValue3 { get; set; } + + public String CustomValue4 { get; set; } + + public String CustomValue5 { get; set; } + } + + public class FLSSollIstReportGroupRO + { + public string Name { get; set; } + + public long ObjectOid { get; set; } + + public List WochenSummen { get; set; } = new List(); + + public decimal SollGesamt { get; set; } + + public decimal IstGesamt { get; set; } + public decimal DifferenzSollIstGesamt { get; set; } + public String CustomValue1 { get; set; } + + public String CustomValue2 { get; set; } + + public String CustomValue3 { get; set; } + + public String CustomValue4 { get; set; } + + public String CustomValue5 { get; set; } + } + + public class FLSSollIstWochenSummen + { + public decimal? SollStunden { get; set; } + + public decimal? IstStunden { get; set; } + + public decimal? Differenz + { + get + { + if (IstStunden.HasValue && SollStunden.HasValue) + { + return IstStunden - SollStunden; + } + if (SollStunden.HasValue) + { + return SollStunden * -1; + } + return IstStunden; + } + } + + public DateTime WocheStart { get; set; } + + public DateTime WocheEnde { get; set; } + + public int KalenderWoche + { + get + { + var ci = System.Globalization.CultureInfo.InvariantCulture; + + return ci.Calendar.GetWeekOfYear( + WocheStart, + System.Globalization.CalendarWeekRule.FirstFourDayWeek, + DayOfWeek.Monday); + } + } + + } + + public static FLSSollIstReportRO Create(List dcList, FLSAnalysisConfigDC config) + { + var ro = new FLSSollIstReportRO(); + + ro.ReportStartDate = config.StartDate; + ro.ReportEndDate = config.EndDate; + + foreach (var root in dcList.OrderBy(a => a.DisplayName)) + { + var rootRo = new FLSSollIstRootRO(); + rootRo.Name = root.DisplayName; + rootRo.SollGesamt = 0; //root.SollFLSTotal ?; + + foreach (var item in root.Groups.OrderBy(a => a.DisplayName)) + { + var grpRo = new FLSSollIstReportGroupRO(); + grpRo.Name = item.DisplayName; + grpRo.WochenSummen = ErstelleWochensummen(config.StartDate, config.EndDate, root.SollFLSPerWeek); + + foreach (var sc in item.SupportConcepts) + { + foreach (var sr in sc.ServiceRecords) + { + var ws = grpRo.WochenSummen.FirstOrDefault(w => w.WocheStart <= sr.Start && sr.Start < w.WocheEnde.AddDays(1)); + + if (ws != null) + { + if (!ws.IstStunden.HasValue) + { + ws.IstStunden = 0; + } + ws.IstStunden += sr.RoundedDuration / 60; + } + + grpRo.IstGesamt += sr.RoundedDuration; + } + } + + grpRo.IstGesamt = grpRo.IstGesamt / 60; + rootRo.IstGesamt += grpRo.IstGesamt; + rootRo.SollGesamt = grpRo.WochenSummen.Sum(w => w.SollStunden) ?? 0; + rootRo.Groups.Add(grpRo); + } + + rootRo.DifferenzSollIstGesamt = rootRo.IstGesamt - rootRo.SollGesamt; + + if (rootRo.Groups.Count > 0) + { + ro.RootObjectList.Add(rootRo); + } + } + + return ro; + } + + private static List ErstelleWochensummen(DateTime? startDate, DateTime? endDate, decimal? defaultSoll) + { + var liste = new List(); + if (startDate.HasValue && endDate.HasValue) + { + DateTime dt = startDate.Value; + + while (dt <= endDate.Value) + { + int days = ((int)DayOfWeek.Sunday - (int)dt.DayOfWeek + 7) % 7; + var sonntag = dt.AddDays(days); + + var ws = new FLSSollIstWochenSummen(); + ws.WocheStart = dt; + + //Ermittele den nächsten Sonntag + ws.WocheEnde = sonntag; + + if (ws.WocheEnde > endDate) + { + ws.WocheEnde = endDate.Value; + } + ws.SollStunden = defaultSoll; + + liste.Add(ws); + dt = sonntag.AddDays(1); + } + } + return liste; + } + } +} \ No newline at end of file diff --git a/Report/ReportObjects/MitarbeiterauslastungRO.cs b/Report/ReportObjects/MitarbeiterauslastungRO.cs index 031a00acb..b84332ab3 100644 --- a/Report/ReportObjects/MitarbeiterauslastungRO.cs +++ b/Report/ReportObjects/MitarbeiterauslastungRO.cs @@ -325,8 +325,10 @@ namespace BeWo.Report.ReportObjects public decimal MinutesSoll { get; set; } public decimal MittelbarIst { get; set; } - - public decimal FreiProWoche { get; set; } + + public decimal FreiProWocheDurchschnittUberGesamtZeitraum { get; set; } + + public decimal FreiProWoche { get; set; } public decimal FreiProMonat { get; set; } diff --git a/ReportImp/AkggMid/LeistungsnachweisHelper.cs b/ReportImp/AkggMid/LeistungsnachweisHelper.cs index c686f93ac..9a25ada8b 100644 --- a/ReportImp/AkggMid/LeistungsnachweisHelper.cs +++ b/ReportImp/AkggMid/LeistungsnachweisHelper.cs @@ -50,6 +50,11 @@ namespace AkggMid KorrigiereFLSProWoche(ro); + } + + internal void BerechneBewilligteStunden(ServicesOverviewRO pRO) + { + } internal DateTimeSpan BerechneSchuljahr(ServicesOverviewRO ro) diff --git a/ReportImp/AkggMid/LeistungsnachweisSozialamt.cs b/ReportImp/AkggMid/LeistungsnachweisSozialamt.cs index 8f9a5f7d7..294fe1683 100644 --- a/ReportImp/AkggMid/LeistungsnachweisSozialamt.cs +++ b/ReportImp/AkggMid/LeistungsnachweisSozialamt.cs @@ -37,9 +37,10 @@ namespace AkggMid ServicesOverviewRO.CreateSignatureString(record); } + helper.BerechneBewilligteStunden(pRO); //LeistungsnachweisHelper.PruefeWochenBudget(pRO); - lblWegbegleitung.Text = String.Format("Kostenzusicherung: bis zu {0:0.00} Stunden pro Woche", pRO.ApprovedFLSPerWeek); + lblWegbegleitung.Text = String.Format("Kostenzusicherung: bis zu {0:0.00} Stunden pro Woche", pRO.ApprovedFLSPerWeekTotal); if (pRO.CustomerOid > 0) { var c = DAOFactory.GenericDAO.LoadByID(pRO.CustomerOid); @@ -58,7 +59,7 @@ namespace AkggMid } if (betreuungsartSb.ToString().Contains("Wegbegleitung")) { - lblWegbegleitung.Text = String.Format("Kostenzusicherung: bis zu {0:0.00} Stunden pro Woche (incl.Wegbegleitung)", pRO.ApprovedFLSPerWeek); + lblWegbegleitung.Text = String.Format("Kostenzusicherung: bis zu {0:0.00} Stunden pro Woche (incl.Wegbegleitung)", pRO.ApprovedFLSPerWeekTotal); } } diff --git a/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzucker.cs b/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzucker.cs index ca828510d..4aad9dc5e 100644 --- a/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzucker.cs +++ b/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzucker.cs @@ -38,7 +38,9 @@ namespace AkggMid //helper.PruefeWochenBudget(pRO); - lblWegbegleitung.Text = String.Format("Kostenzusicherung: bis zu {0:0.00} Stunden pro Woche", pRO.ApprovedFLSPerWeek); + helper.BerechneBewilligteStunden(pRO); + + lblWegbegleitung.Text = String.Format("Kostenzusicherung: bis zu {0:0.00} Stunden pro Woche", pRO.ApprovedFLSPerWeekTotal); if (pRO.CustomerOid > 0) { var c = DAOFactory.GenericDAO.LoadByID(pRO.CustomerOid); @@ -56,7 +58,7 @@ namespace AkggMid } } if (betreuungsartSb.ToString().Contains("Wegbegleitung")) - lblWegbegleitung.Text = String.Format("Kostenzusicherung: bis zu {0:0.00} Stunden pro Woche (incl.Wegbegleitung)", pRO.ApprovedFLSPerWeek); + lblWegbegleitung.Text = String.Format("Kostenzusicherung: bis zu {0:0.00} Stunden pro Woche (incl.Wegbegleitung)", pRO.ApprovedFLSPerWeekTotal); } this.bindingSource1.DataSource = pRO; diff --git a/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.cs b/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.cs index d50f3ddd7..5768220ea 100644 --- a/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.cs +++ b/ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.cs @@ -46,9 +46,11 @@ namespace AkggMid } } + helper.BerechneBewilligteStunden(pRO); + //helper.PruefeWochenBudget(pRO); - lblWegbegleitung.Text = String.Format("Kostenzusicherung: bis zu {0:0.00} Stunden pro Woche", pRO.ApprovedFLSPerWeek); + lblWegbegleitung.Text = String.Format("Kostenzusicherung: bis zu {0:0.00} Stunden pro Woche", pRO.ApprovedFLSPerWeekTotal); if (pRO.CustomerOid > 0) { var c = DAOFactory.GenericDAO.LoadByID(pRO.CustomerOid); @@ -66,7 +68,7 @@ namespace AkggMid } } if (betreuungsartSb.ToString().Contains("Wegbegleitung")) - lblWegbegleitung.Text = String.Format("Kostenzusicherung: bis zu {0:0.00} Stunden pro Woche (incl.Wegbegleitung)", pRO.ApprovedFLSPerWeek); + lblWegbegleitung.Text = String.Format("Kostenzusicherung: bis zu {0:0.00} Stunden pro Woche (incl.Wegbegleitung)", pRO.ApprovedFLSPerWeekTotal); } this.bindingSource1.DataSource = pRO; } diff --git a/ReportImp/BBIRheinSieg/Service/CustomVertretungsManager.cs b/ReportImp/BBIRheinSieg/Service/CustomVertretungsManager.cs index ceef43f3b..f5417fdfb 100644 --- a/ReportImp/BBIRheinSieg/Service/CustomVertretungsManager.cs +++ b/ReportImp/BBIRheinSieg/Service/CustomVertretungsManager.cs @@ -34,7 +34,7 @@ namespace BBIRheinSieg.Service vertretungsItem.Employee != null).Select(item => item.Employee.EmployeeOid); - var team = DAOFactory.GenericDAO.GetAllActive().Where(t => t.Name == "Vertretungsplanung").FirstOrDefault(); + var team = DAOFactory.GenericDAO.GetAllActive().Where(t => t.Name == "Vertretungen").FirstOrDefault(); if (team != null) { var list = new List(); diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/AbrechnungsInfo.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/AbrechnungsInfo.cs index 05387718c..3d2f5d467 100644 --- a/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/AbrechnungsInfo.cs +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/AbrechnungsInfo.cs @@ -115,6 +115,23 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung public static decimal GetPreisForAusflugFreizeittreff(Pflegegrad? pflegegrad, DateTime d) { + if (d >= new DateTime(2026, 1, 1)) + { + if (pflegegrad.HasValue) + { + switch (pflegegrad.Value) + { + case Pflegegrad.KeinGrad: + return 64; + case Pflegegrad.PflegegradBeantragt: + return 64; + default: + return 128; + } + } + + return 64; + } if (d >= new DateTime(2025, 1, 1)) { if (pflegegrad.HasValue) diff --git a/ReportImp/LebenshilfeBadKreuznachFUD/Reporting/CustomReportCreator.cs b/ReportImp/LebenshilfeBadKreuznachFUD/Reporting/CustomReportCreator.cs index f9267d43a..6370a3f33 100644 --- a/ReportImp/LebenshilfeBadKreuznachFUD/Reporting/CustomReportCreator.cs +++ b/ReportImp/LebenshilfeBadKreuznachFUD/Reporting/CustomReportCreator.cs @@ -8,7 +8,9 @@ using BeWo.Report; using BeWo.Report.DefaultReports; using BeWo.Report.ReportObjects; using BeWo.Service.DCEntityMapper; +using BeWo.Service.Plugins; using BS.Shared; +using BS.Shared.DataContracts; using DevExpress.XtraReports.UI; using LebenshilfeBadKreuznachFUD.Reporting.Reports; @@ -20,12 +22,57 @@ namespace LebenshilfeBadKreuznachFUD.Reporting { if (queryOid == 1000) { - return CreateStundenkontrolleAbw(CreateQueryRO(queryOid, queryReportId)); + return CreateStundenkontrolleAbwNachWochen(CreateQueryRO(queryOid, queryReportId)); } return base.CreateQueryReport(queryOid, queryReportId); } + private XtraReport CreateStundenkontrolleAbwNachWochen(QueryRO qro) + { + + if (qro.Rows.Count > 0) + { + DateTime start = DateTime.Now; + start = new DateTime(start.Year, start.Month, 1); + + DateTime dt = DateTime.Now; + if (DateTime.TryParse(qro.Rows[0].Field1.ToString(), out dt)) + { + start = dt; + + } + + DateTime ende = start.AddMonths(1).AddTicks(-1); + + var config = new FLSAnalysisConfigDC(); + config.StartDate = start; + config.EndDate = ende; + config.FetchApprovedFLS = true; + config.ReportType = FLSReportType.Customer; + + if (qro.Rows[0].Field2 != null && Int64.TryParse(qro.Rows[0].Field2.ToString(), out var catOid)) + { + if (catOid > 0) + { + config.ServiceDescriptionOids = DAOFactory.SearchDAO.FindServiceDescriptionForCategory(catOid).Select(d => d.Oid.Value).ToList(); + } + } + + + var plugin = PluginLoader.FindClass(); + + var reportDcList = plugin.GetCustomerFLSAnalysis(config); + + var ro = FLSSollIstReportRO.Create(reportDcList, config); + var druck = new FLSSollIstWeeklyReport(); + druck.SetReportDataSource(ro); + + return druck; + } + return new XtraReport(); + } + private XtraReport CreateStundenkontrolleAbw(QueryRO qro) { @@ -33,51 +80,40 @@ namespace LebenshilfeBadKreuznachFUD.Reporting { DateTime start = DateTime.Now; start = new DateTime(start.Year, start.Month, 1); - DateTime ende = start.AddMonths(1).AddDays(-1); - + DateTime dt = DateTime.Now; if (DateTime.TryParse(qro.Rows[0].Field1.ToString(), out dt)) { start = dt; - } - if (DateTime.TryParse(qro.Rows[0].Field2.ToString(), out dt)) - { - ende = dt; - } + } + + DateTime ende = start.AddMonths(1).AddDays(-1); - if (qro.Rows[0].Field3 != null && qro.Rows[0].Field3.ToString() != "0") + var config = new FLSAnalysisConfigDC(); + config.StartDate = start; + config.EndDate = ende; + config.FetchApprovedFLS = true; + config.ReportType = FLSReportType.Customer; + + if (qro.Rows[0].Field2 != null && Int64.TryParse(qro.Rows[0].Field2.ToString(), out var catOid)) { - long c2sOid = Int64.Parse(qro.Rows[0].Field3.ToString()); - //var customer = DAOFactory.GenericDAO.LoadByID(customerOid.Value); - long? scapOid = null; - var c2s = DAOFactory.GenericDAO.LoadByID(c2sOid); - if (c2s.ApprovalPeriodList.Count > 0) + if (catOid > 0) { - scapOid = c2s.ApprovalPeriodList[0].Oid; + config.ServiceDescriptionOids = DAOFactory.SearchDAO.FindServiceDescriptionForCategory(catOid).Select(d => d.Oid.Value).ToList(); } - - var ro = MonatlicherSollIstVergleichRO.Create(c2sOid, dt, scapOid, null, 1); - var druck = new StundenkontrolleAbw(); - 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; - //} + + var plugin = PluginLoader.FindClass(); + + var reportDcList = plugin.GetCustomerFLSAnalysis(config); + + var ro = FLSSollIstReportRO.Create(reportDcList, config); + var druck = new FLSSollIstReport(); + druck.SetReportDataSource(ro); + + return druck; } return new XtraReport(); } diff --git a/ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisAbw.Designer.cs b/ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisAbw.Designer.cs index dc04ff463..2e505db8a 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisAbw.Designer.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisAbw.Designer.cs @@ -100,6 +100,7 @@ namespace LebenshilfeFrankfurtOder this.fieldStunden = new DevExpress.XtraReports.UI.CalculatedField(); this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblLeistungskategorie = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); @@ -108,7 +109,8 @@ namespace LebenshilfeFrankfurtOder // // Detail // - this.Detail.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.Detail.HeightF = 0F; this.Detail.Name = "Detail"; this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -120,7 +122,8 @@ namespace LebenshilfeFrankfurtOder this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableServiceRecords1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableServiceRecords1.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTableServiceRecords1.Name = "xrTableServiceRecords1"; this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -375,7 +378,7 @@ namespace LebenshilfeFrankfurtOder // lblUnterschriftKlient // this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.lblUnterschriftKlient.Font = new System.Drawing.Font("Arial", 8F); + this.lblUnterschriftKlient.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(52.49777F, 97.01385F); this.lblUnterschriftKlient.Multiline = true; this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; @@ -392,7 +395,7 @@ namespace LebenshilfeFrankfurtOder // lblUnterschriftMitarbeiter // this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.lblUnterschriftMitarbeiter.Font = new System.Drawing.Font("Arial", 8F); + this.lblUnterschriftMitarbeiter.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(355.8077F, 97.01385F); this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter"; this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 2, 0, 100F); @@ -619,7 +622,8 @@ namespace LebenshilfeFrankfurtOder this.lblZiele.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblZiele.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblZiele.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.lblZiele.LocationFloat = new DevExpress.Utils.PointFloat(323.3333F, 20F); this.lblZiele.Multiline = true; this.lblZiele.Name = "lblZiele"; @@ -734,6 +738,7 @@ namespace LebenshilfeFrankfurtOder // topMarginBand1 // this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblLeistungskategorie, this.xrLabel3, this.xrPictureBox1, this.xrLabel1, @@ -744,20 +749,21 @@ namespace LebenshilfeFrankfurtOder // xrLabel3 // this.xrLabel3.CanGrow = false; - this.xrLabel3.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(899.7567F, 64.51386F); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(899.7567F, 64.51385F); this.xrLabel3.Multiline = true; this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(160.2433F, 42.91666F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(160.2433F, 16.66666F); this.xrLabel3.StylePriority.UseFont = false; this.xrLabel3.StylePriority.UseTextAlignment = false; - this.xrLabel3.Text = "ambulant betreutes Wohnen"; + this.xrLabel3.Text = "Assistenz beim Wohnen"; this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // xrPictureBox1 // - this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); + this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource")); this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 21.59721F); this.xrPictureBox1.Name = "xrPictureBox1"; this.xrPictureBox1.SizeF = new System.Drawing.SizeF(209.1667F, 59.58332F); @@ -768,7 +774,8 @@ namespace LebenshilfeFrankfurtOder // this.xrLabel1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; this.xrLabel1.CanGrow = false; - this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 81.18053F); this.xrLabel1.Multiline = true; this.xrLabel1.Name = "xrLabel1"; @@ -788,14 +795,14 @@ namespace LebenshilfeFrankfurtOder // // xrPageInfo2 // - this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); - this.xrPageInfo2.Format = "Seite {0} von {1}"; + this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(820.0001F, 10.00002F); this.xrPageInfo2.Name = "xrPageInfo2"; this.xrPageInfo2.RunningBand = this.DetailReport; this.xrPageInfo2.SizeF = new System.Drawing.SizeF(219.9999F, 23F); this.xrPageInfo2.StylePriority.UseFont = false; this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrPageInfo2.TextFormatString = "Seite {0} von {1}"; // // fieldArtDerLeistung // @@ -836,6 +843,19 @@ namespace LebenshilfeFrankfurtOder this.xrLabel4.Text = "Leistungszeitraum: [Month] [Year]"; this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // + // lblLeistungskategorie + // + this.lblLeistungskategorie.CanGrow = false; + this.lblLeistungskategorie.LocationFloat = new DevExpress.Utils.PointFloat(899.7567F, 81.18052F); + this.lblLeistungskategorie.Multiline = true; + this.lblLeistungskategorie.Name = "lblLeistungskategorie"; + this.lblLeistungskategorie.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblLeistungskategorie.SizeF = new System.Drawing.SizeF(160.2433F, 16.66666F); + this.lblLeistungskategorie.StylePriority.UseFont = false; + this.lblLeistungskategorie.StylePriority.UseTextAlignment = false; + this.lblLeistungskategorie.Text = "[Leistungskategorie]"; + this.lblLeistungskategorie.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // // LeistungsnachweisAbw // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -849,18 +869,19 @@ namespace LebenshilfeFrankfurtOder this.fieldArtDerLeistung, this.fieldStunden}); this.DataSource = this.bindingSource1; - this.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.formattingRuleStartDate, this.formattingRuleServiceDesc, this.formattingRuleCostBearer, this.formattingRuleEmployeeName}); this.Landscape = true; - this.Margins = new System.Drawing.Printing.Margins(50, 49, 107, 50); + this.Margins = new DevExpress.Drawing.DXMargins(50F, 49F, 107.4305F, 50F); this.PageHeight = 827; this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); @@ -940,5 +961,6 @@ namespace LebenshilfeFrankfurtOder private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; + private DevExpress.XtraReports.UI.XRLabel lblLeistungskategorie; } } diff --git a/ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisAbw.cs b/ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisAbw.cs index dd363398c..62e6e0797 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisAbw.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisAbw.cs @@ -32,6 +32,8 @@ namespace LebenshilfeFrankfurtOder var dict = ErstelleZieleDict(pRO); double minutes = 0; + lblLeistungskategorie.Text = ""; + foreach (var sd in pRO.Services) { minutes += sd.Minutes; diff --git a/ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisAbw.resx b/ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisAbw.resx index 6362257d8..f880437c8 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisAbw.resx +++ b/ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisAbw.resx @@ -117,247 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 21, 17 - - - - - iVBORw0KGgoAAAANSUhEUgAAAeQAAACPCAIAAACkiD+DAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAW - JQAAFiUBSVIk8AAANolJREFUeF7tXb9rHMnW/f4FJYYHjhxssPAiJ4INXuJkwaBIgQ0GRZMIDI6cGAyO - HNggcDSJQCAnSgQCRQp2waBokgXBbjKJQKBIieGl7zvn3Fs1rVFXd89Mz0hj34NoqqtuV92u0Zw5fetH - /9//AoFAIPDgEWQdCAQCa4Ag60AgEFgDBFkHAoHAGiDIOhAIBNYAQdaBQCCwBgiyDgQCgTVAkHUgEAis - AYKsA4FAYA0QZB0IBAJrgCDrQCAQWAMEWQcCgcAaIMi6CZ8/f7bE6Wh8cXVj6UAgEFg9gqwd4OIPh+eD - vbOtD8fP3h5Z+umbw9Pz8d7J6NH2cO9o5KaBQCCwcgRZk6bBzr+8GG68GuL4r+3hv158/dcrHIc4PuEp - Ezj6BYFAILBy/KRkPRpfg6Afvxzi+Ojl8PHLfXD04+39J6+Gj7b2QdBPmHPweHv4aEcJHF8Nh6d/+fWB - QCCwWvykZD3YO6OU3j745cVXELTUNOTzATT1E2ZmlX2ATCSyvh6NrryKQCAQWCF+VrL+fEa9/JI0/Xhr - 35X1juIeyHyFNKT0AdLQ3Sh6su1CG0XXN9+9lkAgEFgVflayHlJZQ0S7oDbhzFMIbWZa0Qb4OtukzN/e - HnktgUAgsCr8pGS9C2X9Ssoaxx1FqF8dPKJ8VsSD8WtyNxS31HeypLKm3B7snXlFgUAgsBL8pGT9L5/s - IdW8fcCw9fMhjwpkU0SblGY4u3JqKlvHk9HY6woEAoHl42ck6/HVzWOI6FdJPlNHS1OnODWKOAmEUnpf - ontY1deU3lLlXl0gEAgsHz8jWZOLOUuPUQ5o58c7+49eUjsbZTtxWzDkJYtgD8qG5aOUSeLeGe5+jmBI - IBBYEX5KslZ8QzPzGPdgiMOm6+XTF19ZNNDx1cEvz3lkAERFaRofJfb7k1jWGAgEVoGfjqyPR2OqYyjr - 7eEjjSs+fmnxEA+DZLltBj6oSAOfuodMyXBW8uzt0Wh87VUHAoHA0vDTkbUth5GmpnBmGnoZf5TPFbmN - Y1LWOnVlDZW9oXFIGmhYEnztVQcCgcDS8POR9Rcth9lhJEThaYaqH+FUCeprjShSPktZczmMDTBCTXPV - jMwUxeZVnPA33ItgSCAQWDIeEFnvHY2gWC+ubkb/LHFJt5T1V9PLLqJfMVoNTT1R0xTRlN4oSkK7oq9x - lJmi2zqNmXyBQGDJeBBk/U77kT7Ram+LCy8vEDz6+9pbsXkdVM0mn004Z7lNFka+q2lT1poHQj917eMt - 2ii6ffB0cDiODa8DgcDScP9kfXw+5tTm7QMO94EKeRxuvTv24iVAO+15WxbrEAsPn2zxqOCGBhgZDDHu - TseXVN+POLGPxJ3IXUfU8Gr44fDc2wgEAoFecZ9kfTIaK7ZA0eqJHH/YHj7/dOJ2feOPf67QymQsEa0r - DLKBxIC77nmmhThow+2tf3nxlUOLz33zkA1S9qTIq9qOlTKBQGApuB+yvrz5bq9foYaVvAXZadGgxvcs - QLG9RKG6f/qXlLXFMbTaxdYuUkTzqG32mJ8ktqbrST7ryGBIPoX/lgkB/tvbo9iWLxAI9I57IGsI22ev - jybqlYN4SGg0jxLVhC2FKor8miXg08lo7+ACx48HF6+H36SLzQ0XztLL2jYkaXC6Kvksla3J11LW2SAb - exuBQCDQE1ZN1hDLVKNck3KgldwaxJOO9rgw9LWlxYanK5xl8bvevri5e0gPfYFM8spj1jja2CNytGZd - oXZwNPW17otX7QwHsRI9EAj0ipWSdVKgrkYtOsy061a+twVpX6hC4wOUvnh/suKJcZ++jmweIT1MDluM - mzP8km+mo3VMMWtX1izyugKBQKAPrI6sN99QsVZ1KLdPkmh1xWohY06MU3pgRWRMm3Gx+oXdlzffr2++ - o2mtRJ8IZxfdDGfr+YAeqoh+cpmMTuOdMoFAoDesiKwpPKVAFfDlntESqiZRJ4I0Z1K92gbTLmN57X0t - 7H7+/kRe3Yqq83bcVXsU4C1QiQ+YT8vn8U6ZQCDQG5ZO1sPTv6hJU/BXi7klnJNEffLSN4+2ojTnmvSn - cDbVt6ZFs5J7XCh48m3sztiNbO9zDgl42dU0VbbC2bwvPTrwNoOvA4FAL1giWY/G14O9M8Y6QFtb+1qg - ePCIUQ6+o1bkqzUpKDIu3iIVKiSiI7lvnzSdt5Pe2X/2+j65b/fLn/bDQ992FL3BKUdELYZz4NES26vP - YyPD/dO//PpAIBCYF0sk62dvNT+vEjRgAISjiDpVSIRRBRYxhgAG5DHbW9hBNrJUbOTFcO/o3nZNuhjf - pFuQS3IyOe8jkEpzXJQJTfKLbfkCgcDiWApZX998x+O/6UrKZxebih5Ijbpezjo0DdnhqJ03qMRVxOAJ - 6H5jMsx4cL/vZxmPb7beHeNG5Bjp2EI0ejhQMIRp3hT9p+hWD2wPL2OwMRBYQ5yfnx/dxsXFhZetFksh - 68HeGYWwycwkNv3U1Kjpax+gs+lxJpwrcnu6yO0/3vd+pBdXN59ORvwJsbmG5mrFTz5M+POBb5ON9D0+ - EKwj/vjjj/eNcLvACuFdX4bb3QfcgzLcrhtAx7jk/9rg1qtCz+2NxtfQ1GQu05W+fJyz2UxTU3IqPI1M - j/NuaT4fbBSztvl8NB4wnE1Zmld7S4BvDg69sXvF5ptDD17bHbmIVs4OxTUT6AfcC4sYrDe+xmNH7Kfa - itavitsFVgjv+jLcridsNwKC1+0E96AMt2sDqkXlfk0b/JpVoc/2xlc3SWZOhDDVpSRnesMhjnkOnOVM - y+eJXOVO03Y5T83sgYSAz76NN3zSHjzMDwR2C5O75lFuWw4utO2rrJJACUHWDxDe9WW4XU/wSgs4OrrF - A55bhts1As9zbt0Nftmq0Gd7W++OLaxMCWxz2iA2LSdP3ZPcrsSsWZQTupYRXk4RwRFpqe8UC9a12/uv - h2f3HgKGA5uDo8oNSln7LftsEHPeblwPBzR4unv4+uOKwu53w21TuLy8dNMHhiDrBwjv+jLcrid4pQXg - v9ftBM8tw+3KwJfFTTvDr1wV+mnPl/m9NBbWRD1wlijYeZmBDhWJxdLRCC5PdPMjxxLF6WBAH2lUAIR8 - DeIWp3/YX3RDPotF4GngeDSeb6kht+6zaA/uwnhZaxr5y2T+85bxU+Q/VzTAHb1cnaxufaCb+o9/OAiy - foDwri/D7XqCV1pA72T9+PFjN+0G/Iv6latCD/2bd9EDJYGP+OCvR357VxYyOd2NPMsV5GYACrNtQCzN - IiV49BCKXWsBEF80mOIkNEP+Im9m4RCorZBUhXMHkelJ3S3LSQvm5GiPtcVZfZ9WNUYaZB3oEd71Zbhd - T/BKC+iXrFGb23XG+pE1NOmzt0ccP6Qo9nfISkWamubQIhgK0phDhUpIZrpelvF+1tEs0otatEqQYQSp - b5elpqlZz6vh7+9O3YMZAYc/Ho0qrbCJ3S9zxiUurm7yzeKocA0fDlxTp/pZZLfP4VMW+fVLRpB1oEd4 - 15fhdj3BKy2gX7J+8+aN23XG+pG13j+b9vqAeHQVaRKYG2Ug7SLap+tJYMoA5KU0ElSgPl6ntHQoBbUL - Uh2RNoPn7+d8iQwkLS5XJda0uU0h/GLeOunb8zyBD9XSeT1G8K5RvzrHDdiuEqsZJg2yDvQI7/oy3K4n - eKUF9EvWXWaAwAb/loZff/0VR794VViof8dXNzZHbaJ5KTBdCLvkNF0JJZteL4tTW27u429b0tQpk5XA - fkvDcVxdQhur5OnuEX4b5osvj8bXvphFA5islg7zyHe+qP7juYIhm7tH9FBVqR84XmqRej0rSHQrU3en - THUO7sWrWBqCrAM9wru+DLfrCV5pAf2StRuVcV8LYaqYv3/H4xuJU9O8ppT1GkNJYBZJvVp6gxpZYrYi - nE1Qg+NgKYWr0yS3f6FctaU0FN1zK19OKLTKJ40ibc7IQy5voQSeT+2+3jtTLJ7V6h4pqCfPFtb05GYl - ut3SipYYEgmyDvQI7/oy3O4+4B6U4XYFuFEB+B653b1i/v7d+kChamFf15VSjuA+hrBtzybTlRLUkrEu - MzWPTSrb5HMlZq25E56mHpf9h8N5RuSgpsGkWmXDOLJFjSl+JdXNT6Z3NImFd6E3KF7PptxHf1/jWull - KHSyNuiYNdsvDZv2ynlftnm3EvjFYu+9Gv7197L26Q6yDvQI7/oy3O4+4B6U4XYFuFEBD+RrMmf/Quea - OAXluU7kuupbs0FSEcUj2UoC0wzAUAocM4fGTEwsTYEyZ3vOWMGF1LRpWPPTqZOt6PRWi7ci4yffZguG - qK07gr0SoLcbdwMcJw7o3pX2uvpGkHWgR3jXl+F29wH3oAy3K8CNClhjsuYW1VCRkL2mKE0IK0fyWXOl - FcClpLVINJS1h6RZlJabK6cSs/YKlYbBx8Pzyxl1LvDh8HxzwLfSSNRT5LJFCxZT0uoU+j05wBAzQ+S0 - gcP/3j0EvSL97O1Rx6U3J6Mxb9Zq4AOBHiNQv54Y/GGCU7BN3auL+GzhvqE/vaK+EWQd6BHe9WW43X3A - PSjD7QpwowLWlayvb74bC6chNXErjz5lTUwnehIfaXUi821WHye34ZSZpDYWcZkiTxU2cb4bfDmbY+4z - fIMS9+AJaNqWqCgKAZcYo6icWtMka779gPJWV2lPakZIaHB63tUHH0fVkT85upw3q0z+aLFIXaSmRdme - frq7rN1OVkzWFxcXnz9/RqObm5veQAXIRBEMuozVzETW5+fnsK+9WWSiaGofiZlweXmJXnrz5k2pM5EP - dOnJ5gWlbpSAXio1ikwUzTHkhVZwbe2nY+Cd6DO66w/gRmW4nYB+W/BDUa8UMbX41qsuw+3UsV5FBW5U - AHrb7W7Da6wD7s6+C7Vrbey7gBpm+hBnJmuwIUhHT/f+CG/z0nDc8HjCZDCNR5u+RnqCvQ0tiqpwrWow - 2lJVXu1odOWNzQj6ZvXkmuWAL8ZBJhfCyO3sJyfY5SLzim/kMpe6r7uxpnWPui/cdZq6RwfSjVuRn2oE - Vf3GomVsy1f7Vami+R+uO/74449ff/3VK+0AOOZXFtCdrFstDf/5z3/8glnQsXIDegD94FfWofnjcCOh - Y2e2dmNG639CLab+PTy3DLfr6UNxowKW7VsXeI23Af7FfblFB3T/EOvbawBktUlUm3hnSzxMhz7ZGW5I - TUMw4mj7e1A80swH8RjrMEWpNI4U4Ap6QGCOx3MuSry8+Q6yM1WOIz2cRDmYZisS8nTDQhMTzasHArOH - b5LAZtB9B5LT0RhNWzAkS3sLg1hv8AGCHWVyno16H9KAHm59OPa6+kPrV3RxsobAmY8IoDjwtfFa7qD1 - GwUbiJeZfiHQYnchAwdmXX9sQG+UWmnuKLPBtTO1ix5olqizVljFFI94bhmwwf9Dg3K/C/g2pZEz3KKA - B0jWc38XgC7fxOn2mvHi0wlIjfs4u/aUbk1KGTxlCejopCXdgMSUEmbJNHNktn2Amr2NufDM30pTbcvU - K09d3lrTKnK36SGLcoKWSpvz3Yc37SUydhVuB5XweUJCO2WqCfiQBld1TL2hyX9eV39o/ddZnKxnosu7 - KPF16zdq1g3SMrrw9YI3BdS20krWuMpPZoTVfxcLEtMcZD1H1+ESq38KXlzAQyPruf8hM0rfhYzix3wX - Hw7PQSjQiRZr9pA0JWSeDyeteicuDDPkuMwEZ0FXWvyaOpQGC76lcDA8o6aWGxLIPppHvSwxa6o5yW02 - auFsuwWNByYhnDS1FQ1mWYb+7PURr0I93JrKb5ZeqTcU1GbPqPc09ujSnvYwRrvHnUPkHbFUssa1Xsti - qP0fbf1Gzc2nrfp6bnFURW0rzTXDfm4JXMt3i1RoePPmjdcleG4Zc38oU78KBi8r4EGRdV/fhebv4wxk - DUKhDATluS72lSy+mlyyUbqVmS5sVeSLrVUkTe3z2GwFzdmMU+WmYGtefDFODhl709VMOsxTFpmH5pJL - e1O7vEpFumq21yeO/rnKNeR7t7asi6y7vGlkpqeT7FLvYeulkvXc38y7uOtGj9+ou2gIlc4UbWzG3Vaa - P44Fm777m+cFC2BWQlwEd3/bvKCAWX1zuyWQ9eKauooGJdGVrAcfzzz4a9oQClQzKBh3Tiqbwtbl80RX - 2n57yLEYtxdJvW4uEKQ2XFzdPB0cohW5xIYoWhmzlpg1aS+1Sw8laS1O7XJbZjgqgowc2XNKoj0rsMKO - avd0NGZVuR+sZotT0w2X0nDJHJj0AzsqubHTcyRkeWTdI1MDEIBeb8JSyRr4/Pmzt1QBesOLe8JUK60f - xyLY3Nz0ZoRe7mWVZD2l4gEvKOCBkPXl5WW/34Wpz7GKTmSdVmxTbBoh8lT7E1WVMtOuJZlpaRnQOCWy - wXB89V9vYF68+HQCsrP6oVv1UkRrS02zLXNDfnrTViRn8mMBSvNEERQNzIz31X0G4XM4oyZYuWq2aR7u - DCu3tiYO6OhaHkecohKvrg8siay7EAF0YlUjtH5DpoThssm6Nm7Q5VtX7TGkm+XwVCtLJWvAmxG6tIVO - noIXJMxKiAvCm0nw3AJm9c3t+ibrLrXBJn8XkGi9pDSnqBNZp2g1qZbC0zQyp0VbpgLBVKMe/HUNK5Ut - eSu1q0xa4rg9hCj22ufF5c13kKmL2aRbcXyk7VjlmwtbM8valm7QeTgjD7nvEr2iBFbkPZlRGnePI+Mp - we5RKj7JeXRLfrekuotu2DwQ71Jzw99FiUyvrg8siaxbh/trq23VIG4nzPSNwm3CHo3i2H0qwtQkClzu - BQXA+dp5C82dXO2KZZN197bQUW5XB5sgDLOp+7Vrl4epCIDnFjD1P+a5Zbid6BLXVtH6uTTMs24dFTCz - KSDTi+tQqySAdrIGq3JjOXtaF8twxExUSFKztI6MkJDpPELioQBxH5/xjb+295+9PZpv57wpbO4einBF - uyRELatRhMFY2J1JPxK+bDJHb/QbY+nkG1lVBiRQVLixNfx4OMN6ig/7587Latp90w+DsX/uIjiZf0hk - zzgJErDZP+ttQWPrf2Htf1Izmv/PgAYiwPfEjepQdaYjWePf+u7ENbTSZWBtptGzu4GaKhr6ufrFa/04 - Mowd7CowZsfeqN6RZxXQ5XO/+8vkF7cBfQWH8+eCjwOOeVkjpv5zPLeAqVvw3DLcrg6t3VvqLuS7RQEN - /dx8be10zHaytj2g7Tldz+w+MU6ZFgYh5fnomY/U2Vw0PenLgJFrJfoaQztRjFj1m29qy1ukP8wcVDO1 - 8iWd6l6yh+JW7u3nBn4vSs+04d/46obRDwU0cPntYU+ugpEb1jRbvOU2jiz6+ux1+xepI5ZB1q3jYG5X - QINLKHKjbmRdEiBA86+CoXp567duikem0DzEBGfMrCNZ17bVpUOqHehZZWSvusOvbENtzV1G4aZu3HML - mPrX9dwy3K4OrX1b+po0f6AN/58GGLjpHdT+D7R8tSCBQSsUgK5eJQOlqT3KYcpaj/ZUo1KRkKgsSrqS - 176kbBzMuxv1XZyej02WmkbmOhRrUaKY2t9VvwccKGnNngqXNiyStxTdupekdt1huy9LjMZdN8azeuRP - 0vvyKj2C0AG2siNn0ggkjB9xjxS6iu49mvc1Y1NoZYc5yNqvLKDKF7XAI7ab3kFVvXbhptpBwowuNbhp - o1eG5oUngNvVIXdyF7Ju6MCG77ahem2XtlBhVcK3wi9rxNTzShWtEaq1I+vmO2roCkPDZ1T7b9BC1hSw - UoWaZwYB+FUC0JSgtKE0LLiGZkk+S7G6bETahOqz130OnUGhJzf0Phq1yMU4Nk7IUyRMw6a05L8W7Nwq - Yj0qUmb1jibjgd3nF+JBhD0jf+xa+eb1qPdyZhpaTC167y2wefcUWr+xs5J1q2Kt/SerAi26aR3caEaq - LcHtysgjOa0dZWYNaGDS3CetrQBmWYvWPql2fpe2qoD/qL9ZbrtpIxpqaPUfBm4qeG4BD4GsvbiA1i9X - w2eEj8ONKmj5L3z6RhPjyFmuQyEDIQCpB6UNKSFlwLQHZKUQoSuzvN0ePh30E6fOkMBXKxZiVrsm+ene - VBFEd357iw0z0iufwAfPN/J0uqx8rUKcyrL7xnjj8Q37RJ5QU7Pf2K5y6JK5YYRunZOfA6TB6QAMeumu - 1m/srGTdTLWLw5uZ/Ytdi9bbz5XMSm0zAZV3bCVbluB2BVQvx6OA584I0ASeM2o51y3KqKWYjNZ/nh+M - rBeEt1FBC1nzdd3akEhi0AQgCSWpQgntJGzFQdKGOib1yuMcW+g1ANWxWtehmrTn+p1u0E8rcjfyXtum - rC2qbveS0q52eUdI58cI3ZHuYpZX3LJCtuUzGqHlfYLgQN2lLmXHqlpWnh4+vPfk1cc+gvut7PDQyDp/ - XVu/P6XpTVW03v5DI+sptroLtysgN2RYcJXN3f8NLyij2f/Wx7Kpyz23gHsn6y5R+EXgzVTQdA/P3h6Z - LKXYlADEkQHZlGAmZKyFZcE1/joYm4DhgWwIyed9vxyWezZN3GCLEvuKlVO97mvih/S1TpGGmWnkieh2 - PznFkLJXDktT86gc3pfuAve4332u4eDzmanp3FFwgCqeMWuuRGe/JblNt+kM0+w9PQqgS2da6V5CKzus - L1mbWTNavc3NPRCybv043K6AKbIGOXaZFdOAKX88t4zmKArgdgWsF1m3XrUgvJkKmu7BGET0kbnsgPvq - iWjsaZ1HGIja9CAvJtIkOePKrbf9byZH8tWLDsitO3xXAGML4LjMy4kKceTPiZw3h+mhyFcEqqu296fC - IHSeIRSf1Wd1etsdsPnm0GmaLaYfEvMts3/iZRzNDeNxdql+M35/10O//eRk3Xr7ublWy0WQ16StmKyB - 7tP+Sqi65FlluF0ZbldA/jgMnlvAVF95bhluV4fWLqr9XBbs2FZ4MxUU74EjeDkywCMpz3M8AKJHeMvU - UVPW7NSjEHicX3zxy13kzf/Y1sQN+okW2TrjCR6oUdoyLfIwKfK7Q/p2UMKrHUzWPT57O8OIH2pIfcWq - UK1WM1qsI018NOdTi3LbdulTqERXDb8uGgn5gcl66otdiwdC1kDHVlo/Drcr4C5ZGyB4F7lBr2UxQjS4 - XQFTn6nnFnDvZA148XLgbVRQvAc8hoOn0tM6CUXP7zYo50qQmS48TTba1noeBoGG7b55/0z4qDAIWS/J - Uj0BmJI1icqiZOBpU7s+cmiWuruK2zwyFqFKVCFLQaPdp+4Bp3zLF69yfe0esl35htNJ4MhalPSe2NBP - FG0PR4u9S3dxdpjCwyHrEjFV0X2l5SJc1gUdW2n9ONyugOY+AWWjftjMGhvJXvl5GWbWALcrIMi6Cm+j - guI9SPRBWkoGmtYDzSWJmoqkDfnGE89JqpDH3/oOVWd8+jpiu+4Pj0zbO1+Qg7Tp1uyw1Ks5ycRAmdr0 - jmoXTJorMUsfMk1XPZ9tCTjfGqMKc29wgDG16EU88lHADNyY9t6xG5LbCw7MLs4Od+FXFtDMF93R+v0B - miOkXcZ/3HQ5HXUXi7fidgXM1PldetiQOdTPyzCzBrhdAT8YWff1XciovwdoQ8q9yZw2EkpVh4JQGCbW - qY5kHxb5m3BJfNezv+u2I/ZORkkOmwMm8C1KTr2sOPWtUUTFuOU25xpKveZrkxKX5mWpKuQd4R5hM+uq - S7T46OUhPbnVOahWPlAyT+LUaE4PK+zkW/2sND4Ir3QuLIODGiYUG9xuMXShkuZFB61+VtfgoB88t4DW - BQ5d8KDI2oAWW4V2rtbPyzCzBrhdAWtH1s0faPUfrBfU38PHI0hXU4WmECUDlSadSRUqk4SiTJeQ+XT0 - z5zvUeyC97XKmg4kx9wNM0geyhK0mMLTLmyzffWOkijmhZ9OZiNrVgvNrpe/oK2NiV5WiybnzVU7Vtqq - ugGzBVfnL4OsW/+z/zPX2w6n0IWsgdIEvi6XT1Gb55bhdgtg8Y/D7QqYuqOOaO2rXK2fl2FmDXC7AuCJ - 2wmeW8BDIOvWC6fuaEHU38Pg85lkpoVxNYNCMhA5EoAqAqdIRCORAsemIg9+X8LrBKdgjYLmKPDZtKlR - pnGEkyiqzvFI9owF86qJsq5MFNF0F5e3vC/d7M7wtxk369jcPUwbRbk/8tMrnGoa6fQc4HNp6DDdYPp4 - ycraVhvPBFTbqsWaF4JXYdMV7tq3fg0ypjRv9/kPU4229hWk+t29jUo4Pz+/S52tTVj3NsDtCqi2aP3Q - ukoeQKN+fQG5Wj8vw8wa4HYFTFGb5xYw1VeeW4bb1aH1H6b0uaCT3aKM1s80o/Ujq78HvtIwTZDgUVoP - 3IHjhs9ncMW6QaGaYtaiOWQu+EqBLoDknGyTVAkxm89+WnUexkjQkqfp7uwqWlYUbqqWaSZm3WM6xazz - w4e5kRS91a9j2vBabekXRfZ+Cm+XraznAKrtwoZT+1nfBUpzPXd5rUsTVcAemGkZiLdUgRc0ovW7V/Xc - sxJWSdaoynPb9F2rV/lyPy/DzBrgdgVM+em5BUz1leeW4XZ1qH5ktWj4XLp8xVq/C3hAzPU0tFVzDxdX - N1KUlH6c+IEjZaC0oU9akPTTUg7Tob4GBBJ1e7/7S2YXxNa7Y/lGBxgRtpi1CWRlckKFFdFDE7MS2pK0 - tIfzUtm4C5Ay78UydV/IgdTd/XI262JCOIa2KJnRV3SALaY+5MoX1qz6kwPW7j4z1bFq2s0WmVHT5T9p - VqDaLoLCsLm5CR8A/AsClgamtDlyzOGM1u/Pgshzn6uASPfiNthd2HMJFLqd3n3g8HoTYOMFBaA2Ny3A - 7QpA/W5Xp5fxZCA3iex264QZIHvl52WYWQPcroB1JOvuy/pz/6M2wNKAFyc0tFVzD1Bz4JfMViAU0o09 - niuqoIQ9rU+KZDZ8unvotSwfepMWOY4EzaOCNvCQK1lEfz7aKQ99eYvzo4dNeMw/PzkokYu6vtNrCoMv - fyb2t87J7A8/rd/SKKJayYuM5KGCTkbuMN7ZX2Td+d1/hcVhNUMptAZDugN+WrUZyybrUkCjdVhyJnil - Ca0fR8MX1eB2BVS7EVV57sLwGhcjRIPbFbCOZA302NVAQ1s19+AbWDO8YENweYYZH+fBONrsQgYpXEAG - 1PP7yWJvv50VL96f3N5Fz9NT4QUeYVAJ7MggzT7UHVWiFrxqplflToFhkKmIinrSlsbkRnlUu96T7qEP - 5JoB/FxkqHZ5ZA30yKezkvWClNq8r0iPfO01JqwjWVcJ1LPKcLsy3K6ANSVroMfvwmxkDa6xiW7gDsYT - oBAl/Ux+KsiQ9aBCB64QDyCr+91arxX4bTA/JzJf+toczgN34EEUQUHLYRZp/hx0K/kxryl/wlFBCttn - r48WmXfI4VnvIraogAb7ja37cnO6wUyNPZroRo46055mPHiC4yJh66WSNYB/rF709axkjUf4uSn1bltT - gOju66HBa0xYJVmjizx3AUz1leeW4XZluF0B60vWQF98PRtZpy2hqezAHVJ5WSdORhGZmLwOhgpxETU6 - H6A64aepUelWqmayZMV5eKhMLjmxUr8L2wNP1+YEKll8LY+UtVqRRs4O8Jh6L3Uvj/J28n4ZyzQD5LxY - 4BW6rewwB7zqhIsO72RpxV0Cbf7Xt3/oOfi6+7TCmcYqS/C6ElZJ1ot/9OheryvBC8pwuzLcroC1Jmug - l+/CbGQNiuGYG1WnRYEVdU1HG45jkY7UiRKnOA77e3lgd5yOxnwUgDPQoR4jtqi6VP8d3apMWVK38mdG - apeX2xPD5cIPB9wEPIl0VZtaTG6Y3keRwtOTBxc+tcgGHO3pl/uL/HisgKwBm3K0iBqdj6zR7kw3ODVX - rxVoZcGQiFeU0OptKym4XQHVblzwo0f/3w3re1kZbleG2xWw7mRt6D5MXYuGtmruwWVdVoIeRTUdKhFN - qYjMLAM92uvX3wcoZt0NV8qupnkLOFLkbiDz9qMA05ZDy95efsiOsm6x+Lgqty5iQyniX/GQRepYs9Gp - xbgX285pwW9sLbzqOuCfflZ2g4e1EeQuZG2AnGlttMpiswL1z6qyYV/7lWv9OFpJwe0KqN4mqprv4QA9 - j1v2Wm7DLcpwuzLcroAfg6wNuMQv7oyp27+LOrKWoMtKENyB0ykBqAQZh6FVmO0sFFrtBXDg6e4RKA/u - mWSmOPXINT3UFBGFjLcPdr+cwZ4bT+sWHm/19iZfe1NM6jf+bDzSmxjRrpzRtEJX/WRkpb2rtUOWYtyK - XNPg5UKzQc7Pz/FP0y+86jLwVYcZ/vPAHbVAEQxK8zEMVkkJd69FZp5CVwXy3WJhlJow5OVFbl2H1o+j - uU8Atyugdj2FFcE9d7QAM/NrCjCbBrhdGW5XwNSPhOcWMNVXnluG29Wh+Z8NaP1cSrCavYvrYPVP3XgJ - dWRNZZrGwfwRvnrUg7zRtPhIlL3QdOAecfJtfPrn5c6XP8l0t6fuWZTj6eDW5MKT0Xj389lMm+o1gzsC - coSQfaUwCGia/cnJhXBD2/gh04dn0Xv6IbGedEIXZWuqOPu835fsBAKBNUUdWfOR/MAH61IMIT3I53Ew - i40wrcf5+4yBlACae/H+BJwIDwd7lNKz7vIxBz591Zt81VfoN/Uh07m7LKGOVeiD0Rgz5lU5NkJLhWgW - 39U6EAj8ACiFQZK+A49MpJ90H9SfRB+e1pM25EO9X/zT4/nbI/SMPXZQy1tYIy8v2rG3keUwCOW2iW6W - Vvqc3csPYobXiQUCgR8Y9cqalAFZlwVgRUqTVij98ngjj8/e9xYZXGuMr26809BXNgNSPaaOSiJa/QYD - DtLquQQPKxLgPixpmUlfx69gIBAg6mPWivCSL1zfiWJMBlrMOmfa8cN+++ZePwPeHZ7jNwxdZ3PybBmO - 9LU/nWh4lkxtAXQN1Vr0n7uX6KoU6dYw4yqX7wcCgYeMGrJ+/v5ET+Km7HDM8VYpa49ZuwH14GC44lXm - DxYgZQtSS0erc1xTc+G49DIzs3A2+2RMdraErmL63ufYBAKBB4IasgYpQ9xRCZp8hspLqtDSDMLmQDbX - zgxP59rw6AfDs7dHPlkQDx+KUCs8zWcRMG9+Okl77PGYnk4mjyzW+Tjac8z5Yu9gDAQCPwxqyNo3csqB - VNfUpq8Vqtb8ig0qRJ8ocrH8DawfOAZ7Z9TI+Zkj9VjqKJfS1nu08UyJaBlXlpubwXAFc1cCgcC6oIas - 8ejNjZWlo03lJelHWsHR9CBtNIsZfH25tNctrgXGVze2Op89o3CzRZ8tMO0TZuzo22rziYQaXGZ4RvG0 - Paygt/UEE8GlQCCQUU/WYArnFLKPRTx8HMzohuTiFEMN+DOHQXDv6CKfhGfkaz9vSLBz9Hs2+cGz4VmG - PlLm5EUENl2SQ4vbw8HnFb3DIRAIrAVqyBoArYBrLOhx+2md8hCEwlMZ4BQGP20YhNv+Week2IVHPDQz - j7tmD7yjmFan5VgHLXOXMs2trn95zr1EUBQLFwOBQBX1ZA315ys1TBuCUyQGmUNtyISNnmnL5uHxnz8j - swxP/0I/8IGDR3KuRDHnO3pfeRFVtoWVnmh4FqcKgyjKpLSu9Z0OUUkwdSAQmEI9WQ/2vpk2TCLapZ+r - bBeJyHSDs58vugo+NclsStm7qKKRLfFLetuOGTPtmtqucjNLb6SqvI1AIBBIqCfrj4fnEH3SgyQXm6uX - lnjYgJjWy8BAYnC+dxWuKS5vvu+djDwwnTQ1uwiiWFtHUT6jiJ2jRxCLWfsO156Q6D54tKUi0+P+6siY - BxkIBGpQT9aUja4HpfWUNtlIIVmdkSYxOFjVG83vHaN/rtQbJGgQKxNVjZy7yyW2vY/GepIG1ntu4/Yu - vUnuqspbCgQCgQrqyfry+rvNYdBEhawNSUxQf0kkSjyKmLbeHfuVPzRs4kd+5phMkoGarj6CqLsonHVq - MescpNZVzORpeliRAZX16l+NFggE1gL1ZA2QbqpSUas2XEon2cigdtKJP/YKDu7QxA1LJYHVM3zm8ASP - 6JNbkWhGqyunvCoXmb2uVebk2lcHn2JD1EAgUIciWQ++nIFQLOpq2tCWbFA2Ug8q02Kvynw9/DEjIaej - 8clo/HT3ED9IDFLzxkmvFrNmrJkPH2nCjEWurcdowMy8AZYd01V6WNG1NvFGRREDCQQC9SiStealHXD7 - PX+uT6+n8jCINpNDkajHuOnD4Q+19x44evfL2WPd9SMFMRjBAKsaEU8CGtTLWiLkG+whbZnZAOSeN9ur - 7LqnCic1DDd3IwYSCATqUSTrk29jjiL60zof5PkIn57W8YyfV3koU8dXw/EPsTpm9M/Vb2+P7Mb1ulvy - tQWCtEs1e4O3PCnKHWVp7dPEGFE1NsKj996kx5D+uqGh2r2ji1hfHggESiiSNTDYO3PpZ4//SQZSKnoA - RCtlJkX7T3cPH8jLGOcD1PTWu2O7TdwdVwDZ6J+paYta2HCrv4E3BUB0RD41MrqIkQ1m0lIRj0fJzDL9 - iYSZw83BYbwOJhAINKOJrLmWejKKmIfIDiQSK+NsXBjiQtIyQXlexZoAPzC+16Br3jRwimNeCpSEM9PP - 9ZzhRTyqB5jWVXnsMXeUOsfMJpk0cA8CgUCgEU1kDeSBNRw3bPRsi6pT+lFqGqQjAxyfaLc5ZML445pM - DmFg+vPZ7x+O5b/kM54SeJuSw2kSXl4RDno1QU1pnDLZD3y2SPqagekU61eR0uo0pE2qp8cU9yMQCAQa - 0ULWeycXFIyUgR6z3gAZSSSClfKKj2TAFR+/PCeFQWz+9rCnDHtg2mLQWTL7UwJvAUekbVulioH1htKW - qdOJiB6YfHbLPLtRxuxDyXNmvnj/R+wDHggEOqKFrEd/X4NWXCFKV3JeRJpqlsSmQro6KlOWFpZ9NXx3 - eG5R7NH4Qbz0ZP/0r8HeGadk4BbsOcDffZOm0zGTb0REzgZuxOUz7Z9oGoxLby6K8Upy9NmeMJgjSz5n - +FXIJF9DsCOBVv49iIkfgUBgBrSQNXBiS8/54E8RCj5KJEX9aMNl6fFfYRARGQ1o5undL2eXN/fwggL8 - ThyPxiffNAlPnjwi1er3hlEL0Sj/6LbNHwdlu4Hy7YfKFyiSwc2YjMwlneJxZlbiHjAjXyvTfrrsJ4GV - a90jivAr6C4GAoFAB7STNQApqid9PM5zX2Y98pOI9VzP9EZesKdH/jQQNxl/Yz4IfVVjj2jl08no2esj - D0qYt+621mG6nypCftqHGke7TcuxV21ZkVciA5tvJ0vPlMGtgdZcodLMVPrgt7cnsUwxEAjMik5kDRkI - YuLgmClKyUyq6RQGoVwlr5mKlGI1yekT3ZhDImOogWT3+4fj13tnx+fjBef5XVzd2ApDyOe9o9Hgyxnf - WqvJhWhOERv6adEbOSwPwbPmjEU/cKT/9hCgnfOQtjt6qQiJKmERFTftwb8UyJLMqrCyUIhpe8LwTVQq - BnTs+ud+BVogEJgPncgaeP7+BDxluhKsJC15W5xqXBF8JEWpIheeZuBXMfN5ZR6bDJAJsfnxZAQ5vHd7 - GolpZJtaB2qmXtZyFYp936tk0qLSFPtaveKq345sXYo4uWEOqEhuTyzdHjkcD0w3a5k4qlregprTdtV6 - qki3qWrTvVNNpyFKtv7AB10DgcCDRVeyBna/nIFxPIwLmcljivCaxkwRXkV1paaRdtFqynoS1eXR00mi - wkDak2lqXkZ401U8PqHmlVDlwm5bV2K6VcpXmayBg3hqVBqZNcAAyhralv6oEmp/VW6xeHfYiswN3Rfv - iJ6Y0Pa0teK7fPAu1LQMGI+mQtejhvyhSOfPACoEU1/fR+A+EAj8AJiBrCFsTTaClUwq8pQSMk9380ww - lGtJhoypSWG2kRI5tmtpcqInzIDqlVWZmZ1Kllq1UM04qihXlc1YQ3ZD1SItZ5B2e9lYW24PQmfCJHDK - ZIspQH/L4Zz2O6JvuXIcWY9lImEGOH48ijh1IBCYHzOQNQC+hmx0MQvxmBSolCxYicpa3EcGpLo00Q35 - ubVv0yEstutXpYUnOZ5LA0l1PzJkLPk8keo8ssI0TdDErJtZDSgyYSsDl9IMtfNCSWDX4FLKmuORJLAX - Ma1rPWbNBP2Rn7CHM6iHCcW1aZkcZhMm7WnPVjZ3j2LTj0AgsCBmI2tg72gEbsqCUTrUlC+ZCwlmZkWp - /Z5UZOFsE6fMlBmOkrpeoaqaRKJNvWZLr5wGvpIlFTFcboFjSGPK24qktQqlkVF/Di6ryPzEVRUHdBfp - WlXFy+UP7wJHM7OJIrqclqkVV/FWpPq/xr4fgUBgccxM1pc33zd3DyktpT0lpRXSlV6W+K2qY4loSlSp - Tg/7TiK8OELJuoxlzMGjvTAGUVIv5/pNw6JatsXaVKEsrUVoZPAmSdmjyVzSktzAtdLdEua8ipZsUTFr - 2SBtmV4/nc/xdPPQamC1rEfBbptSMjFIUp2nHw7Pg6kDgUAvmJmsgXeH56Ak8Z0G5aqsx6AE+U6cpbQx - LLevUyJRLY5pWE8BDdG6uNWrErEa69lsOZ06Ixv56qoUQnnyXIGXCfvLN/wweBhEjSqhy9nKRvLQ7WWQ - pvGpWv5Zgm2lpnXLWvmi5pIDuhekH23v737+WV5KGQgEVoN5yBrQ47898ut53wMIPgcOFCYDCx1YVEGh - Bpvex/iAG1jaYx04pldhwVh7jHglt4f+dCRx86oUZkmtsChPxeMx2U/HOixgYhEMJbwVXctMGr86UP3p - NDugG5HDlXHRFGNBu7HpRyAQ6BdzkjVgM/ksrOFDc4wMSGwyCgEdyrTkJ+Wt6VwLHVCB8io3MD3OiAqj - KzRDJnJw1Pw8qngzYLXWlitll8MmjcmeFLmqUAoXFbJdVGv63SrBVXSGftI+T8KTJYqYNge4aXWu34Mb - zGGFPndQbqeqdvYHe99Oz2M4MRAI9Iz5yfri6ubF+xNQJMWmq8uJtEyZPpttIlHtdFC5CkdWki1xNDON - RirTWpFBGuszZe1SfdIKDfyqyfihS+80VKg16FaUzDQySRu1JXtVBQNlWtPpvpSjq5TwzBefTrxrAoFA - oG/MT9aGwZczKWVyIo6mcE3DpmCx51iwGKdgN2lkjSWCc7m8hWyYVTkyWYPJWwlh07Aucu2ICk2Yy5Jk - isq5vpzTBNUWtTyvTUrcJbA1bZFrFSGdp/fRN3mVpxVyJY7cVqa1korsqu39Z29PTtftfQuBQGC9sChZ - AxOhaoGIJEuVznKV7Jl0qCSqzbejerVoMuytEmamSHSuUNeqQi4lt3po72p3w0VudsNOdW2qNrWiTMhn - i4mz2uwAj0i7EpeytkryVTzKTA4w8aO+1j0QCDwo9EDWF+ObzTeHYDcIZJO9aQdnHLnmm9LbJm8kIcwj - KBVmCgTb7DfOHsk1JNWsqReaHscjr3XpzQpZhASvpV6WwKdA9hCzJorY5A1OGuHlptwt0p2r8ukoOCX/ - yjfJcLlhCarpHB/XtVvvTrfeHXsXBAKBwJLRA1kb9o4unu4eObdWogrGm092GJ0QS1KfOuvBTGTqUQ5y - ZTLwgINTp1VFM69QcRXjVoY+Ek3fKiK50z6xrZFsbpQGPrDp0/VkT+fhjKVRjwiddYrH2eLWh9O9WDse - CARWi97IGri4ugFvpi3oNDqXQxPgR8UTUiaPGxr6g4FP3YOlDxgOn6ASXQWe9QQyZeZpRiFspp2dJgNt - g4erfkkRDxVVhwp5lcdSaJAHJFmnV5h3wca1SjzTbnnaAvAfu9lAIBBYJfoka2D09zVfmpXGA3F8pDAI - 1SuF7e1QBuMeKrKohYtu0iWULKgTaalpKXHZo4iiGDlUykwohKJpglS+ajHPt2NDk8mCFktJRTzmMEi2 - MXtzwFrcencKjo7d8gKBwP2iZ7I2jH1Wn3QruM9GIKfELDWscihsb82WS7PocKxOj8tjg9S/G5TqpqaT - pvYi1mBFsGGR0jnTLVk0GVG0VqxmS0NK2z7afkuBQCBwr1gKWRuGp3+B/kw1Q8NqpC5JZpPSJm9fphCz - dLGUtQLNSpu9CWdpcy+y2X75lEUwUwwaORZcNumdlLg3Z3IeRbhcLimHNh65frp7GFI6EAg8NCyRrIHR - 6OpVfn+jJK1pZKUpaTlL79ZMu4myZtDZr3Kh7aKYApnpqa31KgZmgyIeLc16rH4eJ9W6lE51fvo6urj6 - r3sfCAQCDwbLJeuM/eO//v3miJI2a2Qo2bQHE2doSBEz+kxlnYLUPj/P7U0pSyBr/brbqyivYVETFsg2 - wU4GV6xcCZfqrF9XIWfrw/Hpn7GkJRAIPGisiKwzTr6NJWktSJ2V9UTzKm0qm9yqTMjtFNT2pTQ0m57R - ka5l2hJpZY2KJitfkDnYO7O3PrpbgUAg8LCxarI2XN98B2sfn49Bmrufz37/cErNu7X/7O2RCWeKYhwh - kCWBKZ+rMWvlSKRb9DnN8dg5BMuzKAWvUYkFsgdfzgaf/wQ7j8bXJ7E0PBAIrBvuh6xrARq1BHj84+EI - PA56HXz50wh9sPdt58vZ671vSD97fTT4fLYL/t07Oz2/BPkOj/96vXf27vAc137YH+FnAInr6+/j2Ko0 - EAj8EHhAZB0IBAKBEoKsA4FAYA0QZB0IBAJrgCDrQCAQWAMEWQcCgcAaIMg6EAgEHjz+97//BwybjWVe - nf3EAAAAAElFTkSuQmCC - + + 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 \ No newline at end of file diff --git a/ReportImp/LebenshilfeFrankfurtOder/RechnungAbw.Designer.cs b/ReportImp/LebenshilfeFrankfurtOder/RechnungAbw.Designer.cs index 8d92ff37f..e0a771098 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/RechnungAbw.Designer.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/RechnungAbw.Designer.cs @@ -32,7 +32,7 @@ namespace LebenshilfeFrankfurtOder System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RechnungAbw)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblLeistungskategorie = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel38 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel32 = new DevExpress.XtraReports.UI.XRLabel(); @@ -76,6 +76,8 @@ namespace LebenshilfeFrankfurtOder this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.rtFooterAlt = new DevExpress.XtraReports.UI.XRRichText(); + this.rtFooterNeu = new DevExpress.XtraReports.UI.XRRichText(); this.xrLine1 = new DevExpress.XtraReports.UI.XRLine(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); @@ -108,14 +110,12 @@ namespace LebenshilfeFrankfurtOder this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.lblBezahlungText = new DevExpress.XtraReports.UI.XRLabel(); - this.rtFooterAlt = new DevExpress.XtraReports.UI.XRRichText(); - this.rtFooterNeu = new DevExpress.XtraReports.UI.XRRichText(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rtFooterAlt)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rtFooterNeu)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.rtFooterAlt)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.rtFooterNeu)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -128,7 +128,7 @@ namespace LebenshilfeFrankfurtOder // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel2, + this.lblLeistungskategorie, this.xrLabel38, this.xrLabel30, this.xrLabel32, @@ -168,17 +168,17 @@ namespace LebenshilfeFrankfurtOder this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // - // xrLabel2 + // lblLeistungskategorie // - this.xrLabel2.CanGrow = false; - this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + this.lblLeistungskategorie.CanGrow = false; + this.lblLeistungskategorie.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(41.52778F, 485.6945F); - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(670.4724F, 19.99994F); - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.Text = "Erbringung von Leistungen der Eingliederungshilfe ambulant betreutes Wohnen für"; + this.lblLeistungskategorie.LocationFloat = new DevExpress.Utils.PointFloat(41.52778F, 485.6945F); + this.lblLeistungskategorie.Name = "lblLeistungskategorie"; + this.lblLeistungskategorie.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblLeistungskategorie.SizeF = new System.Drawing.SizeF(670.4724F, 19.99994F); + this.lblLeistungskategorie.StylePriority.UseFont = false; + this.lblLeistungskategorie.Text = "Assistenz beim Wohnen für [Leistungskategorie]"; // // xrLabel38 // @@ -656,7 +656,7 @@ namespace LebenshilfeFrankfurtOder this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel3.SizeF = new System.Drawing.SizeF(297.21F, 20F); this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "ambulant betreutes Wohnen"; + this.xrLabel3.Text = "Assistenz beim Wohnen"; // // xrLabel1 // @@ -710,6 +710,24 @@ namespace LebenshilfeFrankfurtOder this.bottomMarginBand1.HeightF = 201.2083F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // rtFooterAlt + // + this.rtFooterAlt.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.rtFooterAlt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10F); + this.rtFooterAlt.Name = "rtFooterAlt"; + this.rtFooterAlt.SerializableRtfString = resources.GetString("rtFooterAlt.SerializableRtfString"); + this.rtFooterAlt.SizeF = new System.Drawing.SizeF(712.0003F, 90F); + this.rtFooterAlt.StylePriority.UseFont = false; + // + // rtFooterNeu + // + this.rtFooterNeu.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.rtFooterNeu.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100F); + this.rtFooterNeu.Name = "rtFooterNeu"; + this.rtFooterNeu.SerializableRtfString = resources.GetString("rtFooterNeu.SerializableRtfString"); + this.rtFooterNeu.SizeF = new System.Drawing.SizeF(712.0003F, 90F); + this.rtFooterNeu.StylePriority.UseFont = false; + // // xrLine1 // this.xrLine1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(112)))), ((int)(((byte)(197))))); @@ -1058,24 +1076,6 @@ namespace LebenshilfeFrankfurtOder this.lblBezahlungText.StylePriority.UseFont = false; this.lblBezahlungText.Text = "Bitte überweisen Sie den Rechnungsbetrag unter Angabe der Kunden-Nr. und der Rech" + "nungs-Nr. auf das unten angegebene Konto."; - // - // rtFooterAlt - // - this.rtFooterAlt.Font = new DevExpress.Drawing.DXFont("Arial", 8F); - this.rtFooterAlt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10F); - this.rtFooterAlt.Name = "rtFooterAlt"; - this.rtFooterAlt.SerializableRtfString = resources.GetString("rtFooterAlt.SerializableRtfString"); - this.rtFooterAlt.SizeF = new System.Drawing.SizeF(712.0003F, 90F); - this.rtFooterAlt.StylePriority.UseFont = false; - // - // rtFooterNeu - // - this.rtFooterNeu.Font = new DevExpress.Drawing.DXFont("Arial", 8F); - this.rtFooterNeu.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100F); - this.rtFooterNeu.Name = "rtFooterNeu"; - this.rtFooterNeu.SerializableRtfString = resources.GetString("rtFooterNeu.SerializableRtfString"); - this.rtFooterNeu.SizeF = new System.Drawing.SizeF(712.0003F, 90F); - this.rtFooterNeu.StylePriority.UseFont = false; // // RechnungAbw // @@ -1099,11 +1099,11 @@ namespace LebenshilfeFrankfurtOder this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rtFooterAlt)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rtFooterNeu)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.rtFooterAlt)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.rtFooterNeu)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1183,7 +1183,7 @@ namespace LebenshilfeFrankfurtOder private DevExpress.XtraReports.UI.XRLabel lblBezahlungText; private DevExpress.XtraReports.UI.XRLine xrLine1; private DevExpress.XtraReports.UI.XRLabel xrLabel38; - private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRLabel lblLeistungskategorie; private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; private DevExpress.XtraReports.UI.DetailBand Detail2; private DevExpress.XtraReports.UI.XRLabel xrLabel4; diff --git a/ReportImp/LebenshilfeFrankfurtOder/RechnungAbw.cs b/ReportImp/LebenshilfeFrankfurtOder/RechnungAbw.cs index 72f69a16e..6196317f3 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/RechnungAbw.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/RechnungAbw.cs @@ -20,7 +20,9 @@ namespace LebenshilfeFrankfurtOder public void SetReportDataSource(ServiceInvoiceRO pRO) { - + + lblLeistungskategorie.Text = "Assistenz beim Wohnen für "; //Assistenz beim Wohnen für [Leistungskategorie] + CheckLastschriftAndAnschrift(pRO); if (!String.IsNullOrEmpty(pRO.SenderContactPersonMail)) diff --git a/ReportImp/Mittelpunkt/Service/CustomEmployeeService.cs b/ReportImp/Mittelpunkt/Service/CustomEmployeeService.cs index be83c9722..ef8ea0147 100644 --- a/ReportImp/Mittelpunkt/Service/CustomEmployeeService.cs +++ b/ReportImp/Mittelpunkt/Service/CustomEmployeeService.cs @@ -54,10 +54,10 @@ namespace Mittelpunkt.Service decimal dec = 0; if (varFieldValue != null && Decimal.TryParse(varFieldValue.ToString(), out dec)) { - if (dec > 0) - { + //if (dec > 0) //CB: Wenn die dort eine 0 eintragen, wird unten ein doppeltes Varfieldvalue angelegt und dann kommt ein Fehler später beim Laden des Employees + //{ stundensatzFuerArbeitszuschlaege = dec; - } + //} } } } diff --git a/ReportImp/SHKServiceSBD/SBDCharacteristicsReport.cs b/ReportImp/SHKServiceSBD/SBDCharacteristicsReport.cs index c7848c79d..6493d8dcd 100644 --- a/ReportImp/SHKServiceSBD/SBDCharacteristicsReport.cs +++ b/ReportImp/SHKServiceSBD/SBDCharacteristicsReport.cs @@ -8,6 +8,7 @@ using BeWo.Report.ReportObjects; using BS.Shared.DataContracts; using BeWo.Report; using BeWo.Service.ServiceImplementations; +using BS.Shared.Core; namespace SHKServiceSBD { @@ -282,6 +283,7 @@ namespace SHKServiceSBD if ((!az.GueltigVon.HasValue || az.GueltigVon <= DateTime.Now) && (!az.GueltigBis.HasValue || az.GueltigBis >= DateTime.Now) && az.Eintraege != null) { + SortiereArbeitszeiten(az.Eintraege); foreach (var e in az.Eintraege) { AddArbeitszeit(e, index++); @@ -293,6 +295,18 @@ namespace SHKServiceSBD } } + private void SortiereArbeitszeiten(List zeiten) + { + zeiten.Sort( + (a, b) => + { + var at1 = DateTimeUtils.GetAssistanceTimeComparisonDateTime(a.UhrzeitVon, a.UhrzeitBis, DateTime.Now.Date.AddDays((int)a.DayOfWeek)); + var at2 = DateTimeUtils.GetAssistanceTimeComparisonDateTime(b.UhrzeitVon, b.UhrzeitBis, DateTime.Now.Date.AddDays((int)b.DayOfWeek)); + + return at1.Start.CompareTo(at2.Start); + }); + } + private void AddArbeitszeit(ArbeitszeitEintragDC ae, int index) { XRTableRow newRow = null; diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index adf991fc4..17bf56f43 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -423,7 +423,7 @@ namespace BeWo.Service.Plugins //t = "6653973776"; // Stefan Knauer (BeWo Heinsberg Soziotherapie) //t = "8743996874"; // Pflegedienst Rahn und Freitag GmbH t = "6666827209"; //Ruhrstern GmbH - + //t = "6652760522"; // BBI Rhein-Sieg gGmbH return t; #else diff --git a/Service/Plugins/StundenuebersichtAuswertung.cs b/Service/Plugins/StundenuebersichtAuswertung.cs index ce98e870f..fb2d02687 100644 --- a/Service/Plugins/StundenuebersichtAuswertung.cs +++ b/Service/Plugins/StundenuebersichtAuswertung.cs @@ -172,6 +172,8 @@ namespace BeWo.Service.Plugins groupDC.Employee = this.CreateCompactEmployeeDC(e); } + + rootDC.Groups.Add(groupDC); } @@ -190,6 +192,12 @@ namespace BeWo.Service.Plugins if (c2s != null) { scDC.SupportConcept2CostBearer = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(c2s); + scDC.CostbearerID = c2s.CostBearer.ID; + } + + if (config.FetchApprovedFLS) + { + CalculateApprovedFLSForCustomer(rootDC, groupDC, scDC, config.StartDate ?? DateTime.MinValue, config.EndDate ?? DateTime.MaxValue); } groupDC.SupportConcepts.Add(scDC); @@ -200,10 +208,16 @@ namespace BeWo.Service.Plugins } } } - return rootDC; } + private void CalculateApprovedFLSForCustomer(FLSAnalysisRootDC rootDC, FLSAnalysisGroupDC groupDC, SupportConceptFLSOverviewDC scDC, DateTime startdate, DateTime enddate) + { + var calc = PluginLoader.FindClass(scDC.CostbearerID) ?? Calculations.GetInstance(scDC.CostbearerID); + rootDC.SollFLSPerWeek = calc.GetApprovedHoursPerWeek(scDC.SupportConcept2CostBearer, startdate) ?? 0m; + rootDC.SollFLSTotal = calc.GetApprovedHoursForPeriod(scDC.SupportConcept2CostBearer, startdate, enddate); + } + public virtual bool AllowCustomerAnalysis(Customer customer, FLSAnalysisConfigDC config, IList serviceRecords) { bool allow = true; diff --git a/Service/Plugins/XRechnungService.cs b/Service/Plugins/XRechnungService.cs index 5922f21bf..1c41ea372 100644 --- a/Service/Plugins/XRechnungService.cs +++ b/Service/Plugins/XRechnungService.cs @@ -56,6 +56,10 @@ namespace BeWo.Service.Plugins var str = //ServiceConfigReader.GetInvoiceTestJsonString(); calculate(invoice_base); + str = str.Replace("19.0", "19"); + str = str.Replace("76.0", "76"); + + // Erstelle Url ohne weitere Authentifizierung var token_url = GetTokenUrl(report_url); @@ -152,59 +156,77 @@ namespace BeWo.Service.Plugins xRechnung.Invoice.Number = invoice.InvoiceNumber; xRechnung.Invoice.Date = invoice.InvoiceDate?.ToString("yyyyMMdd") ?? undefinded; xRechnung.Invoice.Currency = "EUR"; - xRechnung.Invoice.Notice = undefinded; + xRechnung.Invoice.Notice = invoice.Notice; + xRechnung.Invoice.CancellationNumber = ""; xRechnung.Invoice.Period.Start = invoice.AccountingPeriodStart?.ToString("yyyyMMdd") ?? undefinded; xRechnung.Invoice.Period.End = invoice.AccountingPeriodEnd?.ToString("yyyyMMdd") ?? undefinded; - xRechnung.Invoice.Period.Description = undefinded; - xRechnung.Invoice.Payment.Type = undefinded_num; + xRechnung.Invoice.Period.Description = String.Format("Leistungszeitraum {0:dd.MM.yyyy} bis {1:dd.MM.yyyy}", invoice.AccountingPeriodStart, invoice.AccountingPeriodEnd); xRechnung.Invoice.Payment.Type = undefinded_num3; - xRechnung.Invoice.Payment.Term = undefinded; - xRechnung.Invoice.Payment.DueDate = undefinded; + xRechnung.Invoice.Payment.Term = "Zahlbar innerhalb 14 Tagen netto"; + xRechnung.Invoice.Payment.DueDate = invoice.InvoiceDate?.AddDays(14).ToString("yyyyMMdd") ?? undefinded; - xRechnung.Seller.Name = undefinded; - xRechnung.Seller.ID = undefinded; - xRechnung.Seller.TaxID = undefinded; - xRechnung.Seller.VatID = undefinded; - xRechnung.Seller.Street = undefinded; - xRechnung.Seller.ZipCode = undefinded; - xRechnung.Seller.City = undefinded; - xRechnung.Seller.EMail = undefinded; + xRechnung.Seller.Name = "Muster GmbH"; + xRechnung.Seller.ID = null; + xRechnung.Seller.TaxID = null; + xRechnung.Seller.VatID = "DE123456789"; + xRechnung.Seller.Street = "Musterstr. 1-3"; + xRechnung.Seller.ZipCode = "30674"; + xRechnung.Seller.City = "Frankfurt"; + xRechnung.Seller.EMail = "rechnungen@musterfirma.de"; xRechnung.Seller.CountryCode = "DE"; - xRechnung.Seller.Contact.Name = undefinded; - xRechnung.Seller.Contact.Department = undefinded; - xRechnung.Seller.Contact.Phone = undefinded; - xRechnung.Seller.Contact.EMail = undefinded; - xRechnung.Seller.BankAccount.IBAN = undefinded; - xRechnung.Seller.BankAccount.BIC = undefinded; - xRechnung.Seller.BankAccount.Owner = undefinded; - xRechnung.Seller.BankAccount.Reference = undefinded; - xRechnung.Seller.BankAccount.ReferenceID = undefinded; + xRechnung.Seller.Contact.Name = "Peter Musterfrau"; + xRechnung.Seller.Contact.Department = "Buchhaltung"; + xRechnung.Seller.Contact.Phone = "+49211171717"; + xRechnung.Seller.Contact.EMail = "pm@muster.de"; + xRechnung.Seller.BankAccount.IBAN = "DE38370501980147522957"; + xRechnung.Seller.BankAccount.BIC = "SSKMDEMMXXX"; + xRechnung.Seller.BankAccount.Owner = "Muster GmbH"; + xRechnung.Seller.BankAccount.Reference = "z.B. Rechnungnummer"; + xRechnung.Seller.BankAccount.ReferenceID = "GläubigerID"; - xRechnung.Buyer.Name = undefinded; - xRechnung.Buyer.ID = undefinded; - xRechnung.Buyer.Street = undefinded; - xRechnung.Buyer.ZipCode = undefinded; - xRechnung.Buyer.City = undefinded; - xRechnung.Buyer.EMail = undefinded; - xRechnung.Buyer.CountryCode = undefinded; - xRechnung.Buyer.Reference = undefinded; - xRechnung.Buyer.BankAccount.IBAN = undefinded; - xRechnung.Buyer.BankAccount.BIC = undefinded; - xRechnung.Buyer.BankAccount.Owner = undefinded; - xRechnung.Buyer.BankAccount.MandateID = undefinded; + Address rechnungsAdresse = null; + if (invoice.RecipientOrganisationOid.HasValue) + { + var org = DAOFactory.GenericDAO.LoadByID(invoice.RecipientOrganisationOid.Value); + rechnungsAdresse = org.InvoiceAddress ?? org.Address; + } + else if (invoice.RecipientCustomerOid.HasValue) + { + var customer = DAOFactory.GenericDAO.LoadByID(invoice.RecipientCustomerOid.Value); + rechnungsAdresse = customer.Person.InvoiceAddress ?? customer.Person.Address; + } + + xRechnung.Buyer.ID = null; + + if (rechnungsAdresse != null) + { + xRechnung.Buyer.Street = rechnungsAdresse.Street; + xRechnung.Buyer.ZipCode = rechnungsAdresse.PostalCode; + xRechnung.Buyer.City = rechnungsAdresse.Town; + xRechnung.Buyer.CountryCode = "DE"; + } + + xRechnung.Buyer.EMail = "rechnungen@kunde.de"; + + xRechnung.Buyer.Reference = "PO-Nummer oder andere Referenz, die Kunde haben will"; + + xRechnung.Buyer.BankAccount.IBAN = "DE38370501980147522957"; + xRechnung.Buyer.BankAccount.BIC = "SSKMDEMMXXX"; + xRechnung.Buyer.BankAccount.Owner = "Muster GmbH"; + xRechnung.Buyer.BankAccount.MandateID = "Mandatsreferenznummer"; foreach (var item in invoice.GetInvoiceItems()) { var position = new XRPosition(); - position.Quantity = undefinded_num; - position.QuantityType = undefinded; - position.Text = undefinded; - position.Net = undefinded_num; - position.NetTotal = undefinded_num; - position.Tax = undefinded_num2; - position.TaxSum = undefinded_num2; - position.TaxType = undefinded; + position.Quantity = item.UnitCount ?? 0; + position.QuantityType = "H87"; + position.Text = item.ItemDescription; + position.Net = item.AmountPerUnit ?? 0; + position.NetTotal = item.AmountTotal ?? 0; + position.Tax = 0; + position.TaxSum = 0; + position.TaxType = "S"; xRechnung.Position.Add(position); } diff --git a/Shared/DataContracts/FLSAnalysisRootDC.cs b/Shared/DataContracts/FLSAnalysisRootDC.cs index be05759ac..1b20c0016 100644 --- a/Shared/DataContracts/FLSAnalysisRootDC.cs +++ b/Shared/DataContracts/FLSAnalysisRootDC.cs @@ -36,6 +36,9 @@ namespace BS.Shared.DataContracts [DataMember] public decimal SollFLSPerWeek { get; set; } + [DataMember] + public decimal SollFLSTotal { get; set; } + [DataMember] public decimal TotalFLM { get; set; } } diff --git a/Shared/DataContracts/SupportConceptFLSOverviewDC.cs b/Shared/DataContracts/SupportConceptFLSOverviewDC.cs index a60271293..06b944105 100644 --- a/Shared/DataContracts/SupportConceptFLSOverviewDC.cs +++ b/Shared/DataContracts/SupportConceptFLSOverviewDC.cs @@ -24,5 +24,7 @@ namespace BS.Shared.DataContracts [DataMember] public SupportConceptCostBearerRelDC SupportConcept2CostBearer { get; set; } + + public string CostbearerID { get; set; } } } \ No newline at end of file