MH: Perspektiven Urlaubs- und Stundenkonto

This commit is contained in:
2025-08-26 12:27:01 +02:00
parent 18a8ac7f53
commit 9d0ef852c8
4 changed files with 137 additions and 35 deletions

View File

@@ -32,8 +32,9 @@ namespace BeWo.Report.DefaultReports
this.components = new System.ComponentModel.Container();
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -85,7 +86,6 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
@@ -99,6 +99,10 @@ namespace BeWo.Report.DefaultReports
this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = 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();
@@ -133,7 +137,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowDetail});
this.xrTableDetail.SizeF = new System.Drawing.SizeF(1071F, 25F);
this.xrTableDetail.SizeF = new System.Drawing.SizeF(1111F, 25F);
this.xrTableDetail.StylePriority.UseBorders = false;
this.xrTableDetail.StylePriority.UseFont = false;
this.xrTableDetail.StylePriority.UsePadding = false;
@@ -154,6 +158,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell21,
this.xrTableCell25,
this.xrTableCell24,
this.xrTableCell29,
this.xrTableCell26,
this.xrTableCell6});
this.xrTableRowDetail.Name = "xrTableRowDetail";
@@ -242,7 +247,7 @@ namespace BeWo.Report.DefaultReports
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")});
this.xrTableCell25.Name = "xrTableCell25";
this.xrTableCell25.Text = "xrTableCell25";
this.xrTableCell25.Weight = 0.063119927862939587D;
this.xrTableCell25.Weight = 0.053439662333285884D;
//
// xrTableCell24
//
@@ -250,7 +255,7 @@ namespace BeWo.Report.DefaultReports
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")});
this.xrTableCell24.Name = "xrTableCell24";
this.xrTableCell24.Text = "xrTableCell24";
this.xrTableCell24.Weight = 0.0631199278629396D;
this.xrTableCell24.Weight = 0.065051650359775018D;
//
// xrTableCell26
//
@@ -258,7 +263,7 @@ namespace BeWo.Report.DefaultReports
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")});
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.Text = "xrTableCell26";
this.xrTableCell26.Weight = 0.063119927862939573D;
this.xrTableCell26.Weight = 0.061575393582698396D;
//
// xrTableCell6
//
@@ -299,7 +304,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowHeader});
this.xrTableHeader.SizeF = new System.Drawing.SizeF(1071F, 70F);
this.xrTableHeader.SizeF = new System.Drawing.SizeF(1111F, 70F);
this.xrTableHeader.StylePriority.UseBorders = false;
this.xrTableHeader.StylePriority.UseFont = false;
this.xrTableHeader.StylePriority.UsePadding = false;
@@ -320,6 +325,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell12,
this.xrTableCell13,
this.xrTableCell14,
this.xrTableCell18,
this.xrTableCell15,
this.xrTableCell1});
this.xrTableRowHeader.Name = "xrTableRowHeader";
@@ -391,20 +397,20 @@ namespace BeWo.Report.DefaultReports
//
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Text = "Überstd. neu";
this.xrTableCell13.Weight = 0.063119928687401447D;
this.xrTableCell13.Weight = 0.053439599403973248D;
//
// xrTableCell14
//
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseBackColor = false;
this.xrTableCell14.Text = "Überstd. Vormonat";
this.xrTableCell14.Weight = 0.063119928275170531D;
this.xrTableCell14.Weight = 0.065051586950130788D;
//
// xrTableCell15
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Text = "Überstd. Gesamt";
this.xrTableCell15.Weight = 0.0631199213956443D;
this.xrTableCell15.Weight = 0.061575465115128937D;
//
// xrTableCell1
//
@@ -431,7 +437,7 @@ namespace BeWo.Report.DefaultReports
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(1071F, 25F);
this.xrTable1.SizeF = new System.Drawing.SizeF(1111F, 25F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
@@ -452,6 +458,7 @@ namespace BeWo.Report.DefaultReports
this.cellRelationGesamt,
this.xrTableCell47,
this.xrTableCell48,
this.xrTableCell30,
this.xrTableCell51,
this.xrTableCell17});
this.xrTableRow1.Name = "xrTableRow1";
@@ -534,7 +541,7 @@ namespace BeWo.Report.DefaultReports
xrSummary1.FormatString = "{0:0.00}";
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell47.Summary = xrSummary1;
this.xrTableCell47.Weight = 0.062885088357332058D;
this.xrTableCell47.Weight = 0.053240694877519923D;
//
// xrTableCell48
//
@@ -544,17 +551,17 @@ namespace BeWo.Report.DefaultReports
xrSummary2.FormatString = "{0:0.00}";
xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell48.Summary = xrSummary2;
this.xrTableCell48.Weight = 0.062884978284913212D;
this.xrTableCell48.Weight = 0.064809590519044016D;
//
// xrTableCell51
//
this.xrTableCell51.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt")});
this.xrTableCell51.Name = "xrTableCell51";
xrSummary3.FormatString = "{0:0.00}";
xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell51.Summary = xrSummary3;
this.xrTableCell51.Weight = 0.062885088357332045D;
xrSummary4.FormatString = "{0:0.00}";
xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell51.Summary = xrSummary4;
this.xrTableCell51.Weight = 0.061346237735036668D;
//
// xrTableCell17
//
@@ -562,15 +569,11 @@ namespace BeWo.Report.DefaultReports
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Resturlaub")});
this.xrTableCell17.Multiline = true;
this.xrTableCell17.Name = "xrTableCell17";
xrSummary4.FormatString = "{0:0.00}";
xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell17.Summary = xrSummary4;
xrSummary5.FormatString = "{0:0.00}";
xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell17.Summary = xrSummary5;
this.xrTableCell17.Weight = 0.062885253465960314D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -616,7 +619,7 @@ namespace BeWo.Report.DefaultReports
// xrPageInfo2
//
this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(931F, 25F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(971.0002F, 25F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(139.9999F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
@@ -691,6 +694,38 @@ namespace BeWo.Report.DefaultReports
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrTableCell18
//
this.xrTableCell18.Multiline = true;
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.StylePriority.UseBackColor = false;
this.xrTableCell18.Text = "Anpassung Überstunden";
this.xrTableCell18.Weight = 0.072413055164153861D;
//
// xrTableCell29
//
this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenAusbezahlt")});
this.xrTableCell29.Multiline = true;
this.xrTableCell29.Name = "xrTableCell29";
this.xrTableCell29.TextFormatString = "{0:0.00}";
this.xrTableCell29.Weight = 0.072413005175999079D;
//
// xrTableCell30
//
this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenAusbezahlt")});
this.xrTableCell30.Multiline = true;
this.xrTableCell30.Name = "xrTableCell30";
xrSummary3.FormatString = "{0:0.00}";
xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell30.Summary = xrSummary3;
this.xrTableCell30.Weight = 0.07214361015288992D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// Mitarbeiterstundenkonto
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -704,7 +739,7 @@ namespace BeWo.Report.DefaultReports
this.fieldFLS});
this.DataSource = this.bindingSource1;
this.Landscape = true;
this.Margins = new DevExpress.Drawing.DXMargins(75F, 23F, 50F, 30F);
this.Margins = new DevExpress.Drawing.DXMargins(35F, 23F, 50F, 30F);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -790,5 +825,8 @@ namespace BeWo.Report.DefaultReports
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
}
}

