HPHBersenbrueck/Finanzauswertung Rechnungen im Monat mit Betrag ergänzt

This commit is contained in:
2023-11-15 16:48:51 +01:00
parent 0ecc16ea69
commit 8ba639c4fb
2 changed files with 31 additions and 34 deletions

View File

@@ -25,6 +25,8 @@ namespace HphBersenbrueck
public void SetReportDataSource(FinanceRO pRO)
{
pRO.CalculatePaidAmountInReportTimeSpan();
if (pRO.SupportConceptFinanceList != null)
{
foreach (var scRo in pRO.SupportConceptFinanceList)
@@ -50,7 +52,6 @@ namespace HphBersenbrueck
cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:MMMM}", start);
cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:MMMM}", start);
cellFehlkontakteHeader.Text = String.Format("Fehl-\nkontakte {0:MMMM}", start);
}
else
{
@@ -58,7 +59,6 @@ namespace HphBersenbrueck
cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
//cellFehlkontakteHeader.Text = String.Format("Fehl-\nkontakte {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
}
if (pRO.RateFactor.HasValue)
{
@@ -80,13 +80,12 @@ namespace HphBersenbrueck
cellRateFactorHeader.Visible = false;
cellRateFactor.Visible = false;
}
this.bindingSource1.DataSource = pRO;
}
private void CalculateBillableAmountInReportTimeSpan(FinanceRO.SupportConceptFinanceRO scRo, DateTime start, DateTime end)
{
Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> dict = new Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>>();
CompactSupportConceptDC sc = CreateCompactSupportConcept(scRo.Costbearer2Supportconcept);
if (scRo.ServiceRecords != null)
{
@@ -107,8 +106,6 @@ namespace HphBersenbrueck
DateTimeSpan span = new DateTimeSpan();
span.StartDate = start;
span.EndDate = end;
var invoices = creator.GenerateServiceInvoices(scRo.Costbearer2Supportconcept.CostBearer.CostBearerOid.Value, span, dict);
if (invoices != null && invoices.Count == 1)

View File

@@ -89,6 +89,8 @@ namespace HphBersenbrueck
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
@@ -102,8 +104,6 @@ namespace HphBersenbrueck
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -192,7 +192,7 @@ namespace HphBersenbrueck
// xrTableCell9
//
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountPaid", "{0:c}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountPaidInReportTimeSpan", "{0:c}")});
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "xrTableCell9";
@@ -377,7 +377,7 @@ namespace HphBersenbrueck
//
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Bereits gezahlt";
this.xrTableCell4.Text = "Bereits in Rechnung gestellt";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell4.Weight = 0.44313146335503761D;
//
@@ -523,7 +523,7 @@ namespace HphBersenbrueck
//
this.xrTableCell18.CanGrow = false;
this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountPaid")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountPaidInReportTimeSpan")});
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.StylePriority.UseTextAlignment = false;
xrSummary2.FormatString = "{0:c}";
@@ -641,6 +641,29 @@ namespace HphBersenbrueck
this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell27.Weight = 0.31019202365054621D;
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel1});
this.GroupHeader1.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
new DevExpress.XtraReports.UI.GroupField("Custom1", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
this.GroupHeader1.HeightF = 45.83333F;
this.GroupHeader1.Level = 1;
this.GroupHeader1.Name = "GroupHeader1";
//
// xrLabel1
//
this.xrLabel1.CanShrink = true;
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Custom1")});
this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(1074F, 23F);
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "xrLabel1";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO);
@@ -746,29 +769,6 @@ namespace HphBersenbrueck
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel1});
this.GroupHeader1.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
new DevExpress.XtraReports.UI.GroupField("Custom1", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
this.GroupHeader1.HeightF = 45.83333F;
this.GroupHeader1.Level = 1;
this.GroupHeader1.Name = "GroupHeader1";
//
// xrLabel1
//
this.xrLabel1.CanShrink = true;
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Custom1")});
this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(1074F, 23F);
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "xrLabel1";
//
// Finanzauswertung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {