From 0cb02dab2fca2d5c63339fa229d8cb6a32183c94 Mon Sep 17 00:00:00 2001 From: Kojo Date: Wed, 15 Oct 2025 13:58:52 +0200 Subject: [PATCH] Mittelpunkt: Bericht Lohnliste neue Felder (under construction) --- ReportImp/Mittelpunkt/Lohnliste.cs | 40 +++++++ ReportImp/Mittelpunkt/Lohnliste.designer.cs | 119 ++++++++++++++------ 2 files changed, 122 insertions(+), 37 deletions(-) diff --git a/ReportImp/Mittelpunkt/Lohnliste.cs b/ReportImp/Mittelpunkt/Lohnliste.cs index 6b66a1dee..bd690ed58 100644 --- a/ReportImp/Mittelpunkt/Lohnliste.cs +++ b/ReportImp/Mittelpunkt/Lohnliste.cs @@ -76,6 +76,15 @@ namespace Mittelpunkt if (bruttoGehalt != null) row.Field13 = String.Format("{0:0,00} €", c.GrossSalary); } + + /* + string entgeldStufe = LeseEntgeldstufenVarfield(emp); + if (!String.IsNullOrEmpty(entgeldStufe)) + { + row.Field15 = entgeldStufe; + } + row.Field16 = emp.Notice; + */ } } } @@ -105,5 +114,36 @@ namespace Mittelpunkt } return contractNextToStartDate; } + + private string LeseEntgeldstufenVarfield(Employee employee) + { + string entgeldstufe = null; + foreach (var vv in employee.VarFieldValueList) + { + if (vv.VarFieldDefOid == 2) + { + var varFieldValue = BS.Shared.Core.Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName)); + if (varFieldValue != null) + { + entgeldstufe = varFieldValue.ToString(); + } + + /* + var varFieldValue = BS.Shared.Core.Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName)); + + decimal dec = 0; + if (varFieldValue != null && Decimal.TryParse(varFieldValue.ToString(), out dec)) + { + if (dec > 0) + { + return dec / 5; + } + } + */ + } + } + + return entgeldstufe; + } } } diff --git a/ReportImp/Mittelpunkt/Lohnliste.designer.cs b/ReportImp/Mittelpunkt/Lohnliste.designer.cs index fe6162a5c..7fc136e94 100644 --- a/ReportImp/Mittelpunkt/Lohnliste.designer.cs +++ b/ReportImp/Mittelpunkt/Lohnliste.designer.cs @@ -61,7 +61,9 @@ namespace Mittelpunkt this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + 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(); this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); @@ -73,8 +75,10 @@ namespace Mittelpunkt this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -126,7 +130,9 @@ namespace Mittelpunkt this.xrTableCell16, this.xrTableCell27, this.xrTableCell22, - this.xrTableCell23}); + this.xrTableCell23, + this.xrTableCell14, + this.xrTableCell15}); this.xrTableRowDetail.Name = "xrTableRowDetail"; this.xrTableRowDetail.Weight = 0.91999999999999993D; // @@ -141,7 +147,7 @@ namespace Mittelpunkt this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.Text = "xrTableCell3"; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell3.Weight = 0.081154213605215159D; + this.xrTableCell3.Weight = 0.075214504348053712D; // // xrTableCell18 // @@ -149,7 +155,7 @@ namespace Mittelpunkt new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field4")}); this.xrTableCell18.Name = "xrTableCell18"; this.xrTableCell18.Text = "xrTableCell18"; - this.xrTableCell18.Weight = 0.14427409331147148D; + this.xrTableCell18.Weight = 0.14505660770009241D; // // xrTableCell19 // @@ -157,7 +163,7 @@ namespace Mittelpunkt new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field5")}); this.xrTableCell19.Name = "xrTableCell19"; this.xrTableCell19.Text = "xrTableCell19"; - this.xrTableCell19.Weight = 0.1442741552272071D; + this.xrTableCell19.Weight = 0.14505672261263936D; // // xrTableCell17 // @@ -165,7 +171,7 @@ namespace Mittelpunkt new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field10")}); this.xrTableCell17.Name = "xrTableCell17"; this.xrTableCell17.Text = "xrTableCell17"; - this.xrTableCell17.Weight = 0.099188430552228965D; + this.xrTableCell17.Weight = 0.096704473832498389D; // // xrTableCell20 // @@ -173,7 +179,7 @@ namespace Mittelpunkt new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field11")}); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.Text = "xrTableCell20"; - this.xrTableCell20.Weight = 0.099188568142752453D; + this.xrTableCell20.Weight = 0.096704410310077343D; // // xrTableCell28 // @@ -181,7 +187,7 @@ namespace Mittelpunkt new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field12")}); this.xrTableCell28.Name = "xrTableCell28"; this.xrTableCell28.Text = "xrTableCell28"; - this.xrTableCell28.Weight = 0.0858881325201477D; + this.xrTableCell28.Weight = 0.069841960332521227D; // // xrTableCell16 // @@ -189,7 +195,7 @@ namespace Mittelpunkt new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field13")}); this.xrTableCell16.Name = "xrTableCell16"; this.xrTableCell16.Text = "xrTableCell16"; - this.xrTableCell16.Weight = 0.089044238985713439D; + this.xrTableCell16.Weight = 0.069842090826461492D; // // xrTableCell27 // @@ -197,7 +203,7 @@ namespace Mittelpunkt new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field14")}); this.xrTableCell27.Name = "xrTableCell27"; this.xrTableCell27.Text = "xrTableCell27"; - this.xrTableCell27.Weight = 0.079651319195925413D; + this.xrTableCell27.Weight = 0.06446962787806447D; // // xrTableCell22 // @@ -205,7 +211,7 @@ namespace Mittelpunkt new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field6")}); this.xrTableCell22.Name = "xrTableCell22"; this.xrTableCell22.Text = "xrTableCell22"; - this.xrTableCell22.Weight = 0.081530090276995051D; + this.xrTableCell22.Weight = 0.0644696253401557D; // // xrTableCell23 // @@ -213,7 +219,7 @@ namespace Mittelpunkt new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field7")}); this.xrTableCell23.Name = "xrTableCell23"; this.xrTableCell23.Text = "xrTableCell23"; - this.xrTableCell23.Weight = 0.095806758182343354D; + this.xrTableCell23.Weight = 0.064469632023964829D; // // DetailReport // @@ -264,7 +270,9 @@ namespace Mittelpunkt this.xrTableCell8, this.xrTableCell10, this.xrTableCell7, - this.xrTableCell11}); + this.xrTableCell11, + this.xrTableCell12, + this.xrTableCell13}); this.xrTableRowHeader.Name = "xrTableRowHeader"; this.xrTableRowHeader.Weight = 1.5916671752929685D; // @@ -281,7 +289,7 @@ namespace Mittelpunkt this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.Text = "Personal-\r\nNummer"; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell5.Weight = 0.081154193187568113D; + this.xrTableCell5.Weight = 0.0752145753780782D; // // xrTableCell6 // @@ -292,7 +300,7 @@ namespace Mittelpunkt this.xrTableCell6.StylePriority.UseBackColor = false; this.xrTableCell6.StylePriority.UseFont = false; this.xrTableCell6.Text = "Name"; - this.xrTableCell6.Weight = 0.14427412551116153D; + this.xrTableCell6.Weight = 0.14505667732508212D; // // xrTableCell4 // @@ -302,7 +310,7 @@ namespace Mittelpunkt this.xrTableCell4.StylePriority.UseBackColor = false; this.xrTableCell4.StylePriority.UseFont = false; this.xrTableCell4.Text = "Vorname"; - this.xrTableCell4.Weight = 0.14427411550437502D; + this.xrTableCell4.Weight = 0.14505668107734798D; // // xrTableCell1 // @@ -312,8 +320,8 @@ namespace Mittelpunkt this.xrTableCell1.Name = "xrTableCell1"; this.xrTableCell1.StylePriority.UseBackColor = false; this.xrTableCell1.StylePriority.UseFont = false; - this.xrTableCell1.Text = "Vertragsbeginn"; - this.xrTableCell1.Weight = 0.099188459630549508D; + this.xrTableCell1.Text = "Vertrags-beginn"; + this.xrTableCell1.Weight = 0.096704450648948614D; // // xrTableCell2 // @@ -324,7 +332,7 @@ namespace Mittelpunkt this.xrTableCell2.StylePriority.UseBackColor = false; this.xrTableCell2.StylePriority.UseFont = false; this.xrTableCell2.Text = "Befristet bis"; - this.xrTableCell2.Weight = 0.099188457927753132D; + this.xrTableCell2.Weight = 0.096704446309728923D; // // xrTableCell9 // @@ -335,7 +343,7 @@ namespace Mittelpunkt this.xrTableCell9.StylePriority.UseBackColor = false; this.xrTableCell9.StylePriority.UseFont = false; this.xrTableCell9.Text = "Wochen-stunden"; - this.xrTableCell9.Weight = 0.085888242450741864D; + this.xrTableCell9.Weight = 0.069842105214787786D; // // xrTableCell8 // @@ -344,8 +352,8 @@ namespace Mittelpunkt this.xrTableCell8.Name = "xrTableCell8"; this.xrTableCell8.StylePriority.UseBackColor = false; this.xrTableCell8.StylePriority.UseFont = false; - this.xrTableCell8.Text = "Bruttogehalt"; - this.xrTableCell8.Weight = 0.089044238843273116D; + this.xrTableCell8.Text = "Brutto-gehalt"; + this.xrTableCell8.Weight = 0.069842105214368039D; // // xrTableCell10 // @@ -354,8 +362,8 @@ namespace Mittelpunkt this.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.StylePriority.UseBackColor = false; this.xrTableCell10.StylePriority.UseFont = false; - this.xrTableCell10.Text = "Stundensatz"; - this.xrTableCell10.Weight = 0.079651267457388431D; + this.xrTableCell10.Text = "Stunden-satz"; + this.xrTableCell10.Weight = 0.064469639289381778D; // // xrTableCell7 // @@ -364,8 +372,8 @@ namespace Mittelpunkt this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.StylePriority.UseBackColor = false; this.xrTableCell7.StylePriority.UseFont = false; - this.xrTableCell7.Text = "Steuerklasse"; - this.xrTableCell7.Weight = 0.081530034956021277D; + this.xrTableCell7.Text = "Steuer-klasse"; + this.xrTableCell7.Weight = 0.064469648954011166D; // // xrTableCell11 // @@ -376,7 +384,7 @@ namespace Mittelpunkt this.xrTableCell11.StylePriority.UseBackColor = false; this.xrTableCell11.StylePriority.UseFont = false; this.xrTableCell11.Text = "Anzahl Kinder"; - this.xrTableCell11.Weight = 0.095806864469073424D; + this.xrTableCell11.Weight = 0.064469634349203747D; // // GroupFooter1 // @@ -393,6 +401,14 @@ namespace Mittelpunkt this.ReportHeader.HeightF = 102.3958F; this.ReportHeader.Name = "ReportHeader"; // + // xrPictureBox1 + // + this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource")); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(1031.917F, 0F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(77.08325F, 95.52075F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // lblMonat // this.lblMonat.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold); @@ -490,17 +506,42 @@ namespace Mittelpunkt this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // xrPictureBox1 + // xrTableCell12 // - this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource")); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(1031.917F, 0F); - this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(77.08325F, 95.52075F); - this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.xrTableCell12.BackColor = System.Drawing.SystemColors.Control; + this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell12.Multiline = true; + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.StylePriority.UseBackColor = false; + this.xrTableCell12.StylePriority.UseFont = false; + this.xrTableCell12.Text = "Entgeld-stufe"; + this.xrTableCell12.Weight = 0.064469634349203719D; // - // bindingSource1 + // xrTableCell13 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO); + this.xrTableCell13.BackColor = System.Drawing.SystemColors.Control; + this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell13.Multiline = true; + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.StylePriority.UseBackColor = false; + this.xrTableCell13.StylePriority.UseFont = false; + this.xrTableCell13.Text = "Kommentar"; + this.xrTableCell13.Weight = 0.2353141307659099D; + // + // xrTableCell14 + // + this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field15")}); + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.Weight = 0.064469697605855886D; + // + // xrTableCell15 + // + this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field16")}); + this.xrTableCell15.Multiline = true; + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.Weight = 0.23531416355430179D; // // Lohnliste // @@ -516,7 +557,7 @@ namespace Mittelpunkt this.DataSource = this.bindingSource1; this.Landscape = true; this.Margins = new DevExpress.Drawing.DXMargins(30F, 30F, 27.08333F, 30F); - this.PageHeight = 827; + this.PageHeight = 826; this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] { @@ -579,5 +620,9 @@ namespace Mittelpunkt private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; } }