From 45e72b40b129f1c7f7e4bb9005fe33d29c9a3b6a Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 1 Dec 2025 13:13:38 +0100 Subject: [PATCH 01/16] Bugfix Drag&Drop von Dateien in andere Ordner --- BeWo/View/BeWoFileView.xaml.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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) From 017fffa746deb42befeec47ff6332c3011d92b67 Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 1 Dec 2025 13:14:25 +0100 Subject: [PATCH 02/16] =?UTF-8?q?Bugfix,=20nach=201.=20Speichern=20von=20?= =?UTF-8?q?=C3=84nderungen=20im=20Schulbegleitung-Tab=20wurden=20weitere?= =?UTF-8?q?=20=C3=84nderungen=20nicht=20mehr=20erkannt=20und=20gespeichert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo/View/Detail/CustomerView.xaml.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs index efbd6f7f7..c53498b50 100644 --- a/BeWo/View/Detail/CustomerView.xaml.cs +++ b/BeWo/View/Detail/CustomerView.xaml.cs @@ -387,7 +387,10 @@ namespace BeWo.View.Detail stundenplanView.ViewModel = value.Arbeitszeiten; stundenplanView.RefreshView(); } - + if (tabitem_schuldienst.Content != null && tabitem_schuldienst.Content is SchulbegleitenderDienstCustomerView sdView) + { + sdView.ViewModel = value; + } _saveInProgress = false; OnPropertyChanged(nameof(ViewModel)); From c356e1047cfa83fc13d4008d9c92a803dc7c5da3 Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 1 Dec 2025 13:16:11 +0100 Subject: [PATCH 03/16] =?UTF-8?q?Modul=20ownChat=20Admin=20Settings=20wird?= =?UTF-8?q?=20nicht=20mehr=20ben=C3=B6tigt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo/View/Detail/MandatorView.xaml.cs | 2 +- BeWo/ViewModel/UserGroupVM.cs | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/BeWo/View/Detail/MandatorView.xaml.cs b/BeWo/View/Detail/MandatorView.xaml.cs index 98f8d308a..e2811ea29 100644 --- a/BeWo/View/Detail/MandatorView.xaml.cs +++ b/BeWo/View/Detail/MandatorView.xaml.cs @@ -24,7 +24,7 @@ namespace BeWo.View.Detail _Parent = parent; ViewModel = parent.MandatorVM; - if (BeWoApp.LoggedOnUser.HasRight(BS.Shared.UserRightType.ChatAdminSettings) && BeWoApp.AppSettings.ShowOwnChatSettings) + if (BeWoApp.LoggedOnUser.HasRight(BS.Shared.UserRightType.ChatAdminSettings)) { var url = ServiceFacade.DoOperationsServiceSync(s => s.GetOwnChatSettingsUrl()); HyperlinkOwnChatSettings.NavigateUri = new Uri(url); diff --git a/BeWo/ViewModel/UserGroupVM.cs b/BeWo/ViewModel/UserGroupVM.cs index f56901dc0..943cc3acd 100644 --- a/BeWo/ViewModel/UserGroupVM.cs +++ b/BeWo/ViewModel/UserGroupVM.cs @@ -90,7 +90,6 @@ namespace BeWo.ViewModel {IsSbdRight, BeWoApp.Mandator.AllowSbd}, {IsResourceRight, BeWoApp.AppSettings.ShowRessources}, {IsChatRight, BeWoApp.AppSettings.ShowOwnChat}, - {IsChatSettingsRight, BeWoApp.AppSettings.ShowOwnChatSettings}, {IsHiddenRight, false}, {IsMedicationRight, BeWoApp.AppSettings.IsMedicationAllowed}, {IsPivotGridRight, BeWoApp.AppSettings.ShowPivotGrid}, @@ -191,13 +190,8 @@ namespace BeWo.ViewModel } private static bool IsChatRight(UserRightType userRightType) { - if (userRightType == UserRightType.ChatSettings) - return true; - return false; - } - private static bool IsChatSettingsRight(UserRightType userRightType) - { - if (userRightType == UserRightType.ChatAdminSettings) + if (userRightType == UserRightType.ChatSettings + || userRightType == UserRightType.ChatAdminSettings) return true; return false; } From 9fa8fc966ced07b564c9f8d0130ef4e96a0b285e Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 1 Dec 2025 13:19:53 +0100 Subject: [PATCH 04/16] =?UTF-8?q?Button=20"Passwort=20=C3=A4ndern"=20wird?= =?UTF-8?q?=20jetzt=20ausgeblendet,=20wenn=20das=20Recht=20zum=20=C3=84nde?= =?UTF-8?q?rung=20nicht=20gegeben=20wurde?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWoPlanerMobil/BeWoPlanerMobil.csproj.user | 17 +++++++++----- BeWoPlanerMobil/Models/AbstractModel.cs | 2 ++ BeWoPlanerMobil/Views/Shared/_Layout.cshtml | 26 +++++++++++---------- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user index 91a3728dd..8d834ae6c 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user @@ -1,4 +1,4 @@ - + false @@ -28,16 +28,21 @@ - http://localhost/BeWoPlanerMobil/ + + CurrentPage True False False False - C:\Program Files\Google\Chrome\Application\chrome.exe - http://localhost/BeWoPlanerMobil/Login/demo - --auto-open-devtools-for-tabs - C:\Program Files (x86)\IIS Express + + + + + + + + True False diff --git a/BeWoPlanerMobil/Models/AbstractModel.cs b/BeWoPlanerMobil/Models/AbstractModel.cs index af362507d..8db3ffb99 100644 --- a/BeWoPlanerMobil/Models/AbstractModel.cs +++ b/BeWoPlanerMobil/Models/AbstractModel.cs @@ -158,6 +158,8 @@ namespace BeWoPlanerMobil.Models public bool HasRightToRateGoals => CheckRight(UserRightType.BewertenInZeiterfassung); + public bool HasRightToChangePassword => CheckRight(UserRightType.UserView_AllowChangePassword) || CheckRight(UserRightType.AllowChangeOwnPassword); + public bool HasRightToEditCustomers => CheckRight(UserRightType.CustomerView_Edit); public bool HasRightMitarbeiterstundenkontoViewAll => CheckRight(UserRightType.Mitarbeiterstundenkonto_ViewAll); diff --git a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml index e593b2b70..ea1e0a0d0 100644 --- a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml +++ b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml @@ -380,12 +380,12 @@ } - +
  • - +
    • 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" })) { From 521a4128ef41ea280173f676d79197f97cad2f6a Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 1 Dec 2025 18:23:48 +0100 Subject: [PATCH 05/16] Neuer Soll/Ist Report --- .../FLSSollIstReport.Designer.cs | 685 ++++++++++++++++ Report/DefaultReports/FLSSollIstReport.cs | 33 + Report/DefaultReports/FLSSollIstReport.resx | 120 +++ .../FLSSollIstWeeklyReport.Designer.cs | 734 ++++++++++++++++++ .../DefaultReports/FLSSollIstWeeklyReport.cs | 224 ++++++ .../FLSSollIstWeeklyReport.resx | 120 +++ Report/Report.csproj | 21 + Report/ReportObjects/FLSSollIstReportRO.cs | 195 +++++ .../Plugins/StundenuebersichtAuswertung.cs | 16 +- Shared/DataContracts/FLSAnalysisRootDC.cs | 3 + .../SupportConceptFLSOverviewDC.cs | 2 + 11 files changed, 2152 insertions(+), 1 deletion(-) create mode 100644 Report/DefaultReports/FLSSollIstReport.Designer.cs create mode 100644 Report/DefaultReports/FLSSollIstReport.cs create mode 100644 Report/DefaultReports/FLSSollIstReport.resx create mode 100644 Report/DefaultReports/FLSSollIstWeeklyReport.Designer.cs create mode 100644 Report/DefaultReports/FLSSollIstWeeklyReport.cs create mode 100644 Report/DefaultReports/FLSSollIstWeeklyReport.resx create mode 100644 Report/ReportObjects/FLSSollIstReportRO.cs 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/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/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/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/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 From 474b7c81967dab342a7d5e05a44a6ce22bca6260 Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 1 Dec 2025 18:33:11 +0100 Subject: [PATCH 06/16] Darstellung der bewilligten FLS/Woche im Leistungsnachweis angepasst --- ReportImp/AkggMid/LeistungsnachweisHelper.cs | 5 +++++ ReportImp/AkggMid/LeistungsnachweisSozialamt.cs | 5 +++-- .../AkggMid/LeistungsnachweisSozialamtMitBlutzucker.cs | 6 ++++-- .../AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.cs | 6 ++++-- 4 files changed, 16 insertions(+), 6 deletions(-) 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; } From fe940b56c9df1a8fb5751d23fe9243e0316a858a Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 1 Dec 2025 18:33:45 +0100 Subject: [PATCH 07/16] Sortierung der Betreuungszeiten angepasst --- Report/DefaultReports/SBDCharacteristicsReport.cs | 15 ++++++++++++++- .../SHKServiceSBD/SBDCharacteristicsReport.cs | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) 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/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; From dcb6a526ccf8f783ff0123dd034460e079d14a56 Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 1 Dec 2025 18:35:01 +0100 Subject: [PATCH 08/16] Bugfix Mittelpunkt, wenn manuell eine 0 im VarField Stundenlohn eingetragen wird --- ReportImp/Mittelpunkt/Service/CustomEmployeeService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; - } + //} } } } From 64d6d9a02fc8b67da55274c6244eb1cb1defa429 Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 1 Dec 2025 18:43:56 +0100 Subject: [PATCH 09/16] Neue Version erstellt --- BeWo/BeWo.csproj | 160 +++++++++++++++++++++++------------------------ 1 file changed, 80 insertions(+), 80 deletions(-) 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 From 0e115c509a8f04252f2b72347d648ec97128515f Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 1 Dec 2025 18:44:48 +0100 Subject: [PATCH 10/16] XRechnung erweitert --- .../Detail/Accounting/InvoiceOverview.xaml | 2 +- Data/Models/XRechnung/XRInvoice.cs | 1 + Data/Models/XRechnung/XRPosition.cs | 6 +- Service/Plugins/XRechnungService.cs | 106 +++++++++++------- 4 files changed, 69 insertions(+), 46 deletions(-) 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" />