ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MH: Haus Dülken + Standard-Stundenkontoberechnung

Browse Source
This commit is contained in:
Marcel Hirschle
2024-01-24 16:13:37 +01:00
parent 9ceca922f2
commit 55e1f0ed68
3 changed files with 113 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
View File

@@ -1837,8 +1837,7 @@ namespace BeWo.Report.ReportObjects
DateTime day = span.StartDate;
var faktor = GetFeiertagsFaktor(day);
if (faktor < 1 && day.DayOfWeek != DayOfWeek.Saturday && day.DayOfWeek != DayOfWeek.Sunday)
if (faktor < 1 && (day.DayOfWeek != DayOfWeek.Saturday || ed.ArbeitstageProWoche == 6) && (day.DayOfWeek != DayOfWeek.Sunday || ed.ArbeitstageProWoche > 6)) // Prüfung auf 6 + bzw 7 Tage Woche eingefügt
{
//Berechne Soll, entweder aus Vertrag oder Arbeitszeiten
var sollDiesenTag = ed.SollProTag;

6
ReportImp/HausDuelken/Mitarbeiterarbeitszeitkonto.cs
View File

@@ -36,7 +36,11 @@ namespace HausDuelken
ed.Regelarbeitszeit = String.Format("{0:0.00} Stunden pro Woche", c.WeeklyTotalHours);
}
}
foreach (var day in ed.Days)
{
ed.Custom10 += day.HoursSick + day.HoursInVacation;
}
}
this.bindingSource1.DataSource = pRO;
}

130
ReportImp/HausDuelken/Mitarbeiterarbeitszeitkonto.designer.cs generated
View File

