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

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo into master

Browse Source
This commit is contained in:
Marcel Hirschle
2022-08-03 10:51:36 +02:00
parent 9de3d0f7a0 428cc4a55a
commit a05ab11de5
8 changed files with 318 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ReportImp/AKGG/Invoicing/CustomInvoiceCreation.cs Normal file
View File

@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.Invoicing;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Services;
namespace Akgg.Invoicing
{
public class CustomInvoiceCreation : InvoiceCreation
{
public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc)
{
return itemList;
}
}
}

20
ReportImp/AKGG/Invoicing/CustomInvoiceFactory.cs Normal file
View File

@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.Invoicing;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
namespace Akgg.Invoicing
{
public class CustomInvoiceFactory : InvoiceFactory
{
public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
{
return new CustomInvoiceCreation();
}
}
}

214
ReportImp/FreundeskreisSuchthilfe/Mitarbeiterstundenkonto.designer.cs generated
View File

@@ -34,7 +34,6 @@ namespace FreundeskreisSuchthilfe.Alt
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -77,7 +76,6 @@ namespace FreundeskreisSuchthilfe.Alt
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
@@ -90,6 +88,18 @@ namespace FreundeskreisSuchthilfe.Alt
this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.fieldFLSSollIst = new DevExpress.XtraReports.UI.CalculatedField();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.fieldStundenZuFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
this.fieldRelationFlsIst = new DevExpress.XtraReports.UI.CalculatedField();
this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.fieldRelationFLSStunden = new DevExpress.XtraReports.UI.CalculatedField();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -122,7 +132,7 @@ namespace FreundeskreisSuchthilfe.Alt
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowDetail});
this.xrTableDetail.SizeF = new System.Drawing.SizeF(1005F, 25F);
this.xrTableDetail.SizeF = new System.Drawing.SizeF(1023.833F, 25F);
this.xrTableDetail.StylePriority.UseBorders = false;
this.xrTableDetail.StylePriority.UseFont = false;
this.xrTableDetail.StylePriority.UsePadding = false;
@@ -138,8 +148,10 @@ namespace FreundeskreisSuchthilfe.Alt
this.xrTableCell28,
this.xrTableCell16,
this.xrTableCell27,
this.xrTableCell6,
this.xrTableCell22,
this.xrTableCell23,
this.xrTableCell31,
this.xrTableCell21,
this.xrTableCell25,
this.xrTableCell24,
@@ -147,26 +159,13 @@ namespace FreundeskreisSuchthilfe.Alt
this.xrTableRowDetail.Name = "xrTableRowDetail";
this.xrTableRowDetail.Weight = 1D;
//
// xrTableCell3
//
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")});
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseFont = false;
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "xrTableCell3";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell3.Weight = 0.15329125338142471D;
//
// xrTableCell19
//
this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")});
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Text = "xrTableCell19";
this.xrTableCell19.Weight = 0.081154151689479551D;
this.xrTableCell19.Weight = 0.052036364482279059D;
//
// xrTableCell20
//
@@ -174,7 +173,7 @@ namespace FreundeskreisSuchthilfe.Alt
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")});
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Text = "xrTableCell20";
this.xrTableCell20.Weight = 0.094679933071566441D;
this.xrTableCell20.Weight = 0.058611358356288022D;
//
// xrTableCell28
//
@@ -182,7 +181,7 @@ namespace FreundeskreisSuchthilfe.Alt
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Text = "xrTableCell28";
this.xrTableCell28.Weight = 0.0721370604147881D;
this.xrTableCell28.Weight = 0.06593779878170547D;
//
// xrTableCell16
//
@@ -190,7 +189,7 @@ namespace FreundeskreisSuchthilfe.Alt
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsSoll", "{0:0.00}")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Text = "xrTableCell16";
this.xrTableCell16.Weight = 0.063119927862939587D;
this.xrTableCell16.Weight = 0.058611324846785037D;
//
// xrTableCell27
//
@@ -198,7 +197,7 @@ namespace FreundeskreisSuchthilfe.Alt
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst", "{0:0.00}")});
this.xrTableCell27.Name = "xrTableCell27";
this.xrTableCell27.Text = "xrTableCell27";
this.xrTableCell27.Weight = 0.063119927862939615D;
this.xrTableCell27.Weight = 0.0586113783712133D;
//
// xrTableCell22
//
@@ -206,7 +205,7 @@ namespace FreundeskreisSuchthilfe.Alt
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsDiff", "{0:0.00}")});
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.Text = "xrTableCell22";
this.xrTableCell22.Weight = 0.063119927862939587D;
this.xrTableCell22.Weight = 0.058611355209136282D;
//
// xrTableCell23
//
@@ -214,7 +213,7 @@ namespace FreundeskreisSuchthilfe.Alt
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00}")});
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Text = "xrTableCell23";
this.xrTableCell23.Weight = 0.063119927862939559D;
this.xrTableCell23.Weight = 0.058611410245339564D;
//
// xrTableCell21
//
@@ -222,7 +221,7 @@ namespace FreundeskreisSuchthilfe.Alt
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.RelationFlsZuMittelbar", "{0:0.00}")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Text = "xrTableCell21";
this.xrTableCell21.Weight = 0.063119927862939615D;
this.xrTableCell21.Weight = 0.058611348329607016D;
//
// xrTableCell25
//
@@ -230,7 +229,7 @@ namespace FreundeskreisSuchthilfe.Alt
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")});
this.xrTableCell25.Name = "xrTableCell25";
this.xrTableCell25.Text = "xrTableCell25";
this.xrTableCell25.Weight = 0.063119927862939587D;
this.xrTableCell25.Weight = 0.0586112932934037D;
//
// xrTableCell24
//
@@ -238,7 +237,7 @@ namespace FreundeskreisSuchthilfe.Alt
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")});
this.xrTableCell24.Name = "xrTableCell24";
this.xrTableCell24.Text = "xrTableCell24";
this.xrTableCell24.Weight = 0.0631199278629396D;
this.xrTableCell24.Weight = 0.058611348329618743D;
//
// xrTableCell26
//
@@ -246,7 +245,7 @@ namespace FreundeskreisSuchthilfe.Alt
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")});
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.Text = "xrTableCell26";
this.xrTableCell26.Weight = 0.063119927862939573D;
this.xrTableCell26.Weight = 0.058611403365812248D;
//
// DetailReport
//
@@ -278,7 +277,7 @@ namespace FreundeskreisSuchthilfe.Alt
this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowHeader});
this.xrTableHeader.SizeF = new System.Drawing.SizeF(1005F, 70F);
this.xrTableHeader.SizeF = new System.Drawing.SizeF(1023.833F, 70F);
this.xrTableHeader.StylePriority.UseBorders = false;
this.xrTableHeader.StylePriority.UseFont = false;
this.xrTableHeader.StylePriority.UsePadding = false;
@@ -294,8 +293,10 @@ namespace FreundeskreisSuchthilfe.Alt
this.xrTableCell9,
this.xrTableCell8,
this.xrTableCell10,
this.xrTableCell18,
this.xrTableCell7,
this.xrTableCell11,
this.xrTableCell32,
this.xrTableCell12,
this.xrTableCell13,
this.xrTableCell14,
@@ -311,45 +312,45 @@ namespace FreundeskreisSuchthilfe.Alt
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Name";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell5.Weight = 0.15329125016467182D;
this.xrTableCell5.Weight = 0.15329125800607232D;
//
// xrTableCell4
//
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Text = "Reguläre SOLL Stunden";
this.xrTableCell4.Weight = 0.081154192324637608D;
this.xrTableCell4.Weight = 0.052036363872942665D;
//
// xrTableCell2
//
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Text = "Fehlzeiten Urlaub Krankheit(Tage)";
this.xrTableCell2.Weight = 0.094679896646570338D;
this.xrTableCell2.Weight = 0.0586113629994132D;
//
// xrTableCell9
//
this.xrTableCell9.Multiline = true;
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Text = "Tatsächliche SOLL Stunden";
this.xrTableCell9.Weight = 0.072137063712635591D;
this.xrTableCell9.Weight = 0.065937802282055175D;
//
// xrTableCell8
//
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Text = "FLS Stunden SOLL";
this.xrTableCell8.Weight = 0.063119927721024038D;
this.xrTableCell8.Weight = 0.0586113614450998D;
//
// xrTableCell10
//
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.StylePriority.UseBackColor = false;
this.xrTableCell10.Text = "FLS IST lfd. Monat";
this.xrTableCell10.Weight = 0.063119927721024D;
this.xrTableCell10.Weight = 0.058611361445099722D;
//
// xrTableCell7
//
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Text = "FLS Plus/Minus lfd. Monat";
this.xrTableCell7.Weight = 0.06311992757910842D;
this.xrTableCell7.Weight = 0.058611361303184173D;
//
// xrTableCell11
//
@@ -357,32 +358,32 @@ namespace FreundeskreisSuchthilfe.Alt
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UseBackColor = false;
this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat";
this.xrTableCell11.Weight = 0.063119927721024011D;
this.xrTableCell11.Weight = 0.05861136144509977D;
//
// xrTableCell12
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)";
this.xrTableCell12.Weight = 0.063119929511863376D;
this.xrTableCell12.Weight = 0.058611359973142964D;
//
// xrTableCell13
//
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Text = "Überstd. neu";
this.xrTableCell13.Weight = 0.063119928687401447D;
this.xrTableCell13.Weight = 0.058611358971714142D;
//
// xrTableCell14
//
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseBackColor = false;
this.xrTableCell14.Text = "Überstd. Vormonat";
this.xrTableCell14.Weight = 0.063119928275170531D;
this.xrTableCell14.Weight = 0.0586113619992463D;
//
// xrTableCell15
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Text = "Überstd. Gesamt";
this.xrTableCell15.Weight = 0.0631199213956443D;
this.xrTableCell15.Weight = 0.05861136199924602D;
//
// GroupFooter1
//
@@ -401,7 +402,7 @@ namespace FreundeskreisSuchthilfe.Alt
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(1005F, 25F);
this.xrTable1.SizeF = new System.Drawing.SizeF(1023.833F, 25F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
@@ -417,8 +418,10 @@ namespace FreundeskreisSuchthilfe.Alt
this.cellSollGesamt,
this.cellFLSSollGesamt,
this.cellFLSIstGesamt,
this.xrTableCell29,
this.cellFLSPlusMinusGesamt,
this.cellGesamtGesamt,
this.xrTableCell1,
this.cellRelationGesamt,
this.xrTableCell47,
this.xrTableCell48,
@@ -445,7 +448,7 @@ namespace FreundeskreisSuchthilfe.Alt
// xrTableCell39
//
this.xrTableCell39.Name = "xrTableCell39";
this.xrTableCell39.Weight = 0.094679919312514085D;
this.xrTableCell39.Weight = 0.029493574412477436D;
//
// cellSollGesamt
//
@@ -453,7 +456,7 @@ namespace FreundeskreisSuchthilfe.Alt
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SollGesamt", "{0:0.00}")});
this.cellSollGesamt.Name = "cellSollGesamt";
this.cellSollGesamt.Text = "cellSollGesamt";
this.cellSollGesamt.Weight = 0.0721370604147881D;
this.cellSollGesamt.Weight = 0.065937836821601647D;
//
// cellFLSSollGesamt
//
@@ -461,7 +464,7 @@ namespace FreundeskreisSuchthilfe.Alt
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsSollGesamt", "{0:0.00}")});
this.cellFLSSollGesamt.Name = "cellFLSSollGesamt";
this.cellFLSSollGesamt.Text = "cellFLSSollGesamt";
this.cellFLSSollGesamt.Weight = 0.063119927862939587D;
this.cellFLSSollGesamt.Weight = 0.0586113340689106D;
//
// cellFLSIstGesamt
//
@@ -469,7 +472,7 @@ namespace FreundeskreisSuchthilfe.Alt
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt", "{0:0.00}")});
this.cellFLSIstGesamt.Name = "cellFLSIstGesamt";
this.cellFLSIstGesamt.Text = "cellFLSIstGesamt";
this.cellFLSIstGesamt.Weight = 0.063119927862939615D;
this.cellFLSIstGesamt.Weight = 0.058611334068910642D;
//
// cellFLSPlusMinusGesamt
//
@@ -477,7 +480,7 @@ namespace FreundeskreisSuchthilfe.Alt
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsDiffGesamt", "{0:0.00}")});
this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt";
this.cellFLSPlusMinusGesamt.Text = "cellFLSPlusMinusGesamt";
this.cellFLSPlusMinusGesamt.Weight = 0.063119927862939587D;
this.cellFLSPlusMinusGesamt.Weight = 0.058611134945195771D;
//
// cellGesamtGesamt
//
@@ -485,7 +488,7 @@ namespace FreundeskreisSuchthilfe.Alt
new DevExpress.XtraReports.UI.XRBinding("Text", null, "StundenGesamt", "{0:0.00}")});
this.cellGesamtGesamt.Name = "cellGesamtGesamt";
this.cellGesamtGesamt.Text = "cellGesamtGesamt";
this.cellGesamtGesamt.Weight = 0.063119927862939573D;
this.cellGesamtGesamt.Weight = 0.058611359066708529D;
//
// cellRelationGesamt
//
@@ -493,26 +496,22 @@ namespace FreundeskreisSuchthilfe.Alt
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RelationFlsZuMittelbar", "{0:0.00}")});
this.cellRelationGesamt.Name = "cellRelationGesamt";
this.cellRelationGesamt.Text = "cellRelationGesamt";
this.cellRelationGesamt.Weight = 0.0631199278629396D;
this.cellRelationGesamt.Weight = 0.05861136182609529D;
//
// xrTableCell47
//
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.Weight = 0.063119927862939587D;
this.xrTableCell47.Weight = 0.058611361826095248D;
//
// xrTableCell48
//
this.xrTableCell48.Name = "xrTableCell48";
this.xrTableCell48.Weight = 0.063119927862939587D;
this.xrTableCell48.Weight = 0.058611358386332357D;
//
// xrTableCell51
//
this.xrTableCell51.Name = "xrTableCell51";
this.xrTableCell51.Weight = 0.063119927862939573D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
this.xrTableCell51.Weight = 0.058611406543013028D;
//
// ReportHeader
//
@@ -546,7 +545,7 @@ namespace FreundeskreisSuchthilfe.Alt
//
this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo2.Format = "Seite {0} von {1}";
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(864.9999F, 25F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(883.8333F, 25F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(139.9999F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
@@ -617,9 +616,90 @@ namespace FreundeskreisSuchthilfe.Alt
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.HeightF = 33F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// fieldFLSSollIst
//
this.fieldFLSSollIst.DataMember = "EmployeeDetailList";
this.fieldFLSSollIst.Expression = "Round([FlsIst]/[FlsSoll]*100, 2)";
this.fieldFLSSollIst.Name = "fieldFLSSollIst";
//
// xrTableCell6
//
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.fieldFLSSollIst", "{0:0.00}")});
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Text = "xrTableCell6";
this.xrTableCell6.Weight = 0.065825001055749024D;
//
// fieldStundenZuFLS
//
this.fieldStundenZuFLS.DataMember = "EmployeeDetailList";
this.fieldStundenZuFLS.Expression = "Round([FlsIst]/[StundenGesamtIst]*100, 2)";
this.fieldStundenZuFLS.Name = "fieldStundenZuFLS";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// xrTableCell18
//
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.Text = "FLS IST lfd. Monat / FLS Stunden SOLL (in %)";
this.xrTableCell18.Weight = 0.065825067186626035D;
//
// xrTableCell3
//
this.xrTableCell3.CanGrow = false;
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")});
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseFont = false;
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell3.Weight = 0.15329125869895341D;
//
// xrTableCell29
//
this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldRelationFlsIst", "{0:0.00}")});
this.xrTableCell29.Name = "xrTableCell29";
this.xrTableCell29.Weight = 0.0658251501828083D;
//
// fieldRelationFlsIst
//
this.fieldRelationFlsIst.Expression = "Round([FlsIstGesamt]/[FlsSollGesamt]*100, 2)";
this.fieldRelationFlsIst.Name = "fieldRelationFlsIst";
//
// xrTableCell31
//
this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.fieldStundenZuFLS")});
this.xrTableCell31.Name = "xrTableCell31";
this.xrTableCell31.Text = "xrTableCell31";
this.xrTableCell31.Weight = 0.058611410245339564D;
//
// xrTableCell32
//
this.xrTableCell32.Name = "xrTableCell32";
this.xrTableCell32.Text = "FLS IST / Gesamt-stunden lfd. Monat (in %)";
this.xrTableCell32.Weight = 0.05861136144509977D;
//
// xrTableCell1
//
this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldRelationFLSStunden")});
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Weight = 0.05861136182609529D;
//
// fieldRelationFLSStunden
//
this.fieldRelationFLSStunden.Expression = "Round([FlsIstGesamt]/[StundenGesamt]*100, 2)";
this.fieldRelationFLSStunden.Name = "fieldRelationFLSStunden";
//
// Mitarbeiterstundenkonto
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -630,10 +710,14 @@ namespace FreundeskreisSuchthilfe.Alt
this.topMarginBand1,
this.bottomMarginBand1});
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldFLS});
this.fieldFLS,
this.fieldFLSSollIst,
this.fieldStundenZuFLS,
this.fieldRelationFlsIst,
this.fieldRelationFLSStunden});
this.DataSource = this.bindingSource1;
this.Landscape = true;
this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 30);
this.Margins = new System.Drawing.Printing.Margins(75, 45, 50, 33);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
@@ -671,7 +755,6 @@ namespace FreundeskreisSuchthilfe.Alt
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTable xrTableDetail;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
@@ -713,5 +796,16 @@ namespace FreundeskreisSuchthilfe.Alt
private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.CalculatedField fieldFLSSollIst;
private DevExpress.XtraReports.UI.CalculatedField fieldStundenZuFLS;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
private DevExpress.XtraReports.UI.CalculatedField fieldRelationFlsIst;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.CalculatedField fieldRelationFLSStunden;
}
}

