SeWo/Zeitzuschlagsbeleg - Umstellung 24./31.12. Zuschlag nur bis 22 Uhr

This commit is contained in:
2025-11-27 11:32:58 +01:00
parent 6400f2fe4c
commit f4b829dcf0
2 changed files with 32 additions and 32 deletions

View File

@@ -33,6 +33,8 @@ namespace BeWo.SeWo
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.lblhdPauseGesamt = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.lblNotGesamt = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
@@ -586,8 +588,6 @@ namespace BeWo.SeWo
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.lblhdPauseGesamt = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.table1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
@@ -630,6 +630,31 @@ namespace BeWo.SeWo
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// lblhdPauseGesamt
//
this.lblhdPauseGesamt.LocationFloat = new DevExpress.Utils.PointFloat(980.0829F, 20.00001F);
this.lblhdPauseGesamt.Multiline = true;
this.lblhdPauseGesamt.Name = "lblhdPauseGesamt";
this.lblhdPauseGesamt.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblhdPauseGesamt.SizeF = new System.Drawing.SizeF(66.91675F, 20F);
this.lblhdPauseGesamt.StylePriority.UseBorders = false;
this.lblhdPauseGesamt.StylePriority.UseFont = false;
this.lblhdPauseGesamt.StylePriority.UseTextAlignment = false;
this.lblhdPauseGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel11
//
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(909.9997F, 20.00001F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(70.08313F, 20F);
this.xrLabel11.StylePriority.UseBorders = false;
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.Text = "HD Pause:";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// lblNotGesamt
//
this.lblNotGesamt.LocationFloat = new DevExpress.Utils.PointFloat(957.9997F, 39.99999F);
@@ -4548,7 +4573,7 @@ namespace BeWo.SeWo
this.xrTableCell477.Name = "xrTableCell477";
this.xrTableCell477.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTableCell477.StylePriority.UsePadding = false;
this.xrTableCell477.Text = "18:00 - 23:00";
this.xrTableCell477.Text = "18:00 - 22:00";
this.xrTableCell477.Weight = 0.10216436415059235D;
//
// xrTableCell478
@@ -4824,31 +4849,6 @@ namespace BeWo.SeWo
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO.EmployeeDetail);
//
// xrLabel11
//
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(909.9997F, 20.00001F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(70.08313F, 20F);
this.xrLabel11.StylePriority.UseBorders = false;
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.Text = "HD Pause:";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// lblhdPauseGesamt
//
this.lblhdPauseGesamt.LocationFloat = new DevExpress.Utils.PointFloat(980.0829F, 20.00001F);
this.lblhdPauseGesamt.Multiline = true;
this.lblhdPauseGesamt.Name = "lblhdPauseGesamt";
this.lblhdPauseGesamt.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblhdPauseGesamt.SizeF = new System.Drawing.SizeF(66.91675F, 20F);
this.lblhdPauseGesamt.StylePriority.UseBorders = false;
this.lblhdPauseGesamt.StylePriority.UseFont = false;
this.lblhdPauseGesamt.StylePriority.UseTextAlignment = false;
this.lblhdPauseGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// Zeitzuschlagsbeleg
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

View File

@@ -192,9 +192,9 @@ namespace BeWo.SeWo
{
AddValueToCell(zs.MinutenSonntag6_22, datum, table1.Rows[4], sonntag2Minuten);
}
if (zs.MinutenHeiligabendSilvester18_23 > 0)
if (zs.MinutenHeiligabendSilvester18_22 > 0)
{
AddValueToCell(zs.MinutenHeiligabendSilvester18_23, datum, table1.Rows[13], heiligSil2Minuten);
AddValueToCell(zs.MinutenHeiligabendSilvester18_22, datum, table1.Rows[13], heiligSil2Minuten);
}
}
}
@@ -333,7 +333,7 @@ namespace BeWo.SeWo
{
if (datum.Month == 12 && (datum.Day == 24 || datum.Day == 31))
{
zv.MinutenHeiligabendSilvester18_23 = CheckUhrzeiten(datum, 18, 23, (double) duration);
zv.MinutenHeiligabendSilvester18_22 = CheckUhrzeiten(datum, 18, 22, (double) duration);
if (sr.Start.Value.DayOfWeek == DayOfWeek.Saturday)
{
@@ -433,7 +433,7 @@ namespace BeWo.SeWo
public double MinutenNachtSchlaf22_6 { get; set; }
public double MinutenNachtwache22_6 { get; set; }
public double MinutenFeiertag6_22 { get; set; }
public double MinutenHeiligabendSilvester18_23 { get; set; }
public double MinutenHeiligabendSilvester18_22 { get; set; }
}
}