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

Perseh Schnittstelle, diverse Todos fürs Release + Anpassungen Schulbegleitung Hildmann/Kloss Betreuungszeiten

Browse Source
This commit is contained in:
Christian
2024-09-01 20:47:02 +02:00
parent a8fe8cd6b0
commit 188c16d467
50 changed files with 2483 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Report/DefaultReports/Mitarbeiterarbeitszeitkonto.designer.cs generated
View File

@@ -102,6 +102,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell26 = 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();
@@ -120,7 +121,6 @@ namespace BeWo.Report.DefaultReports
this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldTatsSoll = new DevExpress.XtraReports.UI.CalculatedField();
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();
@@ -808,7 +808,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell51.StylePriority.UseFont = false;
this.xrTableCell51.StylePriority.UsePadding = false;
this.xrTableCell51.StylePriority.UseTextAlignment = false;
this.xrTableCell51.Text = "davon ausbezahlt:";
this.xrTableCell51.Text = "Anpassung Überstunden:";
this.xrTableCell51.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell51.Weight = 0.22133303497678214D;
//
@@ -891,6 +891,10 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell26.Weight = 0.11143081848591821D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// Title
//
this.Title.BackColor = System.Drawing.Color.White;
@@ -1027,10 +1031,6 @@ namespace BeWo.Report.DefaultReports
this.fieldTatsSoll.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldTatsSoll.Name = "fieldTatsSoll";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// Mitarbeiterarbeitszeitkonto
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

2
Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
View File

@@ -1719,7 +1719,7 @@ namespace BeWo.Report.ReportObjects
{
if (dd.Feiertag != null)
{
dd.MinutesTotal = dd.SollStunden * 60;
dd.MinutesTotal = dd.SollStunden * 60 * GetFeiertagsFaktor(dd.Date);
TimeSpan tspan = TimeSpan.FromMinutes((double)dd.MinutesTotal);
dd.TimeTotal = String.Format("{0:00}:{1:00}", tspan.Hours, tspan.Minutes);
}