33
ReportImp/VSDHammReports/QuittierungsbelegJAHamm.cs
View File

@@ -3,6 +3,8 @@ using System.Collections.Generic;
using System.Linq;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared;
using BS.Shared.Core;
using DevExpress.XtraReports.UI;
namespace VSDHammReports
@@ -57,7 +59,10 @@ namespace VSDHammReports
}
pRO.Services = dict.Values.OrderBy(s => s.ServiceDescription).ToList();
bindingSource1.DataSource = pRO;
if (pRO.StartDate >= new DateTime(2022, 09, 01))
AnzeigeExtraStunden(pRO);
bindingSource1.DataSource = pRO;
if (dictKK.Count == 0)
{
@@ -73,5 +78,29 @@ namespace VSDHammReports
subReport.SetReportDataSource(roKK);
}
}
}
private void AnzeigeExtraStunden(ServicesOverviewRO pRo)
{
if (pRo.SupportConceptCostBearer != null && pRo.SupportConceptCostBearer.CostBearer2SupportConceptOid != null && pRo.SupportConceptCostBearer.ApprovalPeriodList != null)
{
if (pRo.SupportConceptCostBearer.StartDate != null)
{
foreach (var ap in pRo.SupportConceptCostBearer.ApprovalPeriodList)
{
if (ap.StartDate <= pRo.EndDate && ap.EndDate >= pRo.StartDate && ap.StartDate >= pRo.StartDate && ap.EndDate <= pRo.EndDate)
{
lblExtraFLS.Visible = true;
if (ap.ApprovedBETotal != null)
lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS vom {1:dd.MM.yy} bis {2:dd.MM.yy}", ap.ApprovedBETotal, ap.StartDate, ap.EndDate);
else if (ap.ApprovedBEPerInterval != null && ap.ApprovedBEInterval != null)
lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS pro {1} vom {2:dd.MM.yy} bis {3:dd.MM.yy}", ap.ApprovedBEPerInterval,
ap.ApprovedBEInterval != null ? EnumTranslations.SupportConceptApprovalInterval2Translations[(SupportConceptApprovalInterval)ap.ApprovedBEInterval] : null, ap.StartDate, ap.EndDate);
else
lblExtraFLS.Text = String.Format("zzgl. Extra FLS vom {0:dd.MM.yy} bis {1:dd.MM.yy}", ap.StartDate, ap.EndDate);
}
}
}
}
}
}
}

