From 768887127bd79d94a503cfb589cfb9264d9ade7d Mon Sep 17 00:00:00 2001 From: Lyndon Jetten Date: Tue, 29 Jun 2021 15:13:20 +0200 Subject: [PATCH] =?UTF-8?q?KommAmbulanteDienste=20->=20FlsAuswertung=20hin?= =?UTF-8?q?zugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo/View/Detail/Report/QueryView.xaml.cs | 2 +- BeWo/ViewModel/SupportConceptVM.cs | 3 +- Data/Access/SearchDAO.cs | 27 ++ .../KommAmbulanteDienste/FlsAuswertung.cs | 110 +++++ .../FlsAuswertung.designer.cs | 457 ++++++++++++++++++ .../KommAmbulanteDienste/FlsAuswertung.resx | 123 +++++ .../KommAmbulanteDienste.csproj | 10 + Service/Plugins/PluginLoader.cs | 4 +- 8 files changed, 732 insertions(+), 4 deletions(-) create mode 100644 ReportImp/KommAmbulanteDienste/FlsAuswertung.cs create mode 100644 ReportImp/KommAmbulanteDienste/FlsAuswertung.designer.cs create mode 100644 ReportImp/KommAmbulanteDienste/FlsAuswertung.resx diff --git a/BeWo/View/Detail/Report/QueryView.xaml.cs b/BeWo/View/Detail/Report/QueryView.xaml.cs index a2769a239..c98ff8b99 100644 --- a/BeWo/View/Detail/Report/QueryView.xaml.cs +++ b/BeWo/View/Detail/Report/QueryView.xaml.cs @@ -1,4 +1,4 @@ -using System; + using System; using System.Collections.Generic; using System.Data; using System.Diagnostics; diff --git a/BeWo/ViewModel/SupportConceptVM.cs b/BeWo/ViewModel/SupportConceptVM.cs index 7b8a34ebb..407b94de8 100644 --- a/BeWo/ViewModel/SupportConceptVM.cs +++ b/BeWo/ViewModel/SupportConceptVM.cs @@ -296,6 +296,7 @@ namespace BeWo.ViewModel { foreach (var sd in cat.Children) { + // Es existierten bereits ServiceAccounting-Einträge in der Datenbank if (this._SelectedGlobalServices != null && _SelectedGlobalServices.Count > 0) { foreach (var existingSd in this._SelectedGlobalServices) @@ -307,7 +308,7 @@ namespace BeWo.ViewModel } } } - else + else // Es existieren noch keine ServiceAccounting-Einträge in der Datenbank { sd.IsChecked = true; if (!cat.IsChecked) diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs index d9433f32b..d9e216785 100644 --- a/Data/Access/SearchDAO.cs +++ b/Data/Access/SearchDAO.cs @@ -4514,5 +4514,32 @@ namespace BeWo.Data.Access return criteria.List(); } + + public List GetActiveServiceRecordsBySupportConceptWithServiceCategoryForCustomer(List customerOids, long serviceCategoryOid, int month, int year) + { + var c = CreateCriteriaIsActive() + .Add(Restrictions.In(nameof(SupportConcept.Customer) + ".Oid", customerOids.ToArray())) + .CreateAlias(SupportConcept.PropertyName_ServiceAccountings, "sa", JoinType.InnerJoin) + .CreateAlias("sa." + nameof(ServiceAccounting.ServiceDescription), "sd", JoinType.InnerJoin) + .CreateAlias("sd." + ServiceDescription.PropertyName_ServiceCategory, "cat", JoinType.InnerJoin) + .Add(Restrictions.Eq("cat.Oid", serviceCategoryOid)); + + var c2 = CreateCriteriaIsActive() + .Add(Restrictions.In(nameof(SupportConcept.Customer) + ".Oid", customerOids.ToArray())) + .Add(Restrictions.IsEmpty(nameof(SupportConcept.ServiceAccountings))); + + var supportConcepts = c.List().ToList(); + supportConcepts.AddRangeIfElementsNotIn(c2.List()); + + var start = new DateTime(year, month, 1, 0, 0, 0); + var end = start.AddMonths(1).AddSeconds(-1); + + var criteria = CreateCriteriaIsActive() + .Add(Restrictions.In(nameof(ServiceRecord.CustomerOid), customerOids.ToArray())) + .Add(CreateBetweenDateTimesCriterion(start, end, "Start", "End")) + .Add(Restrictions.In(nameof(ServiceRecord.SupportConcept) + ".Oid", supportConcepts.Select(sc => sc.Oid).ToArray())); + + return criteria.List().ToList(); + } } } diff --git a/ReportImp/KommAmbulanteDienste/FlsAuswertung.cs b/ReportImp/KommAmbulanteDienste/FlsAuswertung.cs new file mode 100644 index 000000000..d46d60536 --- /dev/null +++ b/ReportImp/KommAmbulanteDienste/FlsAuswertung.cs @@ -0,0 +1,110 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using BeWo.Report; +using BeWo.Report.ReportObjects; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BS.Shared.Core; +using BS.Shared.Extensions; + +namespace BeWo.KommAmbulanteDienste +{ + [IDSpecificClass(Identifier = "FlsAuswertung")] + public partial class FlsAuswertung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + public FlsAuswertung() + { + InitializeComponent(); + } + + public void SetReportDataSource(QueryRO pRO) + { + bindingSource1.DataSource = CreateDataSource(pRO); + } + + private QueryRO CreateDataSource(QueryRO ro) + { + var newQueryRo = new QueryRO(); + + var customerOidField = ro.Rows[0].Field1; // CustomerOid + var monthYearField = ro.Rows[0].Field2; // YYYY-MM-DD + var serviceCategoryOidField = ro.Rows[0].Field3; // ServiceCategoryOid + + var customerOids = new List(); + + var date = DateTime.Now.GetFirstOfMonth(); + + var isCustomerOidValid = long.TryParse(customerOidField?.ToString(), out var customerOid); + if(isCustomerOidValid && customerOid > 0) + { + customerOids = new List {customerOid}; + } + else + { + customerOids.AddRangeIfElementsNotIn(DAOFactory.GenericDAO.GetAllActive().Where(customer => customer.Oid.HasValue).Select(customer => customer.Oid.Value)); + } + + DateTime.TryParse(monthYearField?.ToString(), out date); + + if(!long.TryParse(serviceCategoryOidField?.ToString(), out var serviceCategoryOid) || serviceCategoryOid == 0) + { + newQueryRo.Name = "Es wurde keine Kategorie ausgewählt."; + + DetailReport.Visible = false; + lblGefunden.Visible = false; + + return newQueryRo; + } + + var serviceCategory = DAOFactory.GenericDAO.LoadByID(serviceCategoryOid); + + var customerText = string.Empty; + if(customerOids.Count == 1) + { + var customer = DAOFactory.GenericDAO.LoadByID(customerOids[0]); + customerText = $"von {customer.Person.LastNameFirstName} "; + } + + newQueryRo.Name = $"Zeiterfassungseinträge für Hilfepläne {customerText}mit der Leistungskategorie \"{serviceCategory.Name}\" im {date:Y}"; + + var serviceRecords = DAOFactory.SearchDAO.GetActiveServiceRecordsBySupportConceptWithServiceCategoryForCustomer(customerOids, serviceCategoryOid, date.Month, date.Year).OrderBy(x => x.Customer.Person.LastNameFirstName).ToList(); + + lblGefunden.Visible = !serviceRecords.Any(); + + var customers2ServiceRecords = new Dictionary>(); + + serviceRecords.DoForEach(sr => customers2ServiceRecords.AddOrUpdateValueInDictionary(sr.Customer, sr)); + + foreach(var customer2ServiceRecords in customers2ServiceRecords) + { + var row = new QueryRO.Row + { + Field1 = customer2ServiceRecords.Key.Person.LastNameFirstName, + ChildRows1 = new List() + }; + + foreach(var serviceRecord in customer2ServiceRecords.Value.OrderBy(x => x.Start).ToList()) + { + var start = serviceRecord.Start?.ToString("HH:mm") ?? string.Empty; + var end = serviceRecord.End?.ToString("HH:mm") ?? string.Empty; + + var childRow = new QueryRO.Row + { + Field1 = serviceRecord.Start?.Date.ToString("dd.MM.yyyy") ?? string.Empty, + Field2 = $"{start} - {end}", + Field3 = serviceRecord.ServiceDescription.ServiceCategory.Name, + Field4 = serviceRecord.ServiceDescription.Name, + Field5 = serviceRecord.Employee.Person.LastNameFirstName + }; + + row.ChildRows1.Add(childRow); + } + + newQueryRo.Rows.Add(row); + } + + return newQueryRo; + } + } +} diff --git a/ReportImp/KommAmbulanteDienste/FlsAuswertung.designer.cs b/ReportImp/KommAmbulanteDienste/FlsAuswertung.designer.cs new file mode 100644 index 000000000..188dc8f93 --- /dev/null +++ b/ReportImp/KommAmbulanteDienste/FlsAuswertung.designer.cs @@ -0,0 +1,457 @@ +namespace BeWo.KommAmbulanteDienste +{ + partial class FlsAuswertung + { + /// + /// 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(); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + 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.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.lblGefunden = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); + // + // Detail + // + this.Detail.Expanded = false; + this.Detail.HeightF = 0F; + this.Detail.Name = "Detail"; + this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1, + this.xrLabel1}); + this.Detail1.Font = new System.Drawing.Font("Arial", 9F); + this.Detail1.HeightF = 80.08331F; + this.Detail1.KeepTogetherWithDetailReports = true; + this.Detail1.Name = "Detail1"; + this.Detail1.StylePriority.UseFont = false; + // + // xrTable2 + // + this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 0F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2}); + this.xrTable2.SizeF = new System.Drawing.SizeF(736.9997F, 25F); + this.xrTable2.StylePriority.UseBorders = false; + this.xrTable2.StylePriority.UseFont = false; + this.xrTable2.StylePriority.UsePadding = false; + this.xrTable2.StylePriority.UseTextAlignment = false; + this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell6, + this.xrTableCell7, + this.xrTableCell9, + this.xrTableCell10, + this.xrTableCell2}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 1D; + // + // xrTableCell6 + // + this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.ChildRows1.Field1")}); + this.xrTableCell6.Multiline = true; + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Weight = 0.48744460268856671D; + // + // xrTableCell7 + // + this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.ChildRows1.Field2")}); + this.xrTableCell7.Multiline = true; + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell7.Weight = 0.48744460663060385D; + // + // xrTableCell9 + // + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.ChildRows1.Field3")}); + this.xrTableCell9.Multiline = true; + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell9.Weight = 0.7577548071958039D; + // + // xrTableCell10 + // + this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.ChildRows1.Field4")}); + this.xrTableCell10.Multiline = true; + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell10.Weight = 0.757754801610922D; + // + // xrLabel13 + // + this.xrLabel13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Name")}); + this.xrLabel13.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F); + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(737F, 23F); + this.xrLabel13.StylePriority.UseFont = false; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.DetailReport1}); + this.DetailReport.DataMember = "Rows"; + 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.DetailReport1.DataMember = "Rows.ChildRows1"; + this.DetailReport1.DataSource = this.bindingSource1; + this.DetailReport1.Level = 0; + this.DetailReport1.Name = "DetailReport1"; + // + // Detail2 + // + this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2}); + this.Detail2.HeightF = 25F; + this.Detail2.Name = "Detail2"; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel13}); + this.ReportHeader.HeightF = 52.08333F; + this.ReportHeader.Name = "ReportHeader"; + // + // 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 System.Drawing.Font("Arial", 8F); + this.xrPageInfo2.Format = "Seite {0} von {1}"; + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(356F, 25F); + this.xrPageInfo2.Name = "xrPageInfo2"; + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(374.0001F, 23F); + this.xrPageInfo2.StyleName = "PageInfo"; + this.xrPageInfo2.StylePriority.UseFont = false; + this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // xrPageInfo1 + // + this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.xrPageInfo1.Name = "xrPageInfo1"; + this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; + this.xrPageInfo1.SizeF = new System.Drawing.SizeF(287F, 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 System.Drawing.Font("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 System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.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 System.Drawing.Font("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 System.Drawing.Font("Times New Roman", 8F); + this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; + this.DataField.Name = "DataField"; + // + // fieldFLS + // + this.fieldFLS.DataMember = "FLSReportGroups"; + this.fieldFLS.DataSource = this.bindingSource1; + 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 = 30F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // ReportFooter + // + this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblGefunden}); + this.ReportFooter.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.ReportFooter.HeightF = 33.41665F; + this.ReportFooter.Name = "ReportFooter"; + this.ReportFooter.StylePriority.UseFont = false; + // + // lblGefunden + // + this.lblGefunden.LocationFloat = new DevExpress.Utils.PointFloat(0F, 13.20833F); + this.lblGefunden.Name = "lblGefunden"; + this.lblGefunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblGefunden.SizeF = new System.Drawing.SizeF(727F, 20.20833F); + this.lblGefunden.Text = "Es wurden keine Zeiterfassungseinträge gefunden."; + // + // xrTableCell2 + // + this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.ChildRows1.Field5")}); + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell2.Weight = 0.77547870777890127D; + // + // xrLabel1 + // + this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field1")}); + this.xrLabel1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 27.08332F); + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(737F, 23F); + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.StylePriority.UseTextAlignment = false; + this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrTable1 + // + this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 50.08331F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(736.9998F, 30F); + this.xrTable1.StylePriority.UseBorders = false; + this.xrTable1.StylePriority.UseFont = false; + this.xrTable1.StylePriority.UsePadding = false; + this.xrTable1.StylePriority.UseTextAlignment = false; + this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1, + this.xrTableCell4, + this.xrTableCell5, + this.xrTableCell8, + this.xrTableCell11}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 1.1162794658854165D; + // + // xrTableCell1 + // + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Text = "Datum"; + this.xrTableCell1.Weight = 0.26455650959129312D; + // + // xrTableCell4 + // + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Text = "Uhrzeit"; + this.xrTableCell4.Weight = 0.26455581782952403D; + // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Text = "Kategorie"; + this.xrTableCell5.Weight = 0.4112650380197464D; + // + // xrTableCell8 + // + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Text = "Leistung"; + this.xrTableCell8.Weight = 0.41126432240394978D; + // + // xrTableCell11 + // + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.Text = "Mitarbeiter"; + this.xrTableCell11.Weight = 0.42088418036284908D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO); + // + // FlsAuswertung + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.DetailReport, + this.ReportHeader, + this.pageFooterBand1, + this.topMarginBand1, + this.bottomMarginBand1, + this.ReportFooter}); + this.DataSource = this.bindingSource1; + this.DisplayName = "Finanzauswertung laufende HPs"; + this.Font = new System.Drawing.Font("Arial", 9.75F); + this.Margins = new System.Drawing.Printing.Margins(50, 40, 50, 30); + this.PageHeight = 1169; + this.PageWidth = 827; + this.PaperKind = System.Drawing.Printing.PaperKind.A4; + this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] { + this.Title, + this.FieldCaption, + this.PageInfo, + this.DataField}); + this.Version = "17.1"; + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).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.DetailBand Detail1; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; + 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.CalculatedField fieldFLS; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.XRLabel xrLabel13; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; + private DevExpress.XtraReports.UI.XRLabel lblGefunden; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; + private DevExpress.XtraReports.UI.DetailBand Detail2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + } +} diff --git a/ReportImp/KommAmbulanteDienste/FlsAuswertung.resx b/ReportImp/KommAmbulanteDienste/FlsAuswertung.resx new file mode 100644 index 000000000..d25f3eba2 --- /dev/null +++ b/ReportImp/KommAmbulanteDienste/FlsAuswertung.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 17, 17 + + \ No newline at end of file diff --git a/ReportImp/KommAmbulanteDienste/KommAmbulanteDienste.csproj b/ReportImp/KommAmbulanteDienste/KommAmbulanteDienste.csproj index 7c93f8a1d..921f8b132 100644 --- a/ReportImp/KommAmbulanteDienste/KommAmbulanteDienste.csproj +++ b/ReportImp/KommAmbulanteDienste/KommAmbulanteDienste.csproj @@ -48,6 +48,12 @@ + + Component + + + FlsAuswertung.cs + @@ -77,6 +83,9 @@ + + FlsAuswertung.cs + Quittierungsbeleg.cs @@ -86,5 +95,6 @@ + \ No newline at end of file diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 08399d29d..69006695b 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -252,10 +252,10 @@ namespace BeWo.Service.Plugins //t = "3565931805"; // Betreuungsbüro Frank Röhrig //t = "4152581290"; // MVZ Medikus GmbH (Stoffwechsel Betreutes wohnen) //t = "4529320405"; // BeWo Stelzel - //t = "2594047883"; // KOMM Ambulante Dienste e. V. + t = "2594047883"; // KOMM Ambulante Dienste e. V. //t = "1558685648"; // KIMM //t = "3460972350"; // Caritas Kleve I - t = "2623845876"; // Passgenau Hildesheim + //t = "2623845876"; // Passgenau Hildesheim //t = "4368361336"; // Kompass BeWo Wesel //t = "3257905806"; // Diakonisches Werk Herne //t = "2535794597"; // Mobilo Ambulant