From 1a5b987a3536a2129848e510a15d3b9c76ba3f3b Mon Sep 17 00:00:00 2001 From: Kojo Date: Mon, 1 Sep 2025 11:50:38 +0200 Subject: [PATCH] Mittelpunkt: Typo Bereitschaftsliste, Korrektur QueryOids --- .../Bereitschaftsliste.designer.cs | 278 +++++++++--------- ReportImp/Mittelpunkt/CustomReportCreator.cs | 48 +-- 2 files changed, 146 insertions(+), 180 deletions(-) diff --git a/ReportImp/Mittelpunkt/Bereitschaftsliste.designer.cs b/ReportImp/Mittelpunkt/Bereitschaftsliste.designer.cs index f867576d2..309fb8dd1 100644 --- a/ReportImp/Mittelpunkt/Bereitschaftsliste.designer.cs +++ b/ReportImp/Mittelpunkt/Bereitschaftsliste.designer.cs @@ -30,9 +30,9 @@ namespace Mittelpunkt private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Bereitschaftsliste)); DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Bereitschaftsliste)); DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); @@ -40,8 +40,10 @@ namespace Mittelpunkt this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); @@ -50,12 +52,21 @@ namespace Mittelpunkt this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = 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(); + this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.lblMonat = new DevExpress.XtraReports.UI.XRLabel(); @@ -69,17 +80,6 @@ namespace Mittelpunkt this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell10 = 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.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -155,6 +155,15 @@ namespace Mittelpunkt this.xrTableCell19.Text = "xrTableCell19"; this.xrTableCell19.Weight = 0.19955261516851569D; // + // xrTableCell11 + // + this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field5")}); + this.xrTableCell11.Multiline = true; + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.Text = "xrTableCell11"; + this.xrTableCell11.Weight = 0.12828333788594742D; + // // xrTableCell17 // this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -171,6 +180,16 @@ namespace Mittelpunkt this.xrTableCell20.Text = "xrTableCell20"; this.xrTableCell20.Weight = 0.099776328349390528D; // + // xrTableCell7 + // + this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field8")}); + this.xrTableCell7.Multiline = true; + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Text = "xrTableCell7"; + this.xrTableCell7.TextFormatString = "{0:dd.MM.yyyy}"; + this.xrTableCell7.Weight = 0.12828351156467666D; + // // xrTableCell28 // this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -265,6 +284,17 @@ namespace Mittelpunkt this.xrTableCell6.Text = "Vorname"; this.xrTableCell6.Weight = 0.2087069286807885D; // + // xrTableCell10 + // + this.xrTableCell10.BackColor = System.Drawing.SystemColors.Control; + this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell10.Multiline = true; + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.StylePriority.UseBackColor = false; + this.xrTableCell10.StylePriority.UseFont = false; + this.xrTableCell10.Text = "Steuer-nummer"; + this.xrTableCell10.Weight = 0.13416873814935043D; + // // xrTableCell4 // this.xrTableCell4.BackColor = System.Drawing.SystemColors.Control; @@ -327,6 +357,103 @@ namespace Mittelpunkt this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // + // xrTable1 + // + this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 5F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(767.0001F, 25F); + 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.MiddleCenter; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell35, + this.xrTableCell37, + this.xrTableCell38, + this.xrTableCell39, + this.cellFLSIstGesamt}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 1D; + // + // xrTableCell35 + // + this.xrTableCell35.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell35.Name = "xrTableCell35"; + this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell35.StylePriority.UseFont = false; + this.xrTableCell35.StylePriority.UsePadding = false; + this.xrTableCell35.StylePriority.UseTextAlignment = false; + this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell35.Weight = 0.11740988823945994D; + // + // xrTableCell37 + // + this.xrTableCell37.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell37.Name = "xrTableCell37"; + this.xrTableCell37.StylePriority.UseFont = false; + this.xrTableCell37.StylePriority.UseTextAlignment = false; + this.xrTableCell37.Text = "Summe Beträge:"; + this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight; + this.xrTableCell37.Weight = 0.075477650404210339D; + // + // xrTableCell38 + // + this.xrTableCell38.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; + this.xrTableCell38.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field10")}); + this.xrTableCell38.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell38.Name = "xrTableCell38"; + this.xrTableCell38.StylePriority.UseBorderDashStyle = false; + this.xrTableCell38.StylePriority.UseBorders = false; + this.xrTableCell38.StylePriority.UseFont = false; + this.xrTableCell38.StylePriority.UseTextAlignment = false; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrTableCell38.Summary = xrSummary1; + this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.xrTableCell38.TextFormatString = "{0:#,#}"; + this.xrTableCell38.Weight = 0.029352376353040159D; + // + // xrTableCell39 + // + this.xrTableCell39.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell39.Name = "xrTableCell39"; + this.xrTableCell39.StylePriority.UseFont = false; + this.xrTableCell39.StylePriority.UseTextAlignment = false; + this.xrTableCell39.Text = "Summe Bereitschaftstage:"; + this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight; + this.xrTableCell39.Weight = 0.07547767627038586D; + // + // cellFLSIstGesamt + // + this.cellFLSIstGesamt.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; + this.cellFLSIstGesamt.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field11")}); + this.cellFLSIstGesamt.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.cellFLSIstGesamt.Name = "cellFLSIstGesamt"; + this.cellFLSIstGesamt.StylePriority.UseBorderDashStyle = false; + this.cellFLSIstGesamt.StylePriority.UseBorders = false; + this.cellFLSIstGesamt.StylePriority.UseFont = false; + this.cellFLSIstGesamt.StylePriority.UseTextAlignment = false; + xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.cellFLSIstGesamt.Summary = xrSummary2; + this.cellFLSIstGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.cellFLSIstGesamt.Weight = 0.023901303339993105D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO); + // // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -440,133 +567,6 @@ namespace Mittelpunkt this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // xrTable1 - // - this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 5F); - this.xrTable1.Name = "xrTable1"; - this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(767.0001F, 25F); - 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.MiddleCenter; - // - // xrTableRow1 - // - this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell35, - this.xrTableCell37, - this.xrTableCell38, - this.xrTableCell39, - this.cellFLSIstGesamt}); - this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Weight = 1D; - // - // xrTableCell35 - // - this.xrTableCell35.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell35.Name = "xrTableCell35"; - this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); - this.xrTableCell35.StylePriority.UseFont = false; - this.xrTableCell35.StylePriority.UsePadding = false; - this.xrTableCell35.StylePriority.UseTextAlignment = false; - this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell35.Weight = 0.11740988823945994D; - // - // xrTableCell37 - // - this.xrTableCell37.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell37.Name = "xrTableCell37"; - this.xrTableCell37.StylePriority.UseFont = false; - this.xrTableCell37.StylePriority.UseTextAlignment = false; - this.xrTableCell37.Text = "Summe Beträge:"; - this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight; - this.xrTableCell37.Weight = 0.075477650404210339D; - // - // xrTableCell38 - // - this.xrTableCell38.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; - this.xrTableCell38.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field10")}); - this.xrTableCell38.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell38.Name = "xrTableCell38"; - this.xrTableCell38.StylePriority.UseBorderDashStyle = false; - this.xrTableCell38.StylePriority.UseBorders = false; - this.xrTableCell38.StylePriority.UseFont = false; - this.xrTableCell38.StylePriority.UseTextAlignment = false; - xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrTableCell38.Summary = xrSummary1; - this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell38.TextFormatString = "{0:#,#}"; - this.xrTableCell38.Weight = 0.029352376353040159D; - // - // xrTableCell39 - // - this.xrTableCell39.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell39.Name = "xrTableCell39"; - this.xrTableCell39.StylePriority.UseFont = false; - this.xrTableCell39.StylePriority.UseTextAlignment = false; - this.xrTableCell39.Text = "Summe Bereitschaftstagel:"; - this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight; - this.xrTableCell39.Weight = 0.07547767627038586D; - // - // cellFLSIstGesamt - // - this.cellFLSIstGesamt.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; - this.cellFLSIstGesamt.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field11")}); - this.cellFLSIstGesamt.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); - this.cellFLSIstGesamt.Name = "cellFLSIstGesamt"; - this.cellFLSIstGesamt.StylePriority.UseBorderDashStyle = false; - this.cellFLSIstGesamt.StylePriority.UseBorders = false; - this.cellFLSIstGesamt.StylePriority.UseFont = false; - this.cellFLSIstGesamt.StylePriority.UseTextAlignment = false; - xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.cellFLSIstGesamt.Summary = xrSummary2; - this.cellFLSIstGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.cellFLSIstGesamt.Weight = 0.023901303339993105D; - // - // xrTableCell7 - // - this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field8")}); - this.xrTableCell7.Multiline = true; - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Text = "xrTableCell7"; - this.xrTableCell7.TextFormatString = "{0:dd.MM.yyyy}"; - this.xrTableCell7.Weight = 0.12828351156467666D; - // - // xrTableCell10 - // - this.xrTableCell10.BackColor = System.Drawing.SystemColors.Control; - this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell10.Multiline = true; - this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.StylePriority.UseBackColor = false; - this.xrTableCell10.StylePriority.UseFont = false; - this.xrTableCell10.Text = "Steuer-nummer"; - this.xrTableCell10.Weight = 0.13416873814935043D; - // - // xrTableCell11 - // - this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field5")}); - this.xrTableCell11.Multiline = true; - this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.Text = "xrTableCell11"; - this.xrTableCell11.Weight = 0.12828333788594742D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO); - // // Bereitschaftsliste // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { diff --git a/ReportImp/Mittelpunkt/CustomReportCreator.cs b/ReportImp/Mittelpunkt/CustomReportCreator.cs index e930bfc78..ca9b52ea3 100644 --- a/ReportImp/Mittelpunkt/CustomReportCreator.cs +++ b/ReportImp/Mittelpunkt/CustomReportCreator.cs @@ -199,16 +199,14 @@ namespace Mittelpunkt public override XtraReport CreateQueryReport(long queryOid, string queryReportId) { - if (queryOid == 100 || queryOid == 101) + if (queryOid == 5000) + { + // nix tun, nur zur Uebersicht eingefuegt + } + else if (queryOid == 5001 || queryOid == 5002) { return CreateQueryReportArbeitstageMehrAls8h(queryOid, queryReportId); } - /* - else if (queryOid == 102) - { - return CreateLohnliste(queryOid, queryReportId); - } - */ return base.CreateQueryReport(queryOid, queryReportId); } @@ -232,9 +230,9 @@ namespace Mittelpunkt if (qro.Rows[0].Field2 != null && qro.Rows[0].Field2.ToString() != "0") { long oid = Int64.Parse(qro.Rows[0].Field2.ToString()); - if (queryOid == 100) + if (queryOid == 5001) employeeOid = oid; - else if (queryOid == 101) + else if (queryOid == 5002) teamOid = oid; } @@ -322,37 +320,5 @@ namespace Mittelpunkt return arbeitstageMehrAls8h; } - private XtraReport CreateLohnliste(long queryOid, string queryReportId) - { - var query = DAOFactory.GenericDAO.LoadByID(queryOid); - if (query == null) - return new XtraReport(); - - var path = Path.Combine(TempPath, queryReportId + ".xml"); - var table = Utils.XMLDeserialize(path); - var qro = QueryRO.Create(query, table); - if (qro.Rows.Count > 0) - { - DateTime startDate = DateTime.ParseExact(qro.Rows[0].Field1.ToString(), "yyyy-MM-dd", CultureInfo.InvariantCulture); - DateTime endDate = new DateTime(startDate.Year, 12, 31); - - XtraReport bericht = null; - - var allEmployees = DAOFactory.GenericDAO.GetAllActiveAndArchived(); - - foreach (var employee in allEmployees) - { - bericht = CreateAndAddArbeitstageMehrAls8hBericht((long)employee.Oid, startDate, endDate, bericht); - } - - if (bericht != null) - { - return bericht; - } - } - - return new XtraReport(); - } - } }