37
ReportImp/VSDHammReports/QuittierungsbelegJAHamm.designer.cs generated
View File

@@ -79,6 +79,7 @@ namespace VSDHammReports
this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.lblExtraFLS = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -214,9 +215,6 @@ namespace VSDHammReports
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleStartDate.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleStartDate.Name = "formattingRuleStartDate";
//
@@ -283,7 +281,7 @@ namespace VSDHammReports
this.summeMinuten.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.summeMinuten.BorderWidth = 2;
this.summeMinuten.BorderWidth = 2F;
this.summeMinuten.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMBillable", "{0} Minuten")});
this.summeMinuten.Font = new System.Drawing.Font("Arial", 9.75F);
@@ -386,7 +384,6 @@ namespace VSDHammReports
//
// xrSubreport1
//
this.xrSubreport1.Id = 0;
this.xrSubreport1.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 0F);
this.xrSubreport1.Name = "xrSubreport1";
this.xrSubreport1.ReportSource = new VSDHammReports.QuittierungsbelegJAHammKooperationsKontakte();
@@ -395,6 +392,7 @@ namespace VSDHammReports
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblExtraFLS,
this.lblYear,
this.lblYear2,
this.xrLabel18,
@@ -488,7 +486,7 @@ namespace VSDHammReports
this.bewilligteFLSW.Multiline = true;
this.bewilligteFLSW.Name = "bewilligteFLSW";
this.bewilligteFLSW.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.bewilligteFLSW.SizeF = new System.Drawing.SizeF(252.0579F, 24.08336F);
this.bewilligteFLSW.SizeF = new System.Drawing.SizeF(64.48746F, 24.08336F);
this.bewilligteFLSW.StylePriority.UseFont = false;
this.bewilligteFLSW.StylePriority.UseTextAlignment = false;
this.bewilligteFLSW.Text = "bewilligteFLSW";
@@ -632,9 +630,6 @@ namespace VSDHammReports
//
this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleServiceDesc.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc";
//
@@ -642,9 +637,6 @@ namespace VSDHammReports
//
this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleCostBearer.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleCostBearer.Name = "formattingRuleCostBearer";
//
@@ -652,9 +644,6 @@ namespace VSDHammReports
//
this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleEmployeeName.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName";
//
@@ -668,7 +657,19 @@ namespace VSDHammReports
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// QuittierungsbelegJAHamm
// lblExtraFLS
//
this.lblExtraFLS.LocationFloat = new DevExpress.Utils.PointFloat(380.5417F, 158.7083F);
this.lblExtraFLS.Multiline = true;
this.lblExtraFLS.Name = "lblExtraFLS";
this.lblExtraFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblExtraFLS.SizeF = new System.Drawing.SizeF(346.4583F, 24.08336F);
this.lblExtraFLS.StylePriority.UseFont = false;
this.lblExtraFLS.StylePriority.UseTextAlignment = false;
this.lblExtraFLS.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.lblExtraFLS.Visible = false;
//
// QuittierungsbelegJA
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
@@ -687,7 +688,7 @@ namespace VSDHammReports
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "13.1";
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
@@ -747,6 +748,6 @@ namespace VSDHammReports
private DevExpress.XtraReports.UI.XRLabel xrLabel15;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRSubreport xrSubreport1;
private DevExpress.XtraReports.UI.XRLabel lblExtraFLS;
}
}

69
ReportImp/VSDHammReports/ServicesOverviewReport.Designer.cs generated
View File

@@ -48,7 +48,6 @@ namespace VSDHammReports
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -84,16 +83,18 @@ namespace VSDHammReports
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
this.lblExtraFLS = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -328,10 +329,6 @@ namespace VSDHammReports
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell6.Weight = 0.6429272199567827D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// xrTableCell16
//
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -367,9 +364,6 @@ namespace VSDHammReports
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleStartDate.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleStartDate.Name = "formattingRuleStartDate";
//
@@ -437,7 +431,7 @@ namespace VSDHammReports
this.summeMinuten.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.summeMinuten.BorderWidth = 2;
this.summeMinuten.BorderWidth = 2F;
this.summeMinuten.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMBillable")});
this.summeMinuten.Font = new System.Drawing.Font("Arial", 9.75F);
@@ -558,6 +552,7 @@ namespace VSDHammReports
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblExtraFLS,
this.lblYear,
this.lblYear2,
this.xrLabel17,
@@ -639,7 +634,7 @@ namespace VSDHammReports
this.bewilligteFLSW.Multiline = true;
this.bewilligteFLSW.Name = "bewilligteFLSW";
this.bewilligteFLSW.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.bewilligteFLSW.SizeF = new System.Drawing.SizeF(252.0579F, 24.08336F);
this.bewilligteFLSW.SizeF = new System.Drawing.SizeF(62.4874F, 24.08336F);
this.bewilligteFLSW.StylePriority.UseFont = false;
this.bewilligteFLSW.StylePriority.UseTextAlignment = false;
this.bewilligteFLSW.Text = "bewilligteFLSW";
@@ -779,13 +774,22 @@ namespace VSDHammReports
this.xrLabel1.Text = "Quittierungsbeleg über direkte Betreuungsleistungen";
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
//
// xrLabel15
//
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(69.39265F, 260.4166F);
this.xrLabel15.Multiline = true;
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.SizeF = new System.Drawing.SizeF(191.5118F, 24.08337F);
this.xrLabel15.StylePriority.UseFont = false;
this.xrLabel15.StylePriority.UseTextAlignment = false;
this.xrLabel15.Text = "[Month]";
this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// formattingRuleServiceDesc
//
this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleServiceDesc.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc";
//
@@ -793,9 +797,6 @@ namespace VSDHammReports
//
this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleCostBearer.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleCostBearer.Name = "formattingRuleCostBearer";
//
@@ -803,9 +804,6 @@ namespace VSDHammReports
//
this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleEmployeeName.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName";
//
@@ -819,17 +817,21 @@ namespace VSDHammReports
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrLabel15
// lblExtraFLS
//
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(69.39265F, 260.4166F);
this.xrLabel15.Multiline = true;
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.SizeF = new System.Drawing.SizeF(191.5118F, 24.08337F);
this.xrLabel15.StylePriority.UseFont = false;
this.xrLabel15.StylePriority.UseTextAlignment = false;
this.xrLabel15.Text = "[Month]";
this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.lblExtraFLS.LocationFloat = new DevExpress.Utils.PointFloat(378.5417F, 158.7083F);
this.lblExtraFLS.Multiline = true;
this.lblExtraFLS.Name = "lblExtraFLS";
this.lblExtraFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblExtraFLS.SizeF = new System.Drawing.SizeF(346.4583F, 24.08336F);
this.lblExtraFLS.StylePriority.UseFont = false;
this.lblExtraFLS.StylePriority.UseTextAlignment = false;
this.lblExtraFLS.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.lblExtraFLS.Visible = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// Stundenzettel
//
@@ -850,11 +852,11 @@ namespace VSDHammReports
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "13.1";
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -922,5 +924,6 @@ namespace VSDHammReports
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRLabel xrLabel15;
private DevExpress.XtraReports.UI.XRLabel lblExtraFLS;
}
}

35
ReportImp/VSDHammReports/ServicesOverviewReport.cs
View File

@@ -1,8 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared;
using BS.Shared.Core;
using DevExpress.XtraReports.UI;
namespace VSDHammReports
@@ -31,7 +32,11 @@ namespace VSDHammReports
{
lblAktenzeichen.Text = pRO.Costbearer + " / Aktenzeichen";
}
if (pRO.Services != null)
if (pRO.StartDate >= new DateTime (2022, 09, 01))
AnzeigeExtraStunden(pRO);
if (pRO.Services != null)
{
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
@@ -53,5 +58,29 @@ namespace VSDHammReports
//bewilligteFLSW.Text = string.Format("{0:0.##}", pRO.ApprovedFLSPerWeek);
}
private void AnzeigeExtraStunden(ServicesOverviewRO pRo)
{
if (pRo.SupportConceptCostBearer != null && pRo.SupportConceptCostBearer.CostBearer2SupportConceptOid != null && pRo.SupportConceptCostBearer.ApprovalPeriodList != null)
{
if (pRo.SupportConceptCostBearer.StartDate != null)
{
foreach (var ap in pRo.SupportConceptCostBearer.ApprovalPeriodList)
{
if (ap.StartDate <= pRo.EndDate && ap.EndDate >= pRo.StartDate && ap.StartDate >= pRo.StartDate && ap.EndDate <= pRo.EndDate)
{
lblExtraFLS.Visible = true;
if (ap.ApprovedBETotal != null)
lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS vom {1:dd.MM.yy} bis {2:dd.MM.yy}", ap.ApprovedBETotal, ap.StartDate, ap.EndDate);
else if (ap.ApprovedBEPerInterval != null && ap.ApprovedBEInterval != null)
lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS pro {1} vom {2:dd.MM.yy} bis {3:dd.MM.yy}", ap.ApprovedBEPerInterval,
ap.ApprovedBEInterval != null ? EnumTranslations.SupportConceptApprovalInterval2Translations[(SupportConceptApprovalInterval)ap.ApprovedBEInterval] : null, ap.StartDate, ap.EndDate);
else
lblExtraFLS.Text = String.Format("zzgl. Extra FLS vom {0:dd.MM.yy} bis {1:dd.MM.yy}", ap.StartDate, ap.EndDate);
}
}
}
}
}
}
}
}

