diff --git a/ReportImp/Mittelpunkt/CustomReportCreator.cs b/ReportImp/Mittelpunkt/CustomReportCreator.cs index cc5f94653..2fa0f57af 100644 --- a/ReportImp/Mittelpunkt/CustomReportCreator.cs +++ b/ReportImp/Mittelpunkt/CustomReportCreator.cs @@ -215,6 +215,26 @@ namespace Mittelpunkt public override XtraReport CreateQueryReport(long queryOid, string queryReportId) { + //if (queryOid == 4730) + //{ + // var query = DAOFactory.GenericDAO.LoadByID(queryOid); + + // if (query is null) + // { + // return new XtraReport(); + // } + + // var path = Utils.CreateSavePath(TempPath, queryReportId + ".xml"); + // var table = Utils.XMLDeserialize(path); + + // var queryReport = new GeplanteStunden(); + // var queryReportObject = QueryRO.Create(query, table); + + // queryReport.SetReportDataSource(queryReportObject); + + // return queryReport as XtraReport; + // } + if (queryOid == 5000) { // nix tun, nur zur Uebersicht eingefuegt diff --git a/ReportImp/Mittelpunkt/GeplanteStunden.Designer.cs b/ReportImp/Mittelpunkt/GeplanteStunden.Designer.cs new file mode 100644 index 000000000..54a533070 --- /dev/null +++ b/ReportImp/Mittelpunkt/GeplanteStunden.Designer.cs @@ -0,0 +1,228 @@ +using BeWo.Report.ReportObjects; +namespace Mittelpunkt +{ + partial class GeplanteStunden + { + /// + /// 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.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + 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(); + ((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; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(Mittelpunkt.Reporting.GeplanteStundenRO); + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel2, + this.xrLabel1}); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.ReportHeader.HeightF = 98.54167F; + this.ReportHeader.Name = "ReportHeader"; + this.ReportHeader.StylePriority.UseFont = false; + // + // xrLabel2 + // + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 21.95835F); + this.xrLabel2.Multiline = true; + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(635.4167F, 21.95835F); + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.Text = "[Berichtsstart!dd.MM.yyyy] - [Berichtsende!dd.MM.yyyy]"; + // + // xrLabel1 + // + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(635.4167F, 21.95835F); + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Geplante Stunden nach Teams"; + // + // pageFooterBand1 + // + this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPageInfo2, + this.xrPageInfo1}); + this.pageFooterBand1.HeightF = 67.44436F; + this.pageFooterBand1.Name = "pageFooterBand1"; + // + // xrPageInfo2 + // + this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(924.0834F, 44.44436F); + this.xrPageInfo2.Name = "xrPageInfo2"; + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(93.91663F, 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(0F, 44.44436F); + this.xrPageInfo1.Name = "xrPageInfo1"; + this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; + this.xrPageInfo1.SizeF = new System.Drawing.SizeF(924.0834F, 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"; + // + // GeplanteStunden + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.ReportHeader, + this.pageFooterBand1, + this.topMarginBand1, + this.bottomMarginBand1}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.fieldFLS}); + this.DataSource = this.bindingSource1; + this.Landscape = true; + this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 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.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + + } + + #endregion + + private DevExpress.XtraReports.UI.DetailBand Detail; + private System.Windows.Forms.BindingSource bindingSource1; + private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; + private DevExpress.XtraReports.UI.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 xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; + } +} diff --git a/ReportImp/Mittelpunkt/GeplanteStunden.cs b/ReportImp/Mittelpunkt/GeplanteStunden.cs new file mode 100644 index 000000000..4b5c8cee9 --- /dev/null +++ b/ReportImp/Mittelpunkt/GeplanteStunden.cs @@ -0,0 +1,29 @@ +using System; +using BeWo.Report.ReportObjects; +using BeWo.Report; +using DevExpress.XtraReports.UI; +using System.Data; +using Mittelpunkt.Reporting; + +namespace Mittelpunkt +{ + public partial class GeplanteStunden : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + public GeplanteStunden() + { + InitializeComponent(); + + } + + public void SetReportDataSource(QueryRO pRO) + { + DateTime start = DateTime.Parse(pRO.Rows[0].Field1.ToString()); + DateTime ende = DateTime.Parse(pRO.Rows[0].Field2.ToString()); + + var ro = GeplanteStundenRO.Create(start, ende.AddTicks(-1)); + + this.bindingSource1.DataSource = ro; + } + + } +} diff --git a/ReportImp/Mittelpunkt/GeplanteStunden.resx b/ReportImp/Mittelpunkt/GeplanteStunden.resx new file mode 100644 index 000000000..d58980a38 --- /dev/null +++ b/ReportImp/Mittelpunkt/GeplanteStunden.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/ReportImp/Mittelpunkt/Mitarbeiterauslastung.designer.cs b/ReportImp/Mittelpunkt/Mitarbeiterauslastung.designer.cs index 5ed4f0d5d..85165d944 100644 --- a/ReportImp/Mittelpunkt/Mitarbeiterauslastung.designer.cs +++ b/ReportImp/Mittelpunkt/Mitarbeiterauslastung.designer.cs @@ -42,6 +42,7 @@ namespace Mittelpunkt this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); @@ -52,6 +53,7 @@ namespace Mittelpunkt this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -59,6 +61,8 @@ namespace Mittelpunkt this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.lblMonat = new DevExpress.XtraReports.UI.XRLabel(); this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); @@ -73,10 +77,6 @@ namespace Mittelpunkt this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.fieldTotalSC = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldTotalEmp = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -195,6 +195,15 @@ namespace Mittelpunkt this.xrTableCell28.Text = "xrTableCell28"; this.xrTableCell28.Weight = 0.090171325518485085D; // + // xrTableCell8 + // + this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.FreiProWoche")}); + this.xrTableCell8.Multiline = true; + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.TextFormatString = "{0:0.00}"; + this.xrTableCell8.Weight = 0.090171325518485085D; + // // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -289,6 +298,13 @@ namespace Mittelpunkt this.xrTableCell9.Text = "Bewilligt/Woche"; this.xrTableCell9.Weight = 0.090171325937473845D; // + // xrTableCell7 + // + this.xrTableCell7.Multiline = true; + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Text = "Frei/Woche"; + this.xrTableCell7.Weight = 0.090171325937473845D; + // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -353,6 +369,21 @@ namespace Mittelpunkt this.cellSollGesamt.Text = "cellSollGesamt"; this.cellSollGesamt.Weight = 0.0849316752773914D; // + // xrTableCell10 + // + this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.FreiProWoche")}); + this.xrTableCell10.Multiline = true; + this.xrTableCell10.Name = "xrTableCell10"; + xrSummary1.FormatString = "{0:0.00}"; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell10.Summary = xrSummary1; + this.xrTableCell10.Weight = 0.0849316752773914D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterauslastungRO); + // // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -384,7 +415,7 @@ namespace Mittelpunkt // xrPageInfo2 // this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); - this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(342.4169F, 25F); + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(399.4169F, 25F); this.xrPageInfo2.Name = "xrPageInfo2"; this.xrPageInfo2.SizeF = new System.Drawing.SizeF(297.5831F, 23F); this.xrPageInfo2.StyleName = "PageInfo"; @@ -473,37 +504,6 @@ namespace Mittelpunkt this.fieldTotalEmp.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldTotalEmp.Name = "fieldTotalEmp"; // - // xrTableCell7 - // - this.xrTableCell7.Multiline = true; - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Text = "Frei/Woche"; - this.xrTableCell7.Weight = 0.090171325937473845D; - // - // xrTableCell8 - // - this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.FreiProWoche")}); - this.xrTableCell8.Multiline = true; - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.TextFormatString = "{0:0.00}"; - this.xrTableCell8.Weight = 0.090171325518485085D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterauslastungRO); - // - // xrTableCell10 - // - this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.FreiProWoche")}); - this.xrTableCell10.Multiline = true; - this.xrTableCell10.Name = "xrTableCell10"; - xrSummary1.FormatString = "{0:0.00}"; - xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell10.Summary = xrSummary1; - this.xrTableCell10.Weight = 0.0849316752773914D; - // // Mitarbeiterauslastung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { diff --git a/ReportImp/Mittelpunkt/Mittelpunkt.csproj b/ReportImp/Mittelpunkt/Mittelpunkt.csproj index 35bd1fe98..8c0476708 100644 --- a/ReportImp/Mittelpunkt/Mittelpunkt.csproj +++ b/ReportImp/Mittelpunkt/Mittelpunkt.csproj @@ -59,6 +59,12 @@ + + Component + + + GeplanteStunden.cs + Component @@ -110,6 +116,7 @@ Lohnliste.cs + Component @@ -212,6 +219,10 @@ + + GeplanteStunden.cs + Designer + CollectiveBillingReport.cs Designer diff --git a/ReportImp/Mittelpunkt/Reporting/GeplanteStundenRO.cs b/ReportImp/Mittelpunkt/Reporting/GeplanteStundenRO.cs new file mode 100644 index 000000000..e90158ab6 --- /dev/null +++ b/ReportImp/Mittelpunkt/Reporting/GeplanteStundenRO.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Mittelpunkt.Reporting +{ + public class GeplanteStundenRO + { + // Geld für Bericht ist noch nicht vom Chef genehmigt, daher wird das hier noch nicht benutzt und ist nicht fertig + public DateTime Berichtsstart { get; set; } + public DateTime Berichtsende { get; set; } + public List TeamStundenZuordnungList { get; set; } + + public static GeplanteStundenRO Create(DateTime berichtStart, DateTime berichtEnde) + { + GeplanteStundenRO ro = new GeplanteStundenRO(); + + ro.Berichtsstart = berichtStart; + ro.Berichtsende = berichtEnde; + + + + return ro; + } + + public class TeamStundenZuordnung + { + public string Teamname { get; set; } + + public decimal GeplanteFls { get; set; } + + public decimal BewilligteFls { get; set; } + + public decimal GeplanteAssistenz { get; set; } + + public decimal BewilligteAssistenz { get; set; } + + public int AnzahlKlienten { get; set; } + } + } +} diff --git a/ReportImp/Mittelpunkt/Teamauslastung.designer.cs b/ReportImp/Mittelpunkt/Teamauslastung.designer.cs index c40d38837..e78326692 100644 --- a/ReportImp/Mittelpunkt/Teamauslastung.designer.cs +++ b/ReportImp/Mittelpunkt/Teamauslastung.designer.cs @@ -50,6 +50,7 @@ namespace Mittelpunkt this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -57,6 +58,7 @@ namespace Mittelpunkt this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -64,11 +66,14 @@ namespace Mittelpunkt this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter3 = new DevExpress.XtraReports.UI.GroupFooterBand(); 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.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.DetailReport3 = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail4 = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); @@ -85,16 +90,11 @@ namespace Mittelpunkt this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.fieldTotalSC = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldTotalEmp = new DevExpress.XtraReports.UI.CalculatedField(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -268,6 +268,15 @@ namespace Mittelpunkt this.xrTableCell15.Text = "xrTableCell28"; this.xrTableCell15.Weight = 0.090171325518485085D; // + // xrTableCell3 + // + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.SupportConceptDetailList.FreiProWoche")}); + this.xrTableCell3.Multiline = true; + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.TextFormatString = "{0:0.00}"; + this.xrTableCell3.Weight = 0.090171325518485085D; + // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -333,6 +342,13 @@ namespace Mittelpunkt this.xrTableCell11.Text = "Bewilligt/Woche"; this.xrTableCell11.Weight = 0.090171325937473845D; // + // xrTableCell2 + // + this.xrTableCell2.Multiline = true; + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Text = "Frei/Woche"; + this.xrTableCell2.Weight = 0.090171325937473845D; + // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -398,6 +414,21 @@ namespace Mittelpunkt this.xrTableCell20.TextFormatString = "{0:0.00}"; this.xrTableCell20.Weight = 0.090171342851318267D; // + // xrTableCell5 + // + this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.FreiProWoche")}); + this.xrTableCell5.Multiline = true; + this.xrTableCell5.Name = "xrTableCell5"; + xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell5.Summary = xrSummary2; + this.xrTableCell5.TextFormatString = "{0:0.00}"; + this.xrTableCell5.Weight = 0.090171342851318267D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterauslastungRO); + // // GroupFooter3 // this.GroupFooter3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -452,6 +483,19 @@ namespace Mittelpunkt this.xrTableCell4.TextFormatString = "{0:0.00}"; this.xrTableCell4.Weight = 0.090171012634040468D; // + // xrTableCell6 + // + this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.FreiProWoche")}); + this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell6.Multiline = true; + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.StylePriority.UseFont = false; + xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell6.Summary = xrSummary3; + this.xrTableCell6.TextFormatString = "{0:0.00}"; + this.xrTableCell6.Weight = 0.090171012634040468D; + // // DetailReport3 // this.DetailReport3.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -584,50 +628,6 @@ namespace Mittelpunkt this.fieldTotalEmp.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldTotalEmp.Name = "fieldTotalEmp"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterauslastungRO); - // - // xrTableCell2 - // - this.xrTableCell2.Multiline = true; - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Text = "Frei/Woche"; - this.xrTableCell2.Weight = 0.090171325937473845D; - // - // xrTableCell3 - // - this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.FreiProWoche")}); - this.xrTableCell3.Multiline = true; - this.xrTableCell3.Name = "xrTableCell3"; - this.xrTableCell3.TextFormatString = "{0:0.00}"; - this.xrTableCell3.Weight = 0.090171325518485085D; - // - // xrTableCell5 - // - this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.FreiProWoche")}); - this.xrTableCell5.Multiline = true; - this.xrTableCell5.Name = "xrTableCell5"; - xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell5.Summary = xrSummary2; - this.xrTableCell5.TextFormatString = "{0:0.00}"; - this.xrTableCell5.Weight = 0.090171342851318267D; - // - // xrTableCell6 - // - this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.FreiProWoche")}); - this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell6.Multiline = true; - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.StylePriority.UseFont = false; - xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell6.Summary = xrSummary3; - this.xrTableCell6.TextFormatString = "{0:0.00}"; - this.xrTableCell6.Weight = 0.090171012634040468D; - // // Teamauslastung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -657,8 +657,8 @@ namespace Mittelpunkt ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); }