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

BeWoRueckenwind: Summe geleistete Stunden in Spitzabrechnung hinzugefügt

Browse Source
This commit is contained in:
Kojo
2023-08-28 18:43:51 +02:00
parent 9c2a98a729
commit 99dca7e0b1
4 changed files with 976 additions and 886 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1770
ReportImp/BeWoRueckenwind/SettlementReport.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

6
ReportImp/BeWoRueckenwind/SettlementReport.cs
View File

@@ -69,9 +69,11 @@ namespace BeWoRueckenwind
pRO.RateFactorText2 = null;
}
}
this.bindingSource1.DataSource = pRO;
decimal hours = (pRO.GeleisteteFLSMitStundensatz3 ?? 0) + (pRO.GeleisteteFLSMitStundensatzAlt ?? 0) + (pRO.GeleisteteFLSMitStundensatzAktuell ?? 0);
cellGeleisteteStunden.Text = String.Format("{0:0.00} FLS", hours);
this.bindingSource1.DataSource = pRO;
}
private String GetCustomerId(SettlementRO pRO)

78
ReportImp/BeWoRueckenwind/SettlementReport2.Designer.cs generated
View File

@@ -102,6 +102,7 @@ namespace BeWoRueckenwind.Neu
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -122,15 +123,17 @@ namespace BeWoRueckenwind.Neu
this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellGeleisteteStunden = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -186,14 +189,15 @@ namespace BeWoRueckenwind.Neu
// xrTable1
//
this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 327.2915F);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 317.2915F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow9,
this.xrTableRow10,
this.xrTableRow5,
this.xrTableRow11,
this.rowErbrachteLeistung});
this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 68F);
this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 85F);
this.xrTable1.StylePriority.UseBorderColor = false;
//
// xrTableRow9
@@ -317,7 +321,7 @@ namespace BeWoRueckenwind.Neu
//
// xrLabel6
//
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 271.7499F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 261.7499F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -327,7 +331,7 @@ namespace BeWoRueckenwind.Neu
//
// xrLabel5
//
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 244.75F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 234.75F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
@@ -339,7 +343,7 @@ namespace BeWoRueckenwind.Neu
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 210.75F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 205.75F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -354,7 +358,7 @@ namespace BeWoRueckenwind.Neu
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 194.75F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 189.75F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F);
@@ -368,7 +372,7 @@ namespace BeWoRueckenwind.Neu
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 177.75F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 172.75F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 17F);
@@ -440,14 +444,14 @@ namespace BeWoRueckenwind.Neu
this.xrLabel12,
this.lblNotice});
this.ReportFooter.Font = new System.Drawing.Font("Arial", 10F);
this.ReportFooter.HeightF = 181.7501F;
this.ReportFooter.HeightF = 178.7501F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// xrLabel10
//
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 111.6249F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108.6249F);
this.xrLabel10.Multiline = true;
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -457,7 +461,7 @@ namespace BeWoRueckenwind.Neu
//
// xrTable3
//
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 33F);
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 30F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow20,
@@ -549,7 +553,7 @@ namespace BeWoRueckenwind.Neu
//
// xrLabel12
//
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 164.7501F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 161.7501F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F);
@@ -560,7 +564,7 @@ namespace BeWoRueckenwind.Neu
//
this.lblNotice.CanShrink = true;
this.lblNotice.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Italic);
this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 7.999992F);
this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 4.999992F);
this.lblNotice.Name = "lblNotice";
this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblNotice.SizeF = new System.Drawing.SizeF(250F, 25F);
@@ -656,7 +660,7 @@ namespace BeWoRueckenwind.Neu
this.xrTable1,
this.xrLabel8});
this.GroupHeader1.Font = new System.Drawing.Font("Arial", 10F);
this.GroupHeader1.HeightF = 395.2915F;
this.GroupHeader1.HeightF = 402.2915F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
@@ -884,6 +888,10 @@ namespace BeWoRueckenwind.Neu
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.Weight = 3D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1100,9 +1108,40 @@ namespace BeWoRueckenwind.Neu
this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell58.Weight = 0.21685899000901443D;
//
// bindingSource1
// xrTableRow5
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell12,
this.cellGeleisteteStunden});
this.xrTableRow5.Name = "xrTableRow5";
this.xrTableRow5.Weight = 0.085D;
//
// xrTableCell12
//
this.xrTableCell12.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell12.StylePriority.UseBorderColor = false;
this.xrTableCell12.StylePriority.UseBorders = false;
this.xrTableCell12.StylePriority.UsePadding = false;
this.xrTableCell12.Text = "Geleistete Stunden gesamt:";
this.xrTableCell12.Weight = 0.78314100999098568D;
//
// cellGeleisteteStunden
//
this.cellGeleisteteStunden.BorderColor = System.Drawing.SystemColors.ControlLight;
this.cellGeleisteteStunden.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
this.cellGeleisteteStunden.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cellGeleisteteStunden.Name = "cellGeleisteteStunden";
this.cellGeleisteteStunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.cellGeleisteteStunden.StylePriority.UseBorderColor = false;
this.cellGeleisteteStunden.StylePriority.UseBorders = false;
this.cellGeleisteteStunden.StylePriority.UseFont = false;
this.cellGeleisteteStunden.StylePriority.UsePadding = false;
this.cellGeleisteteStunden.StylePriority.UseTextAlignment = false;
this.cellGeleisteteStunden.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.cellGeleisteteStunden.Weight = 0.21685899000901443D;
//
// Spitzabrechnung
//
@@ -1130,8 +1169,8 @@ namespace BeWoRueckenwind.Neu
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1230,5 +1269,8 @@ namespace BeWoRueckenwind.Neu
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell cellGeleisteteStunden;
}
}

8
ReportImp/BeWoRueckenwind/SettlementReport2.cs
View File

@@ -36,10 +36,13 @@ namespace BeWoRueckenwind.Neu
}
}
decimal hours = 0;
if (pRO.InvoiceItems != null)
{
foreach (var ii in pRO.InvoiceItems)
{
hours += ii.UnitCount ?? 0;
ii.ItemDescription = "Fachleistungsstunden";
if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0)
@@ -49,9 +52,12 @@ namespace BeWoRueckenwind.Neu
ii.ItemDescription = "Fehlkontakte";
}
}
}
this.bindingSource1.DataSource = pRO;
cellGeleisteteStunden.Text = String.Format("{0:0.00}", hours);
this.bindingSource1.DataSource = pRO;
}
private String GetCustomerId(SettlementRO pRO)