7
Service/Plugins/PluginLoader.cs
View File

@@ -30,7 +30,7 @@ namespace BeWo.Service.Plugins
//t = "0216265667"; // LH Hannover
//t = "1774789565"; // LH Essen
//t = "9342168675"; // ABC Betreuungen - jetzt Schubkraft
// = "1193188501"; // Aids Hilfe Dortmund
//t = "1193188501"; // Aids Hilfe Dortmund
//t = "7860351957"; // SKF Alsdorf
//t = "3311520228"; // Die Düne
//t = "1352143437"; // Sewo
@@ -320,13 +320,14 @@ namespace BeWo.Service.Plugins
//t = "9518001524"; // Sozialpädagogische Praxis Astrid Schnödewind
//t = "1048483934"; // Frauenhaus e.V. EWFRA - Wohnprojekt für Frauen
//t = "4293131072"; // ASB Rhein-Erft/Düren e.V. Schulbegleitung
t = "2221228727"; // Autismus Leben gGmbH
//t = "2221228727"; // Autismus Leben gGmbH
//t = "5065709552"; // Biotop e.V.
//t = "9094672461"; // Transkulturelles Betreuungsbüro (Toprak GmbH)
//t = "9008813932"; // Aids Hilfe Giessen
//t = "4052216789"; // Perspektiven e.V.
//t = "7663765314"; // Chrstina Frommen (Frommen BeWo)
//t = "7663765314"; // Christina Frommen (Frommen BeWo)
//t = "5462295916"; // BeWo Dellbrueck
//t = "2120989920"; // Sozialbüro Schüßler und Wilckens GbR
return t;