View File

@@ -36,9 +36,10 @@ namespace BeWo.Report.DefaultReports
DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary8 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary9 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary10 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
@@ -107,6 +108,9 @@ namespace BeWo.Report.DefaultReports
this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.fieldRelationGesamt = new DevExpress.XtraReports.UI.CalculatedField();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -151,6 +155,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell23,
this.xrTableCell21,
this.xrTableCell25,
this.xrTableCell29,
this.xrTableCell24,
this.xrTableCell26,
this.xrTableCell6});
@@ -297,6 +302,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell11,
this.xrTableCell12,
this.xrTableCell13,
this.xrTableCell18,
this.xrTableCell14,
this.xrTableCell15,
this.xrTableCell1});
@@ -422,6 +428,7 @@ namespace BeWo.Report.DefaultReports
this.cellGesamtGesamt,
this.cellRelationGesamt,
this.xrTableCell47,
this.xrTableCell30,
this.xrTableCell48,
this.xrTableCell51,
this.xrTableCell17});
@@ -522,9 +529,9 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell48.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.LaufendeGesamtsumme")});
this.xrTableCell48.Name = "xrTableCell48";
xrSummary7.FormatString = "{0:0.00}";
xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell48.Summary = xrSummary7;
xrSummary8.FormatString = "{0:0.00}";
xrSummary8.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell48.Summary = xrSummary8;
this.xrTableCell48.Weight = 0.063119927862939587D;
//
// xrTableCell51
@@ -532,9 +539,9 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell51.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenGesamt")});
this.xrTableCell51.Name = "xrTableCell51";
xrSummary8.FormatString = "{0:0.00}";
xrSummary8.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell51.Summary = xrSummary8;
xrSummary9.FormatString = "{0:0.00}";
xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell51.Summary = xrSummary9;
this.xrTableCell51.Weight = 0.063119927862939573D;
//
// xrTableCell17
@@ -543,8 +550,8 @@ namespace BeWo.Report.DefaultReports
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Resturlaub")});
this.xrTableCell17.Multiline = true;
this.xrTableCell17.Name = "xrTableCell17";
xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell17.Summary = xrSummary9;
xrSummary10.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell17.Summary = xrSummary10;
this.xrTableCell17.TextFormatString = "{0:0.00}";
this.xrTableCell17.Weight = 0.063119927862939573D;
//
@@ -731,6 +738,33 @@ namespace BeWo.Report.DefaultReports
this.fieldRelationGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldRelationGesamt.Name = "fieldRelationGesamt";
//
// xrTableCell18
//
this.xrTableCell18.Multiline = true;
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.Text = "Anpass.\r\nÜber-stunden";
this.xrTableCell18.Weight = 0.063119928687401447D;
//
// xrTableCell29
//
this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenAusbezahlt")});
this.xrTableCell29.Multiline = true;
this.xrTableCell29.Name = "xrTableCell29";
this.xrTableCell29.TextFormatString = "{0:0.00}";
this.xrTableCell29.Weight = 0.063119927862939587D;
//
// xrTableCell30
//
this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenAusbezahlt")});
this.xrTableCell30.Multiline = true;
this.xrTableCell30.Name = "xrTableCell30";
xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell30.Summary = xrSummary7;
this.xrTableCell30.TextFormatString = "{0:0.00}";
this.xrTableCell30.Weight = 0.063119927862939587D;
//
// MitarbeiterstundenkontoJahr
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -834,5 +868,8 @@ namespace BeWo.Report.DefaultReports
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
}
}

View File

@@ -198,6 +198,7 @@
<Compile Include="Service\CustomEmployeeService.cs" />
<Compile Include="Service\CustomUserService.cs" />
<Compile Include="Service\CustomCustomerService.cs" />
<Compile Include="Service\CustomVacationService.cs" />
<Compile Include="SettlementReport.cs">
<SubType>Component</SubType>
</Compile>

View File

@@ -0,0 +1,26 @@
using BeWo.Service.Plugins;
using BS.Shared.DataContracts;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PerspektivenEV.Service
{
public class CustomVacationService : VacationService
{
public override List<FeiertagDC> GetFeiertage(int year, string bundesland)
{
var list = base.GetFeiertage(year, bundesland);
list.Add(new FeiertagDC() { Datum = new DateTime(year, 12, 31), Name = "Silvester" });
return list;
}
public override DateTime GetExpirationDate(int year)
{
return new DateTime(year, 12, 31);
}
}
}