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

LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.cs - Finetuning

Browse Source
This commit is contained in:
Alexandra
2024-09-23 15:46:25 +02:00
parent 3b82d7ae7e
commit 07577b2550
3 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ReportImp/LebenshilfeWolfsburg/Reporting/CustomReportCreator.cs
View File

@@ -194,6 +194,19 @@ namespace LebenshilfeWolfsburg.Reporting
private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid)
{
XtraReport report = null;
String kt = "";
if (!String.IsNullOrWhiteSpace(ro.Costbearer))
kt = ro.Costbearer.Trim();
String function = "";
if (ro.CostBearer2SupportConceptList != null)
{
foreach (var c2s in ro.CostBearer2SupportConceptList)
{
if (c2s.CostBearer.Organisation.Function != null && !String.IsNullOrWhiteSpace(ro.Costbearer) && c2s.CostBearer.Organisation.Name == ro.Costbearer)
function = c2s.CostBearer.Organisation.Function.Value;
}
}
ServicesOverviewRO newRo = ServicesOverviewRO.CopyFromRO(ro);
ServicesOverviewRO oldRo = ServicesOverviewRO.CopyFromRO(ro);
@@ -204,7 +217,7 @@ namespace LebenshilfeWolfsburg.Reporting
{
foreach (ServicesOverviewRO.ServiceDetail s in ro.Services)
{
if (ro.Costbearer.Contains("2024"))
if (ro.Costbearer.Contains("2024") || function.Contains("2024"))
{
newRo.Services.Add(s);
newRo.TotalFLMBillable += s.Minutes;

41
ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.Designer.cs generated
View File

@@ -61,6 +61,7 @@ namespace LebenshilfeWolfsburg.Reporting
this.columnWegepauschaleQuali = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
@@ -102,7 +103,6 @@ namespace LebenshilfeWolfsburg.Reporting
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
this.wennGruppeAnzPersonen = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -200,7 +200,7 @@ namespace LebenshilfeWolfsburg.Reporting
// xrTableCell2
//
this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice3")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice2")});
this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.StylePriority.UseFont = false;
@@ -211,7 +211,7 @@ namespace LebenshilfeWolfsburg.Reporting
// xrTableCell10
//
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice2")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice3")});
this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.StylePriority.UseFont = false;
@@ -229,7 +229,7 @@ namespace LebenshilfeWolfsburg.Reporting
this.xrTableCell12.StylePriority.UseFont = false;
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell12.Weight = 0.11363635577531736D;
this.xrTableCell12.Weight = 0.10101021354459513D;
//
// xrTableCell15
//
@@ -241,7 +241,7 @@ namespace LebenshilfeWolfsburg.Reporting
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.Text = "xrTableCell15";
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell15.Weight = 0.1515152680795013D;
this.xrTableCell15.Weight = 0.16414141031022353D;
//
// xrTableCell33
//
@@ -296,7 +296,7 @@ namespace LebenshilfeWolfsburg.Reporting
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableServiceRecords1});
this.GroupHeader1.HeightF = 94.51923F;
this.GroupHeader1.HeightF = 73.06093F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.RepeatEveryPage = true;
//
@@ -309,7 +309,7 @@ namespace LebenshilfeWolfsburg.Reporting
this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(1089F, 94.51923F);
this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(1089F, 73.06093F);
this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
this.xrTableServiceRecords1.StylePriority.UseBorders = false;
this.xrTableServiceRecords1.StylePriority.UseFont = false;
@@ -332,7 +332,7 @@ namespace LebenshilfeWolfsburg.Reporting
this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow2.StylePriority.UseTextAlignment = false;
this.xrTableRow2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableRow2.Weight = 3.3328619635248762D;
this.xrTableRow2.Weight = 2.5762162848623165D;
//
// xrTableCell3
//
@@ -425,7 +425,7 @@ namespace LebenshilfeWolfsburg.Reporting
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.Text = "Bei Gruppen-angebot:\r\nAnzahl der IP";
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell6.Weight = 0.25139662637348237D;
this.xrTableCell6.Weight = 0.22346366677234347D;
//
// xrTableCell7
//
@@ -444,7 +444,7 @@ namespace LebenshilfeWolfsburg.Reporting
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "Dauer in Minuten direkt mit der IP oder mit mehreren IP bei Gruppen-angebot ";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell7.Weight = 0.33519551047199908D;
this.xrTableCell7.Weight = 0.363128470073138D;
//
// xrTableCell8
//
@@ -519,6 +519,10 @@ namespace LebenshilfeWolfsburg.Reporting
this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell32.Weight = 1.0307263240210649D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -906,13 +910,14 @@ namespace LebenshilfeWolfsburg.Reporting
//
this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel16});
this.topMarginBand1.HeightF = 51.04167F;
this.topMarginBand1.Name = "topMarginBand1";
//
// xrLabel16
//
this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
this.xrLabel16.ForeColor = System.Drawing.Color.Black;
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0F, 74.99998F);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0F, 26.04165F);
this.xrLabel16.Multiline = true;
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1092,9 +1097,9 @@ namespace LebenshilfeWolfsburg.Reporting
this.xrLabel2.BorderWidth = 2F;
this.xrLabel2.CanGrow = false;
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(184.8751F, 0F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(184.8752F, 0F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.SizeF = new System.Drawing.SizeF(205.1248F, 21F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(195.1248F, 21F);
this.xrLabel2.StylePriority.UseBackColor = false;
this.xrLabel2.StylePriority.UseBorders = false;
this.xrLabel2.StylePriority.UseBorderWidth = false;
@@ -1115,9 +1120,9 @@ namespace LebenshilfeWolfsburg.Reporting
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Minutes")});
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(390F, 0F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(380.0001F, 0F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.SizeF = new System.Drawing.SizeF(120F, 21F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(130F, 21F);
this.xrLabel1.StylePriority.UseBackColor = false;
this.xrLabel1.StylePriority.UseBorders = false;
this.xrLabel1.StylePriority.UseBorderWidth = false;
@@ -1142,10 +1147,6 @@ namespace LebenshilfeWolfsburg.Reporting
this.wennGruppeAnzPersonen.Expression = "Iif([CustomerCount] > 1,[CustomerCount],\'\')";
this.wennGruppeAnzPersonen.Name = "wennGruppeAnzPersonen";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// Leistungsnachweis2024
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1167,7 +1168,7 @@ namespace LebenshilfeWolfsburg.Reporting
this.formattingRuleCostBearer,
this.formattingRuleEmployeeName});
this.Landscape = true;
this.Margins = new DevExpress.Drawing.DXMargins(40F, 40F, 100F, 40F);
this.Margins = new DevExpress.Drawing.DXMargins(40F, 40F, 51.04167F, 40F);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;

4
ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.cs
View File

@@ -44,10 +44,10 @@ namespace LebenshilfeWolfsburg.Reporting
minuten += sd.Minutes;
ServicesOverviewRO.CreateSignatureString(sd);
sd.Notice2 = "";
sd.Notice3 = "";
if (sd.IsGroup)
{
sd.Notice2 = "1";
sd.Notice3 = "1";
}
// Felder für Wegepauschale setzen (Wenn FLS FaceToFace, dann ja)