@@ -97,7 +97,6 @@ namespace HausDuelken
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
@@ -115,6 +114,14 @@ namespace HausDuelken
this.fieldSumHoliday2 = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = 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.xrTable2)).BeginInit();
@@ -492,7 +499,7 @@ namespace HausDuelken
this.xrTable4,
this.xrTable1});
this.GroupFooter2.Font = new System.Drawing.Font("Arial", 10F);
this.GroupFooter2.HeightF = 85F;
this.GroupFooter2.HeightF = 125F;
this.GroupFooter2.KeepTogether = true;
this.GroupFooter2.Name = "GroupFooter2";
this.GroupFooter2.StylePriority.UseFont = false;
@@ -587,9 +594,10 @@ namespace HausDuelken
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow4,
this.xrTableRow3,
this.xrTableRow5,
this.xrTableRow6});
this.xrTable1.SizeF = new System.Drawing.SizeF(669.9999F, 60F);
this.xrTable1.SizeF = new System.Drawing.SizeF(669.9999F, 80F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
@@ -616,7 +624,7 @@ namespace HausDuelken
this.xrTableCell46.StylePriority.UseTextAlignment = false;
this.xrTableCell46.Text = "Arbeitszeit:";
this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell46.Weight = 0.0899362101431268D;
this.xrTableCell46.Weight = 0.0989297277571516D;
//
// cellSumMinutesTotalDecimal2
//
@@ -632,7 +640,7 @@ namespace HausDuelken
this.cellSumMinutesTotalDecimal2.Summary = xrSummary4;
this.cellSumMinutesTotalDecimal2.Text = "cellSumMinutesTotalDecimal2";
this.cellSumMinutesTotalDecimal2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.cellSumMinutesTotalDecimal2.Weight = 0.071948964683863317D;
this.cellSumMinutesTotalDecimal2.Weight = 0.062955447069838522D;
//
// xrTableCell17
//
@@ -640,19 +648,15 @@ namespace HausDuelken
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.StylePriority.UseBorders = false;
this.xrTableCell17.StylePriority.UseTextAlignment = false;
this.xrTableCell17.Text = "Überstunden neu:";
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell17.Weight = 0.14389792524594167D;
//
// xrTableCell15
//
this.xrTableCell15.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")});
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.StylePriority.UseBorders = false;
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.Text = "xrTableCell15";
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell15.Weight = 0.0719489609431911D;
//
@@ -662,15 +666,12 @@ namespace HausDuelken
this.xrTableCell41.Name = "xrTableCell41";
this.xrTableCell41.StylePriority.UseBorders = false;
this.xrTableCell41.StylePriority.UseTextAlignment = false;
this.xrTableCell41.Text = "Überstunden Gesamt:";
this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell41.Weight = 0.14389779473226938D;
//
// xrTableCell55
//
this.xrTableCell55.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell55.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.fieldUeberstundenGesamt", "{0:0.00}")});
this.xrTableCell55.Name = "xrTableCell55";
this.xrTableCell55.StylePriority.UseBorders = false;
this.xrTableCell55.StylePriority.UseTextAlignment = false;
@@ -697,11 +698,11 @@ namespace HausDuelken
this.sollStundenMonatLabelTableCell.StylePriority.UseTextAlignment = false;
this.sollStundenMonatLabelTableCell.Text = "Soll-Stunden:";
this.sollStundenMonatLabelTableCell.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.sollStundenMonatLabelTableCell.Weight = 0.0899362025013637D;
this.sollStundenMonatLabelTableCell.Weight = 0.098929720115388489D;
//
// xrTableCell50
//
this.xrTableCell50.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTableCell50.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")});
this.xrTableCell50.Name = "xrTableCell50";
@@ -709,7 +710,7 @@ namespace HausDuelken
this.xrTableCell50.StylePriority.UseTextAlignment = false;
this.xrTableCell50.Text = "xrTableCell50";
this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell50.Weight = 0.071948963831937288D;
this.xrTableCell50.Weight = 0.062955446217912492D;
//
// xrTableCell51
//
@@ -724,7 +725,7 @@ namespace HausDuelken
//
// xrTableCell18
//
this.xrTableCell18.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTableCell18.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")});
this.xrTableCell18.Name = "xrTableCell18";
@@ -746,7 +747,7 @@ namespace HausDuelken
//
// xrTableCell13
//
this.xrTableCell13.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell13.Borders = DevExpress.XtraPrinting.BorderSide.Right;
this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenAusbezahlt", "{0:0.00}")});
this.xrTableCell13.Name = "xrTableCell13";
@@ -778,7 +779,7 @@ namespace HausDuelken
this.xrTableCell48.StylePriority.UseTextAlignment = false;
this.xrTableCell48.Text = "Differenz:";
this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell48.Weight = 0.0899362025013648D;
this.xrTableCell48.Weight = 0.0989297201153896D;
//
// xrTableCell57
//
@@ -791,7 +792,7 @@ namespace HausDuelken
this.xrTableCell57.StylePriority.UseTextAlignment = false;
this.xrTableCell57.Text = "xrTableCell57";
this.xrTableCell57.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell57.Weight = 0.071948963831938426D;
this.xrTableCell57.Weight = 0.06295544621791363D;
//
// xrTableCell58
//
@@ -839,10 +840,6 @@ namespace HausDuelken
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell14.Weight = 0.080942614161178317D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// Title
//
this.Title.BackColor = System.Drawing.Color.White;
@@ -972,6 +969,86 @@ namespace HausDuelken
this.fieldUeberstundenGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldUeberstundenGesamt.Name = "fieldUeberstundenGesamt";
//
// xrTableRow3
//
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell9,
this.xrTableCell16,
this.xrTableCell19,
this.xrTableCell22,
this.xrTableCell29,
this.xrTableCell30});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 0.8D;
//
// xrTableCell9
//
this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)));
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.StylePriority.UseBorders = false;
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "Abwesenheiten:";
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell9.Weight = 0.0989297277571516D;
//
// xrTableCell16
//
this.xrTableCell16.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom10", "{0:#.00}")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.StylePriority.UseBorders = false;
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.Text = "xrTableCell16";
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell16.Weight = 0.062955447069838522D;
//
// xrTableCell19
//
this.xrTableCell19.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.StylePriority.UseBorders = false;
this.xrTableCell19.StylePriority.UseTextAlignment = false;
this.xrTableCell19.Text = "Überstunden neu:";
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell19.Weight = 0.14389792524594167D;
//
// xrTableCell22
//
this.xrTableCell22.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")});
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.StylePriority.UseBorders = false;
this.xrTableCell22.StylePriority.UseTextAlignment = false;
this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell22.Weight = 0.0719489609431911D;
//
// xrTableCell29
//
this.xrTableCell29.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrTableCell29.Name = "xrTableCell29";
this.xrTableCell29.StylePriority.UseBorders = false;
this.xrTableCell29.StylePriority.UseTextAlignment = false;
this.xrTableCell29.Text = "Überstunden Gesamt:";
this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell29.Weight = 0.14389779473226938D;
//
// xrTableCell30
//
this.xrTableCell30.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.fieldUeberstundenGesamt", "{0:0.00}")});
this.xrTableCell30.Name = "xrTableCell30";
this.xrTableCell30.StylePriority.UseBorders = false;
this.xrTableCell30.StylePriority.UseTextAlignment = false;
this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell30.Weight = 0.080942610501736539D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// Mitarbeiterarbeitszeitkonto
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1097,5 +1174,12 @@ namespace HausDuelken
private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
private DevExpress.XtraReports.UI.CalculatedField fieldUeberstundenGesamt;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
}
}