diff --git a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml
index 62f2b2b70..70ed3fd0b 100644
--- a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml
+++ b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml
@@ -70,7 +70,11 @@
-
+
diff --git a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs
index f370be0aa..a81149a9f 100644
--- a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs
+++ b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs
@@ -354,6 +354,23 @@ namespace BeWo.View.Detail.Accounting
}
}
}
+
+ private void TableView_OnCustomRowAppearance(object sender, CustomRowAppearanceEventArgs e)
+ {
+ if (e.Property != null && e.Property.Name == "Background")
+ {
+ var ib = datagrid_invoices.GetRow(e.RowHandle) as InvoiceBaseVM;
+ if (ib != null && !String.IsNullOrEmpty(ib.BackgroundColor))
+ {
+ e.Result = new SolidColorBrush((Color)ColorConverter.ConvertFromString(ib.BackgroundColor));
+ e.Handled = true;
+ }
+
+
+ }
+
+ //var data = srGridControl.rowhan
+ }
}
}
\ No newline at end of file
diff --git a/BeWo/View/Detail/UserView.xaml b/BeWo/View/Detail/UserView.xaml
index d35f59f2e..f8eea7b56 100644
--- a/BeWo/View/Detail/UserView.xaml
+++ b/BeWo/View/Detail/UserView.xaml
@@ -44,6 +44,10 @@
+
+
+
+
-
+
+
+
+
diff --git a/BeWo/View/Detail/UserView.xaml.cs b/BeWo/View/Detail/UserView.xaml.cs
index 4b422959f..2cf4c3112 100644
--- a/BeWo/View/Detail/UserView.xaml.cs
+++ b/BeWo/View/Detail/UserView.xaml.cs
@@ -33,6 +33,11 @@ namespace BeWo.View.Detail
{
tabitem_documents.Visibility = Visibility.Collapsed;
}
+ if (pViewModel.AllLicenseTypes.Count == 0)
+ {
+ label_LicenseTypes.Visibility = Visibility.Collapsed;
+ comboBox_LicenseTypes.Visibility = Visibility.Collapsed;
+ }
}
public override bool IsDirty
diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
index 2f008233c..cb5274203 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
@@ -1331,8 +1331,7 @@
ShowTotalSummary="False"
NavigationStyle="Row"
MouseDoubleClick="SrTableView_OnMouseDoubleClick"
- ShowAutoFilterRow="True" CustomRowAppearance="SrTableView_OnCustomRowAppearance"
- >
+ ShowAutoFilterRow="True" CustomRowAppearance="SrTableView_OnCustomRowAppearance" >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveInvoiceFactory.cs b/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveInvoiceFactory.cs
index 331953f71..7e725ebda 100644
--- a/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveInvoiceFactory.cs
+++ b/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveInvoiceFactory.cs
@@ -11,8 +11,8 @@ namespace DiakonieKKKleve.Invoicing
{
public class DiakoneKKKleveInvoiceFactory : InvoiceFactory
{
-
- public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary> supportConcepts2ServiceRecords)
+
+ public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary> supportConcepts2ServiceRecords)
{
foreach (var item in supportConcepts2ServiceRecords)
{
@@ -45,7 +45,12 @@ namespace DiakonieKKKleve.Invoicing
}
if (!String.IsNullOrEmpty(sd.Name) && sd.Name.Contains("Therapie"))
{
- return new DiakoneKKKleveSoziotherapieInvoiceCreation();
+ var ic = new DiakoneKKKleveSoziotherapieInvoiceCreation();
+ if (specificId == "Finanzauswertung")
+ {
+ ic.ErstelleHausbesuchspauschale = false;
+ }
+ return ic;
}
}
diff --git a/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveSoziotherapieInvoiceCreation.cs b/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveSoziotherapieInvoiceCreation.cs
index efeac67dd..b7f99d981 100644
--- a/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveSoziotherapieInvoiceCreation.cs
+++ b/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveSoziotherapieInvoiceCreation.cs
@@ -16,7 +16,14 @@ namespace DiakonieKKKleve.Invoicing
{
public class DiakoneKKKleveSoziotherapieInvoiceCreation : InvoiceCreation
{
- public override void SetInvoiceId(ServiceInvoice invoice)
+ public DiakoneKKKleveSoziotherapieInvoiceCreation() : base()
+ {
+ ErstelleHausbesuchspauschale = true;
+ }
+
+ public bool ErstelleHausbesuchspauschale { get; set; }
+
+ public override void SetInvoiceId(ServiceInvoice invoice)
{
invoice.InvoiceBase.InvoiceId = "RechnungSoziotherapie";
invoice.InvoiceBase.InvoiceTypeText = "Soziotherapie";
@@ -137,10 +144,12 @@ namespace DiakonieKKKleve.Invoicing
//{
list = (List)base.CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, scap, calc);
//}
-
- var ii = CreateHausbesuchspauschale(serviceRecordsInPeriod, invoicePeriod, scap);
- list.AddRange(ii);
-
+ if (ErstelleHausbesuchspauschale)
+ {
+ var ii = CreateHausbesuchspauschale(serviceRecordsInPeriod, invoicePeriod, scap);
+ list.AddRange(ii);
+ }
+
return list;
}
diff --git a/ReportImp/PerspektivenEV/PerspektivenEV.csproj b/ReportImp/PerspektivenEV/PerspektivenEV.csproj
index 9aabb2edd..207c9f848 100644
--- a/ReportImp/PerspektivenEV/PerspektivenEV.csproj
+++ b/ReportImp/PerspektivenEV/PerspektivenEV.csproj
@@ -32,6 +32,9 @@
+
+ False
+
diff --git a/ReportImp/PflegedienstWessel/Teamstundenkonto.designer.cs b/ReportImp/PflegedienstWessel/Teamstundenkonto.designer.cs
index d374155c8..bb7b900c9 100644
--- a/ReportImp/PflegedienstWessel/Teamstundenkonto.designer.cs
+++ b/ReportImp/PflegedienstWessel/Teamstundenkonto.designer.cs
@@ -29,761 +29,632 @@ namespace PflegedienstWessel
///
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
- this.Detail = 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();
- this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
- this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
- this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
- this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
- this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell();
- this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell();
- this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell();
- this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
- this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
- this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
- this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
- this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
- this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
- this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
- this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
- this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
- this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
- this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
- this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
- this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
- this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
- this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
- this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
- this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand();
- this.Detail3 = new DevExpress.XtraReports.UI.DetailBand();
- this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
- this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
- this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
- this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
- this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
- this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
- this.ReportFooter1 = new DevExpress.XtraReports.UI.ReportFooterBand();
- ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
- //
- // Detail
- //
- this.Detail.HeightF = 0F;
- this.Detail.Name = "Detail";
- this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
- this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
- //
- // xrTableDetail
- //
- this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ this.components = new System.ComponentModel.Container();
+ this.Detail = 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.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+ this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
+ this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
+ this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
+ this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
+ this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
+ this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+ this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+ this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.Detail3 = new DevExpress.XtraReports.UI.DetailBand();
+ this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ this.ReportFooter1 = new DevExpress.XtraReports.UI.ReportFooterBand();
+ this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+ //
+ // Detail
+ //
+ this.Detail.HeightF = 0F;
+ this.Detail.Name = "Detail";
+ this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // xrTableDetail
+ //
+ this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrTableDetail.Name = "xrTableDetail";
- this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTableDetail.Name = "xrTableDetail";
+ 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.StylePriority.UseBorders = false;
- this.xrTableDetail.StylePriority.UseFont = false;
- this.xrTableDetail.StylePriority.UsePadding = false;
- this.xrTableDetail.StylePriority.UseTextAlignment = false;
- this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrTableRowDetail
- //
- this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableDetail.SizeF = new System.Drawing.SizeF(705F, 25F);
+ this.xrTableDetail.StylePriority.UseBorders = false;
+ this.xrTableDetail.StylePriority.UseFont = false;
+ this.xrTableDetail.StylePriority.UsePadding = false;
+ this.xrTableDetail.StylePriority.UseTextAlignment = false;
+ this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrTableRowDetail
+ //
+ this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell19,
- this.xrTableCell20,
- this.xrTableCell28,
this.xrTableCell16,
this.xrTableCell27,
- this.xrTableCell22,
this.xrTableCell23,
- this.xrTableCell21,
this.xrTableCell25,
this.xrTableCell24,
+ this.xrTableCell20,
this.xrTableCell26});
- this.xrTableRowDetail.Name = "xrTableRowDetail";
- this.xrTableRowDetail.Weight = 1D;
- //
- // xrTableCell3
- //
- this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ 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, "TeamDetailList.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[] {
+ 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.13074842200180342D;
+ //
+ // xrTableCell19
+ //
+ this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.StundenSollMax", "{0:0.00}")});
- this.xrTableCell19.Name = "xrTableCell19";
- this.xrTableCell19.Text = "xrTableCell19";
- this.xrTableCell19.Weight = 0.081154179207584262D;
- //
- // xrTableCell20
- //
- this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")});
- this.xrTableCell20.Name = "xrTableCell20";
- this.xrTableCell20.Text = "xrTableCell20";
- this.xrTableCell20.Weight = 0.09467990555346173D;
- //
- // xrTableCell28
- //
- this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
- this.xrTableCell28.Name = "xrTableCell28";
- this.xrTableCell28.Text = "xrTableCell28";
- this.xrTableCell28.Weight = 0.0721370604147881D;
- //
- // xrTableCell16
- //
- this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.xrTableCell19.Name = "xrTableCell19";
+ this.xrTableCell19.Text = "xrTableCell19";
+ this.xrTableCell19.Weight = 0.063119927862939573D;
+ //
+ // xrTableCell16
+ //
+ this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.FlsSoll", "{0:0.00}")});
- this.xrTableCell16.Name = "xrTableCell16";
- this.xrTableCell16.Text = "xrTableCell16";
- this.xrTableCell16.Weight = 0.063119927862939587D;
- //
- // xrTableCell27
- //
- this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.xrTableCell16.Name = "xrTableCell16";
+ this.xrTableCell16.Text = "xrTableCell16";
+ this.xrTableCell16.Weight = 0.063119927862939573D;
+ //
+ // xrTableCell27
+ //
+ this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.FlsIst", "{0:0.00}")});
- this.xrTableCell27.Name = "xrTableCell27";
- this.xrTableCell27.Text = "xrTableCell27";
- this.xrTableCell27.Weight = 0.063119927862939615D;
- //
- // xrTableCell22
- //
- this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.FlsDiff", "{0:0.00}")});
- this.xrTableCell22.Name = "xrTableCell22";
- this.xrTableCell22.Text = "xrTableCell22";
- this.xrTableCell22.Weight = 0.063119927862939587D;
- //
- // xrTableCell23
- //
- this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.xrTableCell27.Name = "xrTableCell27";
+ this.xrTableCell27.Text = "xrTableCell27";
+ this.xrTableCell27.Weight = 0.063119927862939629D;
+ //
+ // xrTableCell23
+ //
+ this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.StundenGesamtIst", "{0:0.00}")});
- this.xrTableCell23.Name = "xrTableCell23";
- this.xrTableCell23.Text = "xrTableCell23";
- this.xrTableCell23.Weight = 0.063119927862939559D;
- //
- // xrTableCell21
- //
- this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.RelationFlsZuMittelbar", "{0:0.00}")});
- this.xrTableCell21.Name = "xrTableCell21";
- this.xrTableCell21.Text = "xrTableCell21";
- this.xrTableCell21.Weight = 0.063119927862939615D;
- //
- // xrTableCell25
- //
- this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.xrTableCell23.Name = "xrTableCell23";
+ this.xrTableCell23.Text = "xrTableCell23";
+ this.xrTableCell23.Weight = 0.063119927862939573D;
+ //
+ // xrTableCell25
+ //
+ this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.Ueberstunden", "{0:0.00}")});
- this.xrTableCell25.Name = "xrTableCell25";
- this.xrTableCell25.Text = "xrTableCell25";
- this.xrTableCell25.Weight = 0.063119927862939587D;
- //
- // xrTableCell24
- //
- this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.xrTableCell25.Name = "xrTableCell25";
+ this.xrTableCell25.Text = "xrTableCell25";
+ this.xrTableCell25.Weight = 0.063119927862939573D;
+ //
+ // xrTableCell24
+ //
+ this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")});
- this.xrTableCell24.Name = "xrTableCell24";
- this.xrTableCell24.Text = "xrTableCell24";
- this.xrTableCell24.Weight = 0.0631199278629396D;
- //
- // xrTableCell26
- //
- this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.xrTableCell24.Name = "xrTableCell24";
+ this.xrTableCell24.Text = "xrTableCell24";
+ this.xrTableCell24.Weight = 0.063119927862939629D;
+ //
+ // xrTableCell26
+ //
+ this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")});
- this.xrTableCell26.Name = "xrTableCell26";
- this.xrTableCell26.Text = "xrTableCell26";
- this.xrTableCell26.Weight = 0.063119927862939573D;
- //
- // xrTable1
- //
- this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrTable1.Name = "xrTable1";
- this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableCell26.Name = "xrTableCell26";
+ this.xrTableCell26.Text = "xrTableCell26";
+ this.xrTableCell26.Weight = 0.063119927862939629D;
+ //
+ // xrTable1
+ //
+ this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable1.Name = "xrTable1";
+ 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.StylePriority.UseBorders = false;
- this.xrTable1.StylePriority.UseFont = false;
- this.xrTable1.StylePriority.UsePadding = false;
- this.xrTable1.StylePriority.UseTextAlignment = false;
- this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrTableRow1
- //
- this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTable1.SizeF = new System.Drawing.SizeF(705F, 25F);
+ this.xrTable1.StylePriority.UseBorders = false;
+ this.xrTable1.StylePriority.UseFont = false;
+ this.xrTable1.StylePriority.UsePadding = false;
+ this.xrTable1.StylePriority.UseTextAlignment = false;
+ this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrTableRow1
+ //
+ this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell35,
this.xrTableCell37,
- this.xrTableCell38,
- this.xrTableCell39,
- this.cellSollGesamt,
this.cellFLSSollGesamt,
this.cellFLSIstGesamt,
- this.cellFLSPlusMinusGesamt,
this.cellGesamtGesamt,
- this.cellRelationGesamt,
this.xrTableCell47,
this.xrTableCell48,
this.xrTableCell51});
- this.xrTableRow1.Name = "xrTableRow1";
- this.xrTableRow1.Weight = 1D;
- //
- // xrTableCell35
- //
- this.xrTableCell35.Name = "xrTableCell35";
- this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
- this.xrTableCell35.StylePriority.UseFont = false;
- this.xrTableCell35.StylePriority.UsePadding = false;
- this.xrTableCell35.StylePriority.UseTextAlignment = false;
- this.xrTableCell35.Text = "Gesamt";
- this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell35.Weight = 0.1352569882777277D;
- //
- // xrTableCell37
- //
- this.xrTableCell37.Name = "xrTableCell37";
- this.xrTableCell37.Weight = 0.067628494138863848D;
- //
- // xrTableCell38
- //
- this.xrTableCell38.Name = "xrTableCell38";
- this.xrTableCell38.Weight = 0.0631199278629396D;
- //
- // xrTableCell39
- //
- this.xrTableCell39.Name = "xrTableCell39";
- this.xrTableCell39.Weight = 0.063119927862939573D;
- //
- // cellSollGesamt
- //
- this.cellSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SollGesamt", "{0:0.00}")});
- this.cellSollGesamt.Name = "cellSollGesamt";
- this.cellSollGesamt.Text = "cellSollGesamt";
- this.cellSollGesamt.Weight = 0.0721370604147881D;
- //
- // cellFLSSollGesamt
- //
- this.cellFLSSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.xrTableRow1.Name = "xrTableRow1";
+ this.xrTableRow1.Weight = 1D;
+ //
+ // xrTableCell35
+ //
+ this.xrTableCell35.Name = "xrTableCell35";
+ this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+ this.xrTableCell35.StylePriority.UseFont = false;
+ this.xrTableCell35.StylePriority.UsePadding = false;
+ this.xrTableCell35.StylePriority.UseTextAlignment = false;
+ this.xrTableCell35.Text = "Gesamt";
+ this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell35.Weight = 0.13074842200180345D;
+ //
+ // xrTableCell37
+ //
+ this.xrTableCell37.Name = "xrTableCell37";
+ this.xrTableCell37.Weight = 0.0631199278629396D;
+ //
+ // cellFLSSollGesamt
+ //
+ this.cellFLSSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsSollGesamt", "{0:0.00}")});
- this.cellFLSSollGesamt.Name = "cellFLSSollGesamt";
- this.cellFLSSollGesamt.Text = "cellFLSSollGesamt";
- this.cellFLSSollGesamt.Weight = 0.063119927862939587D;
- //
- // cellFLSIstGesamt
- //
- this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.cellFLSSollGesamt.Name = "cellFLSSollGesamt";
+ this.cellFLSSollGesamt.Text = "cellFLSSollGesamt";
+ this.cellFLSSollGesamt.Weight = 0.063119927862939587D;
+ //
+ // cellFLSIstGesamt
+ //
+ this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt", "{0:0.00}")});
- this.cellFLSIstGesamt.Name = "cellFLSIstGesamt";
- this.cellFLSIstGesamt.Text = "cellFLSIstGesamt";
- this.cellFLSIstGesamt.Weight = 0.063119927862939615D;
- //
- // cellFLSPlusMinusGesamt
- //
- this.cellFLSPlusMinusGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsDiffGesamt", "{0:0.00}")});
- this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt";
- this.cellFLSPlusMinusGesamt.Text = "cellFLSPlusMinusGesamt";
- this.cellFLSPlusMinusGesamt.Weight = 0.063119927862939587D;
- //
- // cellGesamtGesamt
- //
- this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.cellFLSIstGesamt.Name = "cellFLSIstGesamt";
+ this.cellFLSIstGesamt.Text = "cellFLSIstGesamt";
+ this.cellFLSIstGesamt.Weight = 0.063119927862939615D;
+ //
+ // cellGesamtGesamt
+ //
+ this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "StundenGesamt", "{0:0.00}")});
- this.cellGesamtGesamt.Name = "cellGesamtGesamt";
- this.cellGesamtGesamt.Text = "cellGesamtGesamt";
- this.cellGesamtGesamt.Weight = 0.063119927862939573D;
- //
- // cellRelationGesamt
- //
- this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "RelationFlsZuMittelbar", "{0:0.00}")});
- this.cellRelationGesamt.Name = "cellRelationGesamt";
- this.cellRelationGesamt.Text = "cellRelationGesamt";
- this.cellRelationGesamt.Weight = 0.0631199278629396D;
- //
- // xrTableCell47
- //
- this.xrTableCell47.Name = "xrTableCell47";
- this.xrTableCell47.Weight = 0.063119927862939587D;
- //
- // xrTableCell48
- //
- this.xrTableCell48.Name = "xrTableCell48";
- this.xrTableCell48.Weight = 0.063119927862939587D;
- //
- // xrTableCell51
- //
- this.xrTableCell51.Name = "xrTableCell51";
- this.xrTableCell51.Weight = 0.063119927862939573D;
- //
- // ReportHeader
- //
- this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.cellGesamtGesamt.Name = "cellGesamtGesamt";
+ this.cellGesamtGesamt.Text = "cellGesamtGesamt";
+ this.cellGesamtGesamt.Weight = 0.063119927862939573D;
+ //
+ // xrTableCell47
+ //
+ this.xrTableCell47.Name = "xrTableCell47";
+ this.xrTableCell47.Weight = 0.063119927862939587D;
+ //
+ // xrTableCell48
+ //
+ this.xrTableCell48.Name = "xrTableCell48";
+ this.xrTableCell48.Weight = 0.063119927862939587D;
+ //
+ // xrTableCell51
+ //
+ this.xrTableCell51.Name = "xrTableCell51";
+ this.xrTableCell51.Weight = 0.12623985572587917D;
+ //
+ // ReportHeader
+ //
+ this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblMonat});
- this.ReportHeader.HeightF = 61.04167F;
- this.ReportHeader.Name = "ReportHeader";
- //
- // lblMonat
- //
- this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.ReportHeader.HeightF = 61.04167F;
+ this.ReportHeader.Name = "ReportHeader";
+ //
+ // lblMonat
+ //
+ this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Stundenkonto {0:MMMM yy}")});
- this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
- this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.lblMonat.Multiline = true;
- this.lblMonat.Name = "lblMonat";
- this.lblMonat.SizeF = new System.Drawing.SizeF(1007F, 25F);
- this.lblMonat.StyleName = "Title";
- this.lblMonat.StylePriority.UseFont = false;
- this.lblMonat.Text = "lblMonat";
- //
- // pageFooterBand1
- //
- this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
+ this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.lblMonat.Multiline = true;
+ this.lblMonat.Name = "lblMonat";
+ this.lblMonat.SizeF = new System.Drawing.SizeF(705F, 25F);
+ this.lblMonat.StyleName = "Title";
+ this.lblMonat.StylePriority.UseFont = false;
+ this.lblMonat.Text = "lblMonat";
+ //
+ // pageFooterBand1
+ //
+ this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPageInfo2,
this.xrPageInfo1});
- this.pageFooterBand1.HeightF = 48F;
- this.pageFooterBand1.Name = "pageFooterBand1";
- //
- // xrPageInfo2
- //
- this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
- this.xrPageInfo2.Format = "Seite {0} von {1}";
- this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(522.0001F, 25F);
- this.xrPageInfo2.Name = "xrPageInfo2";
- this.xrPageInfo2.SizeF = new System.Drawing.SizeF(482.9998F, 23F);
- this.xrPageInfo2.StyleName = "PageInfo";
- this.xrPageInfo2.StylePriority.UseFont = false;
- this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- //
- // xrPageInfo1
- //
- this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
- this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(8F, 25F);
- this.xrPageInfo1.Name = "xrPageInfo1";
- this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
- this.xrPageInfo1.SizeF = new System.Drawing.SizeF(497F, 23F);
- this.xrPageInfo1.StyleName = "PageInfo";
- this.xrPageInfo1.StylePriority.UseFont = false;
- //
- // Title
- //
- this.Title.BackColor = System.Drawing.Color.White;
- this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
- this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.Title.BorderWidth = 1;
- this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
- this.Title.ForeColor = System.Drawing.Color.Black;
- this.Title.Name = "Title";
- //
- // FieldCaption
- //
- this.FieldCaption.BackColor = System.Drawing.Color.White;
- this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
- this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.FieldCaption.BorderWidth = 1;
- this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
- this.FieldCaption.ForeColor = System.Drawing.Color.Black;
- this.FieldCaption.Name = "FieldCaption";
- //
- // PageInfo
- //
- this.PageInfo.BackColor = System.Drawing.Color.White;
- this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
- this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.PageInfo.BorderWidth = 1;
- this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
- this.PageInfo.ForeColor = System.Drawing.Color.Black;
- this.PageInfo.Name = "PageInfo";
- //
- // DataField
- //
- this.DataField.BackColor = System.Drawing.Color.White;
- this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
- this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.DataField.BorderWidth = 1;
- this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
- this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
- this.DataField.Name = "DataField";
- //
- // fieldFLS
- //
- this.fieldFLS.DataMember = "FLSReportGroups";
- this.fieldFLS.Expression = "[TotalFLM] / 60";
- this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
- this.fieldFLS.Name = "fieldFLS";
- //
- // topMarginBand1
- //
- this.topMarginBand1.HeightF = 50F;
- this.topMarginBand1.Name = "topMarginBand1";
- //
- // bottomMarginBand1
- //
- this.bottomMarginBand1.HeightF = 30F;
- this.bottomMarginBand1.Name = "bottomMarginBand1";
- //
- // DetailReport1
- //
- this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.pageFooterBand1.HeightF = 48F;
+ this.pageFooterBand1.Name = "pageFooterBand1";
+ //
+ // xrPageInfo2
+ //
+ this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrPageInfo2.Format = "Seite {0} von {1}";
+ this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(565F, 25F);
+ this.xrPageInfo2.Name = "xrPageInfo2";
+ this.xrPageInfo2.SizeF = new System.Drawing.SizeF(140F, 23F);
+ this.xrPageInfo2.StyleName = "PageInfo";
+ this.xrPageInfo2.StylePriority.UseFont = false;
+ this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // xrPageInfo1
+ //
+ this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(8.000081F, 25F);
+ this.xrPageInfo1.Name = "xrPageInfo1";
+ this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
+ this.xrPageInfo1.SizeF = new System.Drawing.SizeF(206.9999F, 23F);
+ this.xrPageInfo1.StyleName = "PageInfo";
+ this.xrPageInfo1.StylePriority.UseFont = false;
+ //
+ // Title
+ //
+ this.Title.BackColor = System.Drawing.Color.White;
+ this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.Title.BorderWidth = 1F;
+ this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
+ this.Title.ForeColor = System.Drawing.Color.Black;
+ this.Title.Name = "Title";
+ //
+ // FieldCaption
+ //
+ this.FieldCaption.BackColor = System.Drawing.Color.White;
+ this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.FieldCaption.BorderWidth = 1F;
+ this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+ this.FieldCaption.ForeColor = System.Drawing.Color.Black;
+ this.FieldCaption.Name = "FieldCaption";
+ //
+ // PageInfo
+ //
+ this.PageInfo.BackColor = System.Drawing.Color.White;
+ this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.PageInfo.BorderWidth = 1F;
+ this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.PageInfo.ForeColor = System.Drawing.Color.Black;
+ this.PageInfo.Name = "PageInfo";
+ //
+ // DataField
+ //
+ this.DataField.BackColor = System.Drawing.Color.White;
+ this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.DataField.BorderWidth = 1F;
+ this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Name = "DataField";
+ //
+ // fieldFLS
+ //
+ this.fieldFLS.DataMember = "FLSReportGroups";
+ this.fieldFLS.Expression = "[TotalFLM] / 60";
+ this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldFLS.Name = "fieldFLS";
+ //
+ // topMarginBand1
+ //
+ this.topMarginBand1.HeightF = 50F;
+ this.topMarginBand1.Name = "topMarginBand1";
+ //
+ // bottomMarginBand1
+ //
+ this.bottomMarginBand1.HeightF = 30F;
+ this.bottomMarginBand1.Name = "bottomMarginBand1";
+ //
+ // DetailReport1
+ //
+ this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail2,
this.DetailReport2});
- this.DetailReport1.DataMember = "TeamDetailList";
- this.DetailReport1.DataSource = this.bindingSource1;
- this.DetailReport1.Level = 0;
- this.DetailReport1.Name = "DetailReport1";
- //
- // Detail2
- //
- this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.DetailReport1.DataMember = "TeamDetailList";
+ this.DetailReport1.DataSource = this.bindingSource1;
+ this.DetailReport1.Level = 0;
+ this.DetailReport1.Name = "DetailReport1";
+ //
+ // Detail2
+ //
+ this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel1});
- this.Detail2.HeightF = 46.875F;
- this.Detail2.Name = "Detail2";
- //
- // xrLabel1
- //
- this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.Detail2.HeightF = 46.875F;
+ this.Detail2.Name = "Detail2";
+ //
+ // xrLabel1
+ //
+ this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.TeamName")});
- this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
- this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrLabel1.Multiline = true;
- this.xrLabel1.Name = "xrLabel1";
- this.xrLabel1.SizeF = new System.Drawing.SizeF(1007F, 25F);
- this.xrLabel1.StyleName = "Title";
- this.xrLabel1.StylePriority.UseFont = false;
- this.xrLabel1.Text = "xrLabel1";
- //
- // DetailReport2
- //
- this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrLabel1.Multiline = true;
+ this.xrLabel1.Name = "xrLabel1";
+ this.xrLabel1.SizeF = new System.Drawing.SizeF(705F, 25F);
+ this.xrLabel1.StyleName = "Title";
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.Text = "xrLabel1";
+ //
+ // DetailReport2
+ //
+ this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail3,
this.GroupHeader2,
this.GroupFooter2});
- this.DetailReport2.DataMember = "TeamDetailList.EmployeeDetailList";
- this.DetailReport2.DataSource = this.bindingSource1;
- this.DetailReport2.Level = 0;
- this.DetailReport2.Name = "DetailReport2";
- //
- // Detail3
- //
- this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.DetailReport2.DataMember = "TeamDetailList.EmployeeDetailList";
+ this.DetailReport2.DataSource = this.bindingSource1;
+ this.DetailReport2.Level = 0;
+ this.DetailReport2.Name = "DetailReport2";
+ //
+ // Detail3
+ //
+ this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableDetail});
- this.Detail3.HeightF = 25F;
- this.Detail3.Name = "Detail3";
- //
- // GroupHeader2
- //
- this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrTable2});
- this.GroupHeader2.HeightF = 70F;
- this.GroupHeader2.Name = "GroupHeader2";
- //
- // xrTable2
- //
- this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTable2.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
- this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrTable2.Name = "xrTable2";
- this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
- this.xrTableRow2});
- this.xrTable2.SizeF = new System.Drawing.SizeF(1005F, 70F);
- this.xrTable2.StylePriority.UseBorders = false;
- this.xrTable2.StylePriority.UseFont = false;
- this.xrTable2.StylePriority.UsePadding = false;
- this.xrTable2.StylePriority.UseTextAlignment = false;
- this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrTableRow2
- //
- this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell6,
- this.xrTableCell18,
- this.xrTableCell30,
- this.xrTableCell31,
- this.xrTableCell32,
- this.xrTableCell33,
- this.xrTableCell34,
- this.xrTableCell36,
- this.xrTableCell40,
- this.xrTableCell41,
- this.xrTableCell42,
- this.xrTableCell43});
- this.xrTableRow2.Name = "xrTableRow2";
- this.xrTableRow2.Weight = 2.8D;
- //
- // xrTableCell6
- //
- this.xrTableCell6.Name = "xrTableCell6";
- this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
- this.xrTableCell6.StylePriority.UsePadding = false;
- this.xrTableCell6.StylePriority.UseTextAlignment = false;
- this.xrTableCell6.Text = "Name";
- this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell6.Weight = 0.15329125016467182D;
- //
- // xrTableCell18
- //
- this.xrTableCell18.Name = "xrTableCell18";
- this.xrTableCell18.Text = "Reguläre SOLL Stunden";
- this.xrTableCell18.Weight = 0.081154192324637608D;
- //
- // xrTableCell30
- //
- this.xrTableCell30.Name = "xrTableCell30";
- this.xrTableCell30.Text = "Fehlzeiten Urlaub Krankheit(Tage)";
- this.xrTableCell30.Weight = 0.094679896646570338D;
- //
- // xrTableCell31
- //
- this.xrTableCell31.Multiline = true;
- this.xrTableCell31.Name = "xrTableCell31";
- this.xrTableCell31.Text = "Tatsächliche SOLL Stunden";
- this.xrTableCell31.Weight = 0.072137063712635591D;
- //
- // xrTableCell32
- //
- this.xrTableCell32.Name = "xrTableCell32";
- this.xrTableCell32.Text = "FLS Stunden SOLL";
- this.xrTableCell32.Weight = 0.063119927721024038D;
- //
- // xrTableCell33
- //
- this.xrTableCell33.Name = "xrTableCell33";
- this.xrTableCell33.StylePriority.UseBackColor = false;
- this.xrTableCell33.Text = "FLS IST lfd. Monat";
- this.xrTableCell33.Weight = 0.063119927721024D;
- //
- // xrTableCell34
- //
- this.xrTableCell34.Name = "xrTableCell34";
- this.xrTableCell34.Text = "FLS Plus/Minus lfd. Monat";
- this.xrTableCell34.Weight = 0.06311992757910842D;
- //
- // xrTableCell36
- //
- this.xrTableCell36.Multiline = true;
- this.xrTableCell36.Name = "xrTableCell36";
- this.xrTableCell36.StylePriority.UseBackColor = false;
- this.xrTableCell36.Text = "Gesamt-\r\nstunden lfd. Monat";
- this.xrTableCell36.Weight = 0.063119927721024011D;
- //
- // xrTableCell40
- //
- this.xrTableCell40.Name = "xrTableCell40";
- this.xrTableCell40.Text = "Relation FLS IST zu Mittelbare IST";
- this.xrTableCell40.Weight = 0.063119929511863376D;
- //
- // xrTableCell41
- //
- this.xrTableCell41.Name = "xrTableCell41";
- this.xrTableCell41.Text = "Überstd. neu";
- this.xrTableCell41.Weight = 0.063119928687401447D;
- //
- // xrTableCell42
- //
- this.xrTableCell42.Name = "xrTableCell42";
- this.xrTableCell42.StylePriority.UseBackColor = false;
- this.xrTableCell42.Text = "Überstd. Vormonat";
- this.xrTableCell42.Weight = 0.063119928275170531D;
- //
- // xrTableCell43
- //
- this.xrTableCell43.Name = "xrTableCell43";
- this.xrTableCell43.Text = "Überstd. Gesamt";
- this.xrTableCell43.Weight = 0.0631199213956443D;
- //
- // GroupFooter2
- //
- this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.Detail3.HeightF = 25F;
+ this.Detail3.Name = "Detail3";
+ //
+ // GroupHeader2
+ //
+ this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTableHeader});
+ this.GroupHeader2.HeightF = 70F;
+ this.GroupHeader2.Name = "GroupHeader2";
+ //
+ // GroupFooter2
+ //
+ this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable3});
- this.GroupFooter2.HeightF = 52.08333F;
- this.GroupFooter2.Name = "GroupFooter2";
- //
- // xrTable3
- //
- this.xrTable3.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrTable3.Name = "xrTable3";
- this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.GroupFooter2.HeightF = 52.08333F;
+ this.GroupFooter2.Name = "GroupFooter2";
+ //
+ // xrTable3
+ //
+ this.xrTable3.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable3.Name = "xrTable3";
+ this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow3});
- this.xrTable3.SizeF = new System.Drawing.SizeF(1005F, 25F);
- this.xrTable3.StylePriority.UseBorders = false;
- this.xrTable3.StylePriority.UseFont = false;
- this.xrTable3.StylePriority.UsePadding = false;
- this.xrTable3.StylePriority.UseTextAlignment = false;
- this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrTableRow3
- //
- this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTable3.SizeF = new System.Drawing.SizeF(705F, 25F);
+ this.xrTable3.StylePriority.UseBorders = false;
+ this.xrTable3.StylePriority.UseFont = false;
+ this.xrTable3.StylePriority.UsePadding = false;
+ this.xrTable3.StylePriority.UseTextAlignment = false;
+ this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrTableRow3
+ //
+ this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell1,
- this.xrTableCell7,
this.xrTableCell8,
this.xrTableCell9,
- this.xrTableCell10,
this.xrTableCell11,
- this.xrTableCell12,
this.xrTableCell13,
this.xrTableCell14,
this.xrTableCell15});
- this.xrTableRow3.Name = "xrTableRow3";
- this.xrTableRow3.Weight = 1D;
- //
- // xrTableCell1
- //
- this.xrTableCell1.Name = "xrTableCell1";
- this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
- this.xrTableCell1.StylePriority.UseFont = false;
- this.xrTableCell1.StylePriority.UsePadding = false;
- this.xrTableCell1.StylePriority.UseTextAlignment = false;
- this.xrTableCell1.Text = "Gesamt [TeamDetailList.TeamName]";
- this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell1.Weight = 0.32912533814247075D;
- //
- // xrTableCell7
- //
- this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.SollGesamt", "{0:0.00}")});
- this.xrTableCell7.Name = "xrTableCell7";
- this.xrTableCell7.Text = "xrTableCell7";
- this.xrTableCell7.Weight = 0.07213706041478804D;
- //
- // xrTableCell8
- //
- this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.xrTableRow3.Name = "xrTableRow3";
+ this.xrTableRow3.Weight = 1D;
+ //
+ // xrTableCell1
+ //
+ this.xrTableCell1.Name = "xrTableCell1";
+ this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+ this.xrTableCell1.StylePriority.UseFont = false;
+ this.xrTableCell1.StylePriority.UsePadding = false;
+ this.xrTableCell1.StylePriority.UseTextAlignment = false;
+ this.xrTableCell1.Text = "Gesamt [TeamDetailList.TeamName]";
+ this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell1.Weight = 0.19386834986474305D;
+ //
+ // xrTableCell8
+ //
+ this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.FlsSollGesamt", "{0:0.00}")});
- this.xrTableCell8.Name = "xrTableCell8";
- this.xrTableCell8.Text = "xrTableCell8";
- this.xrTableCell8.Weight = 0.063119927862939587D;
- //
- // xrTableCell9
- //
- this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.xrTableCell8.Name = "xrTableCell8";
+ this.xrTableCell8.Text = "xrTableCell8";
+ this.xrTableCell8.Weight = 0.063119927862939462D;
+ //
+ // xrTableCell9
+ //
+ this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.FlsIstGesamt", "{0:0.00}")});
- this.xrTableCell9.Name = "xrTableCell9";
- this.xrTableCell9.Text = "xrTableCell9";
- this.xrTableCell9.Weight = 0.063119927862939615D;
- //
- // xrTableCell10
- //
- this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.FlsDiffGesamt", "{0:0.00}")});
- this.xrTableCell10.Name = "xrTableCell10";
- this.xrTableCell10.Text = "xrTableCell10";
- this.xrTableCell10.Weight = 0.063119927862939587D;
- //
- // xrTableCell11
- //
- this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.xrTableCell9.Name = "xrTableCell9";
+ this.xrTableCell9.Text = "xrTableCell9";
+ this.xrTableCell9.Weight = 0.063119927862939629D;
+ //
+ // xrTableCell11
+ //
+ this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.StundenGesamt", "{0:0.00}")});
- this.xrTableCell11.Name = "xrTableCell11";
- this.xrTableCell11.Text = "xrTableCell11";
- this.xrTableCell11.Weight = 0.063119927862939573D;
- //
- // xrTableCell12
- //
- this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.RelationFlsZuMittelbar", "{0:0.00}")});
- this.xrTableCell12.Name = "xrTableCell12";
- this.xrTableCell12.Text = "xrTableCell12";
- this.xrTableCell12.Weight = 0.0631199278629396D;
- //
- // xrTableCell13
- //
- this.xrTableCell13.Name = "xrTableCell13";
- this.xrTableCell13.Weight = 0.063119927862939587D;
- //
- // xrTableCell14
- //
- this.xrTableCell14.Name = "xrTableCell14";
- this.xrTableCell14.Weight = 0.063119927862939587D;
- //
- // xrTableCell15
- //
- this.xrTableCell15.Name = "xrTableCell15";
- this.xrTableCell15.Weight = 0.063119927862939573D;
- //
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
- //
- // ReportFooter1
- //
- this.ReportFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTableCell11.Name = "xrTableCell11";
+ this.xrTableCell11.Text = "xrTableCell11";
+ this.xrTableCell11.Weight = 0.063119927862939629D;
+ //
+ // xrTableCell13
+ //
+ this.xrTableCell13.Name = "xrTableCell13";
+ this.xrTableCell13.Weight = 0.063119927862939573D;
+ //
+ // xrTableCell14
+ //
+ this.xrTableCell14.Name = "xrTableCell14";
+ this.xrTableCell14.Weight = 0.063119927862939573D;
+ //
+ // xrTableCell15
+ //
+ this.xrTableCell15.Name = "xrTableCell15";
+ this.xrTableCell15.Weight = 0.1262398557258792D;
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
+ //
+ // ReportFooter1
+ //
+ this.ReportFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
- this.ReportFooter1.HeightF = 60F;
- this.ReportFooter1.Name = "ReportFooter1";
- //
- // Teamstundenkonto
- //
- this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.ReportFooter1.HeightF = 60F;
+ this.ReportFooter1.Name = "ReportFooter1";
+ //
+ // xrTableHeader
+ //
+ this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
+ this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTableHeader.Name = "xrTableHeader";
+ 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(705F, 70F);
+ this.xrTableHeader.StylePriority.UseBorders = false;
+ this.xrTableHeader.StylePriority.UseFont = false;
+ this.xrTableHeader.StylePriority.UsePadding = false;
+ this.xrTableHeader.StylePriority.UseTextAlignment = false;
+ this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrTableRowHeader
+ //
+ this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell5,
+ this.xrTableCell4,
+ this.xrTableCell2,
+ this.xrTableCell17,
+ this.xrTableCell29,
+ this.xrTableCell44,
+ this.xrTableCell45,
+ this.xrTableCell46,
+ this.xrTableCell49});
+ this.xrTableRowHeader.Name = "xrTableRowHeader";
+ this.xrTableRowHeader.Weight = 2.8D;
+ //
+ // xrTableCell5
+ //
+ this.xrTableCell5.Name = "xrTableCell5";
+ this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+ this.xrTableCell5.StylePriority.UsePadding = false;
+ this.xrTableCell5.StylePriority.UseTextAlignment = false;
+ this.xrTableCell5.Text = "Name";
+ this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell5.Weight = 0.13074841913487043D;
+ //
+ // xrTableCell4
+ //
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.Text = "Reguläre SOLL Stunden";
+ this.xrTableCell4.Weight = 0.063119927500796508D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.Text = "FLS Stunden SOLL";
+ this.xrTableCell2.Weight = 0.063119927721024038D;
+ //
+ // xrTableCell17
+ //
+ this.xrTableCell17.Name = "xrTableCell17";
+ this.xrTableCell17.StylePriority.UseBackColor = false;
+ this.xrTableCell17.Text = "FLS IST lfd. Monat";
+ this.xrTableCell17.Weight = 0.063119927721023983D;
+ //
+ // xrTableCell29
+ //
+ this.xrTableCell29.Multiline = true;
+ this.xrTableCell29.Name = "xrTableCell29";
+ this.xrTableCell29.StylePriority.UseBackColor = false;
+ this.xrTableCell29.Text = "Gesamt-\r\nstunden lfd. Monat";
+ this.xrTableCell29.Weight = 0.063119927721024011D;
+ //
+ // xrTableCell44
+ //
+ this.xrTableCell44.Name = "xrTableCell44";
+ this.xrTableCell44.Text = "Überstd. neu";
+ this.xrTableCell44.Weight = 0.063119928687401433D;
+ //
+ // xrTableCell45
+ //
+ this.xrTableCell45.Name = "xrTableCell45";
+ this.xrTableCell45.StylePriority.UseBackColor = false;
+ this.xrTableCell45.Text = "Überstd. Vormonat";
+ this.xrTableCell45.Weight = 0.063119928275170517D;
+ //
+ // xrTableCell46
+ //
+ this.xrTableCell46.Multiline = true;
+ this.xrTableCell46.Name = "xrTableCell46";
+ this.xrTableCell46.Text = "MA\r\nStd. Konto";
+ this.xrTableCell46.Weight = 0.063119927579307122D;
+ //
+ // xrTableCell49
+ //
+ this.xrTableCell49.Name = "xrTableCell49";
+ this.xrTableCell49.Text = "Überstd. Gesamt";
+ this.xrTableCell49.Weight = 0.063119920699781049D;
+ //
+ // xrTableCell20
+ //
+ this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UeberstundenAusbezahlt", "{0:0.00}")});
+ this.xrTableCell20.Name = "xrTableCell20";
+ this.xrTableCell20.Weight = 0.0631199278629396D;
+ //
+ // Teamstundenkonto
+ //
+ this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
this.ReportHeader,
this.pageFooterBand1,
@@ -791,26 +662,25 @@ namespace PflegedienstWessel
this.bottomMarginBand1,
this.DetailReport1,
this.ReportFooter1});
- this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+ this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldFLS});
- this.DataSource = this.bindingSource1;
- this.Landscape = true;
- this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 30);
- this.PageHeight = 827;
- this.PageWidth = 1169;
- this.PaperKind = System.Drawing.Printing.PaperKind.A4;
- this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
+ this.DataSource = this.bindingSource1;
+ this.Margins = new System.Drawing.Printing.Margins(60, 60, 50, 30);
+ this.PageHeight = 1169;
+ this.PageWidth = 827;
+ this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+ this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
this.Title,
this.FieldCaption,
this.PageInfo,
this.DataField});
- this.Version = "13.1";
- ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+ this.Version = "17.1";
+ ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -834,13 +704,9 @@ namespace PflegedienstWessel
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
@@ -848,14 +714,9 @@ namespace PflegedienstWessel
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
- private DevExpress.XtraReports.UI.XRTableCell cellSollGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSSollGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSIstGesamt;
- private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellGesamtGesamt;
- private DevExpress.XtraReports.UI.XRTableCell cellRelationGesamt;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
@@ -865,33 +726,28 @@ namespace PflegedienstWessel
private DevExpress.XtraReports.UI.DetailReportBand DetailReport2;
private DevExpress.XtraReports.UI.DetailBand Detail3;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
- private DevExpress.XtraReports.UI.XRTable xrTable2;
- private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell40;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell41;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell42;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell43;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;
private DevExpress.XtraReports.UI.XRTable xrTable3;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter1;
+ private DevExpress.XtraReports.UI.XRTable xrTableHeader;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell45;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell46;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell49;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
}
}
diff --git a/ReportImp/SHKServiceSBD/Arbeitszeitkonto.cs b/ReportImp/SHKServiceSBD/Arbeitszeitkonto.cs
index acdfb5d7e..1a8e61dc5 100644
--- a/ReportImp/SHKServiceSBD/Arbeitszeitkonto.cs
+++ b/ReportImp/SHKServiceSBD/Arbeitszeitkonto.cs
@@ -7,7 +7,7 @@ using BS.Shared.Core;
namespace SHKService
{
//[IDSpecificClass(Identifier = "MitarbeiterstundenkontoJahr")]
- public partial class Arbeitszeitkonto : DevExpress.XtraReports.UI.XtraReport//, IBeWoReport
+ public partial class Arbeitszeitkonto : DevExpress.XtraReports.UI.XtraReport, IBeWoReport
{
@@ -18,13 +18,19 @@ namespace SHKService
public void SetReportDataSource(MitarbeiterstundenkontoMonateRO pRO)
{
- var ro = new ArbeitszeitkontoListRO();
-
var msb = new CustomMitarbeiterstundenkontoBerechnungMonate();
msb.CreateReport(pRO);
- this.bindingSource1.DataSource = pRO;
+ var ro = CreateArbeitszeitkontoListRO(msb);
+
+ this.bindingSource1.DataSource = ro;
}
- }
+ private ArbeitszeitkontoListRO CreateArbeitszeitkontoListRO(CustomMitarbeiterstundenkontoBerechnungMonate msb)
+ {
+ var ro = new ArbeitszeitkontoListRO();
+
+ return ro;
+ }
+ }
}
diff --git a/ReportImp/SHKServiceSBD/Arbeitszeitkonto.designer.cs b/ReportImp/SHKServiceSBD/Arbeitszeitkonto.designer.cs
index c4c444c1c..2d1ae9966 100644
--- a/ReportImp/SHKServiceSBD/Arbeitszeitkonto.designer.cs
+++ b/ReportImp/SHKServiceSBD/Arbeitszeitkonto.designer.cs
@@ -84,42 +84,43 @@ namespace SHKService
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
- this.fieldRelationGesamt = new DevExpress.XtraReports.UI.CalculatedField();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
- this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.GroupFooter3 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.xrLabel32 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel31 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
this.GroupFooter4 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
this.GroupFooter5 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
- this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
- this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel31 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel32 = new DevExpress.XtraReports.UI.XRLabel();
+ this.fieldRelationGesamt = new DevExpress.XtraReports.UI.CalculatedField();
+ this.fieldSummeAblaufplan = 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.xrTable1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
@@ -162,7 +163,7 @@ namespace SHKService
// xrTableCell3
//
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.Monat", "{0:MMMM}")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ArbeitszeitkontoList.MonatDetails.Monat", "{0:MMMM}")});
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseFont = false;
@@ -174,7 +175,7 @@ namespace SHKService
// xrTableCell19
//
this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollMax", "{0:0.00}")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ArbeitszeitkontoList.MonatDetails.Grundlage", "{0:0.00}")});
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Text = "xrTableCell19";
this.xrTableCell19.Weight = 0.090171325518485113D;
@@ -182,7 +183,7 @@ namespace SHKService
// xrTableCell20
//
this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UrlaubUndKrankheit", "{0:0.00}")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ArbeitszeitkontoList.MonatDetails.EmployeeDetail.StundenGesamtIst", "{0:0.00}")});
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Text = "xrTableCell20";
this.xrTableCell20.Weight = 0.090171325518485113D;
@@ -190,7 +191,7 @@ namespace SHKService
// xrTableCell28
//
this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ArbeitszeitkontoList.MonatDetails.EmployeeDetail.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Text = "xrTableCell28";
this.xrTableCell28.Weight = 0.090171325518485113D;
@@ -198,7 +199,7 @@ namespace SHKService
// xrTableCell16
//
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsSoll", "{0:0.00}")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ArbeitszeitkontoList.MonatDetails.EmployeeDetail.UeberstundenAusbezahlt", "{0:0.00}")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Text = "xrTableCell16";
this.xrTableCell16.Weight = 0.09017132551848514D;
@@ -206,7 +207,7 @@ namespace SHKService
// xrTableCell27
//
this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst", "{0:0.00}")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ArbeitszeitkontoList.MonatDetails.EmployeeDetail.Ueberstunden", "{0:0.00}")});
this.xrTableCell27.Name = "xrTableCell27";
this.xrTableCell27.Text = "xrTableCell27";
this.xrTableCell27.Weight = 0.090171325518485154D;
@@ -308,7 +309,7 @@ namespace SHKService
//
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.StylePriority.UseTextAlignment = false;
- this.xrTableCell4.Text = "Zeitnachweis";
+ this.xrTableCell4.Text = "Grundlage";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrTableCell4.Weight = 0.090171331824515352D;
//
@@ -394,7 +395,7 @@ namespace SHKService
this.cellFLSIstGesamt.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.cellFLSIstGesamt.BorderWidth = 3F;
this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ArbeitszeitkontoList.MonatDetails.EmployeeDetail.Ueberstunden")});
this.cellFLSIstGesamt.Name = "cellFLSIstGesamt";
this.cellFLSIstGesamt.StylePriority.UseBorderDashStyle = false;
this.cellFLSIstGesamt.StylePriority.UseBorders = false;
@@ -466,7 +467,7 @@ namespace SHKService
this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail2,
this.DetailReport2});
- this.DetailReport1.DataMember = "EmployeeInfoList";
+ this.DetailReport1.DataMember = "ArbeitszeitkontoList";
this.DetailReport1.DataSource = this.bindingSource1;
this.DetailReport1.Level = 0;
this.DetailReport1.Name = "DetailReport1";
@@ -488,7 +489,7 @@ namespace SHKService
this.GroupFooter3,
this.GroupFooter4,
this.GroupFooter5});
- this.DetailReport2.DataMember = "EmployeeInfoList.EmployeeDetails";
+ this.DetailReport2.DataMember = "ArbeitszeitkontoList.MonatDetails";
this.DetailReport2.DataSource = this.bindingSource1;
this.DetailReport2.Level = 0;
this.DetailReport2.Name = "DetailReport2";
@@ -552,6 +553,8 @@ namespace SHKService
// lblNachweiseBis
//
this.lblNachweiseBis.BackColor = System.Drawing.Color.Gainsboro;
+ this.lblNachweiseBis.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EintraegeBeruecksichtigtBis", "{0:dd.MM.yyyy}")});
this.lblNachweiseBis.LocationFloat = new DevExpress.Utils.PointFloat(382.25F, 70F);
this.lblNachweiseBis.Multiline = true;
this.lblNachweiseBis.Name = "lblNachweiseBis";
@@ -586,6 +589,8 @@ namespace SHKService
// xrLabel4
//
this.xrLabel4.BackColor = System.Drawing.Color.Gainsboro;
+ this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ArbeitszeitkontoList.Employee.PersonnelNumber")});
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(64.16666F, 35F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
@@ -606,7 +611,8 @@ namespace SHKService
this.xrLabel3.StylePriority.UseBackColor = false;
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.StylePriority.UseTextAlignment = false;
- this.xrLabel3.Text = "[EmployeeInfoList.LastName], [EmployeeInfoList.FirstName]";
+ this.xrLabel3.Text = "[ArbeitszeitkontoList.Employee.LastName], [ArbeitszeitkontoList.Employee.FirstNam" +
+ "e]";
this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel2
@@ -637,13 +643,6 @@ namespace SHKService
this.GroupFooter2.HeightF = 50F;
this.GroupFooter2.Name = "GroupFooter2";
//
- // fieldRelationGesamt
- //
- this.fieldRelationGesamt.DataMember = "EmployeeInfoList.EmployeeDetails";
- this.fieldRelationGesamt.Expression = "(Sum([EmployeeDetail.FlsIst]) / Sum([EmployeeDetail.StundenGesamtIst])) * 100";
- this.fieldRelationGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
- this.fieldRelationGesamt.Name = "fieldRelationGesamt";
- //
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -658,6 +657,82 @@ namespace SHKService
this.GroupFooter1.Level = 1;
this.GroupFooter1.Name = "GroupFooter1";
//
+ // xrLabel15
+ //
+ this.xrLabel15.BackColor = System.Drawing.Color.Gainsboro;
+ this.xrLabel15.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ArbeitszeitkontoList.ArbeitszeitProWoche")});
+ this.xrLabel15.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(382.25F, 70F);
+ this.xrLabel15.Multiline = true;
+ this.xrLabel15.Name = "xrLabel15";
+ this.xrLabel15.SizeF = new System.Drawing.SizeF(164.1667F, 20F);
+ this.xrLabel15.StylePriority.UseBackColor = false;
+ this.xrLabel15.StylePriority.UseBorders = false;
+ this.xrLabel15.StylePriority.UseFont = false;
+ this.xrLabel15.StylePriority.UseTextAlignment = false;
+ this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrLabel16
+ //
+ this.xrLabel16.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+ this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(382.25F, 45F);
+ this.xrLabel16.Multiline = true;
+ this.xrLabel16.Name = "xrLabel16";
+ this.xrLabel16.SizeF = new System.Drawing.SizeF(164.1667F, 20F);
+ this.xrLabel16.StylePriority.UseBorders = false;
+ this.xrLabel16.StylePriority.UseFont = false;
+ this.xrLabel16.StylePriority.UseTextAlignment = false;
+ this.xrLabel16.Text = "Wöchentl. Arbeitszeit";
+ this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrLabel14
+ //
+ this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(264.1667F, 45F);
+ this.xrLabel14.Multiline = true;
+ this.xrLabel14.Name = "xrLabel14";
+ this.xrLabel14.SizeF = new System.Drawing.SizeF(118.0833F, 20F);
+ this.xrLabel14.StylePriority.UseBorders = false;
+ this.xrLabel14.StylePriority.UseFont = false;
+ this.xrLabel14.StylePriority.UseTextAlignment = false;
+ this.xrLabel14.Text = "entspricht";
+ this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrLabel12
+ //
+ this.xrLabel12.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+ this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(100F, 45F);
+ this.xrLabel12.Multiline = true;
+ this.xrLabel12.Name = "xrLabel12";
+ this.xrLabel12.SizeF = new System.Drawing.SizeF(164.1667F, 20F);
+ this.xrLabel12.StylePriority.UseBorders = false;
+ this.xrLabel12.StylePriority.UseFont = false;
+ this.xrLabel12.StylePriority.UseTextAlignment = false;
+ this.xrLabel12.Text = "Monatl. Arbeitszeit";
+ this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrLabel13
+ //
+ this.xrLabel13.BackColor = System.Drawing.Color.Gainsboro;
+ this.xrLabel13.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ArbeitszeitkontoList.ArbeitszeitProMonat")});
+ this.xrLabel13.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(100F, 70F);
+ this.xrLabel13.Multiline = true;
+ this.xrLabel13.Name = "xrLabel13";
+ this.xrLabel13.SizeF = new System.Drawing.SizeF(164.1667F, 20F);
+ this.xrLabel13.StylePriority.UseBackColor = false;
+ this.xrLabel13.StylePriority.UseBorders = false;
+ this.xrLabel13.StylePriority.UseFont = false;
+ this.xrLabel13.StylePriority.UseTextAlignment = false;
+ this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
// xrLabel10
//
this.xrLabel10.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -682,78 +757,6 @@ namespace SHKService
this.xrLabel11.Text = "b)";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
- // xrLabel12
- //
- this.xrLabel12.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
- this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(100F, 45F);
- this.xrLabel12.Multiline = true;
- this.xrLabel12.Name = "xrLabel12";
- this.xrLabel12.SizeF = new System.Drawing.SizeF(164.1667F, 20F);
- this.xrLabel12.StylePriority.UseBorders = false;
- this.xrLabel12.StylePriority.UseFont = false;
- this.xrLabel12.StylePriority.UseTextAlignment = false;
- this.xrLabel12.Text = "Monatl. Arbeitszeit";
- this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrLabel13
- //
- this.xrLabel13.BackColor = System.Drawing.Color.Gainsboro;
- this.xrLabel13.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrLabel13.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(100F, 70F);
- this.xrLabel13.Multiline = true;
- this.xrLabel13.Name = "xrLabel13";
- this.xrLabel13.SizeF = new System.Drawing.SizeF(164.1667F, 20F);
- this.xrLabel13.StylePriority.UseBackColor = false;
- this.xrLabel13.StylePriority.UseBorders = false;
- this.xrLabel13.StylePriority.UseFont = false;
- this.xrLabel13.StylePriority.UseTextAlignment = false;
- this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrLabel14
- //
- this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(264.1667F, 45F);
- this.xrLabel14.Multiline = true;
- this.xrLabel14.Name = "xrLabel14";
- this.xrLabel14.SizeF = new System.Drawing.SizeF(118.0833F, 20F);
- this.xrLabel14.StylePriority.UseBorders = false;
- this.xrLabel14.StylePriority.UseFont = false;
- this.xrLabel14.StylePriority.UseTextAlignment = false;
- this.xrLabel14.Text = "entspricht";
- this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrLabel15
- //
- this.xrLabel15.BackColor = System.Drawing.Color.Gainsboro;
- this.xrLabel15.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrLabel15.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(382.25F, 70F);
- this.xrLabel15.Multiline = true;
- this.xrLabel15.Name = "xrLabel15";
- this.xrLabel15.SizeF = new System.Drawing.SizeF(164.1667F, 20F);
- this.xrLabel15.StylePriority.UseBackColor = false;
- this.xrLabel15.StylePriority.UseBorders = false;
- this.xrLabel15.StylePriority.UseFont = false;
- this.xrLabel15.StylePriority.UseTextAlignment = false;
- this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrLabel16
- //
- this.xrLabel16.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
- this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(382.25F, 45F);
- this.xrLabel16.Multiline = true;
- this.xrLabel16.Name = "xrLabel16";
- this.xrLabel16.SizeF = new System.Drawing.SizeF(164.1667F, 20F);
- this.xrLabel16.StylePriority.UseBorders = false;
- this.xrLabel16.StylePriority.UseFont = false;
- this.xrLabel16.StylePriority.UseTextAlignment = false;
- this.xrLabel16.Text = "Wöchentl. Arbeitszeit";
- this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
// GroupFooter3
//
this.GroupFooter3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -775,6 +778,187 @@ namespace SHKService
this.GroupFooter3.Level = 2;
this.GroupFooter3.Name = "GroupFooter3";
//
+ // xrLabel32
+ //
+ this.xrLabel32.BackColor = System.Drawing.Color.Gainsboro;
+ this.xrLabel32.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ArbeitszeitkontoList.fieldSummeAblaufplan", "{0:0.00} Std.")});
+ this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(500F, 70F);
+ this.xrLabel32.Multiline = true;
+ this.xrLabel32.Name = "xrLabel32";
+ this.xrLabel32.SizeF = new System.Drawing.SizeF(100F, 20F);
+ this.xrLabel32.StylePriority.UseBackColor = false;
+ this.xrLabel32.StylePriority.UseBorders = false;
+ this.xrLabel32.StylePriority.UseFont = false;
+ this.xrLabel32.StylePriority.UseTextAlignment = false;
+ this.xrLabel32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrLabel31
+ //
+ this.xrLabel31.BackColor = System.Drawing.Color.Gainsboro;
+ this.xrLabel31.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ArbeitszeitkontoList.AblaufplanFreitag", "{0:0.00} Std.")});
+ this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(400F, 70F);
+ this.xrLabel31.Multiline = true;
+ this.xrLabel31.Name = "xrLabel31";
+ this.xrLabel31.SizeF = new System.Drawing.SizeF(100F, 20F);
+ this.xrLabel31.StylePriority.UseBackColor = false;
+ this.xrLabel31.StylePriority.UseBorders = false;
+ this.xrLabel31.StylePriority.UseFont = false;
+ this.xrLabel31.StylePriority.UseTextAlignment = false;
+ this.xrLabel31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrLabel30
+ //
+ this.xrLabel30.BackColor = System.Drawing.Color.Gainsboro;
+ this.xrLabel30.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ArbeitszeitkontoList.AblaufplanDonnerstag", "{0:0.00} Std.")});
+ this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(300F, 70F);
+ this.xrLabel30.Multiline = true;
+ this.xrLabel30.Name = "xrLabel30";
+ this.xrLabel30.SizeF = new System.Drawing.SizeF(100F, 20F);
+ this.xrLabel30.StylePriority.UseBackColor = false;
+ this.xrLabel30.StylePriority.UseBorders = false;
+ this.xrLabel30.StylePriority.UseFont = false;
+ this.xrLabel30.StylePriority.UseTextAlignment = false;
+ this.xrLabel30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrLabel29
+ //
+ this.xrLabel29.BackColor = System.Drawing.Color.Gainsboro;
+ this.xrLabel29.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ArbeitszeitkontoList.AblaufplanMittwoch", "{0:0.00} Std.")});
+ this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(200F, 70F);
+ this.xrLabel29.Multiline = true;
+ this.xrLabel29.Name = "xrLabel29";
+ this.xrLabel29.SizeF = new System.Drawing.SizeF(100F, 20F);
+ this.xrLabel29.StylePriority.UseBackColor = false;
+ this.xrLabel29.StylePriority.UseBorders = false;
+ this.xrLabel29.StylePriority.UseFont = false;
+ this.xrLabel29.StylePriority.UseTextAlignment = false;
+ this.xrLabel29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrLabel28
+ //
+ this.xrLabel28.BackColor = System.Drawing.Color.Gainsboro;
+ this.xrLabel28.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ArbeitszeitkontoList.AblaufplanDienstag", "{0:0.00} Std.")});
+ this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(100F, 70F);
+ this.xrLabel28.Multiline = true;
+ this.xrLabel28.Name = "xrLabel28";
+ this.xrLabel28.SizeF = new System.Drawing.SizeF(100F, 20F);
+ this.xrLabel28.StylePriority.UseBackColor = false;
+ this.xrLabel28.StylePriority.UseBorders = false;
+ this.xrLabel28.StylePriority.UseFont = false;
+ this.xrLabel28.StylePriority.UseTextAlignment = false;
+ this.xrLabel28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrLabel27
+ //
+ this.xrLabel27.BackColor = System.Drawing.Color.Gainsboro;
+ this.xrLabel27.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ArbeitszeitkontoList.AblaufplanMontag", "{0:0.00} Std.")});
+ this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(0F, 70F);
+ this.xrLabel27.Multiline = true;
+ this.xrLabel27.Name = "xrLabel27";
+ this.xrLabel27.SizeF = new System.Drawing.SizeF(100F, 20F);
+ this.xrLabel27.StylePriority.UseBackColor = false;
+ this.xrLabel27.StylePriority.UseBorders = false;
+ this.xrLabel27.StylePriority.UseFont = false;
+ this.xrLabel27.StylePriority.UseTextAlignment = false;
+ this.xrLabel27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrLabel26
+ //
+ this.xrLabel26.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+ this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(500F, 45F);
+ this.xrLabel26.Multiline = true;
+ this.xrLabel26.Name = "xrLabel26";
+ this.xrLabel26.SizeF = new System.Drawing.SizeF(100F, 20F);
+ this.xrLabel26.StylePriority.UseBorders = false;
+ this.xrLabel26.StylePriority.UseFont = false;
+ this.xrLabel26.StylePriority.UseTextAlignment = false;
+ this.xrLabel26.Text = "Summe";
+ this.xrLabel26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrLabel25
+ //
+ this.xrLabel25.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+ this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(400F, 45F);
+ this.xrLabel25.Multiline = true;
+ this.xrLabel25.Name = "xrLabel25";
+ this.xrLabel25.SizeF = new System.Drawing.SizeF(100F, 20F);
+ this.xrLabel25.StylePriority.UseBorders = false;
+ this.xrLabel25.StylePriority.UseFont = false;
+ this.xrLabel25.StylePriority.UseTextAlignment = false;
+ this.xrLabel25.Text = "Freitag";
+ this.xrLabel25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrLabel24
+ //
+ this.xrLabel24.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+ this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(300F, 45F);
+ this.xrLabel24.Multiline = true;
+ this.xrLabel24.Name = "xrLabel24";
+ this.xrLabel24.SizeF = new System.Drawing.SizeF(100F, 20F);
+ this.xrLabel24.StylePriority.UseBorders = false;
+ this.xrLabel24.StylePriority.UseFont = false;
+ this.xrLabel24.StylePriority.UseTextAlignment = false;
+ this.xrLabel24.Text = "Donnerstag";
+ this.xrLabel24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrLabel23
+ //
+ this.xrLabel23.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+ this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(200F, 45F);
+ this.xrLabel23.Multiline = true;
+ this.xrLabel23.Name = "xrLabel23";
+ this.xrLabel23.SizeF = new System.Drawing.SizeF(100F, 20F);
+ this.xrLabel23.StylePriority.UseBorders = false;
+ this.xrLabel23.StylePriority.UseFont = false;
+ this.xrLabel23.StylePriority.UseTextAlignment = false;
+ this.xrLabel23.Text = "Mittwoch";
+ this.xrLabel23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrLabel22
+ //
+ this.xrLabel22.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+ this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(100F, 45F);
+ this.xrLabel22.Multiline = true;
+ this.xrLabel22.Name = "xrLabel22";
+ this.xrLabel22.SizeF = new System.Drawing.SizeF(100F, 20F);
+ this.xrLabel22.StylePriority.UseBorders = false;
+ this.xrLabel22.StylePriority.UseFont = false;
+ this.xrLabel22.StylePriority.UseTextAlignment = false;
+ this.xrLabel22.Text = "Dienstag";
+ this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrLabel21
+ //
+ this.xrLabel21.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+ this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 45F);
+ this.xrLabel21.Multiline = true;
+ this.xrLabel21.Name = "xrLabel21";
+ this.xrLabel21.SizeF = new System.Drawing.SizeF(100F, 20F);
+ this.xrLabel21.StylePriority.UseBorders = false;
+ this.xrLabel21.StylePriority.UseFont = false;
+ this.xrLabel21.StylePriority.UseTextAlignment = false;
+ this.xrLabel21.Text = "Montag";
+ this.xrLabel21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
// xrLabel17
//
this.xrLabel17.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -809,6 +993,15 @@ namespace SHKService
this.GroupFooter4.Level = 3;
this.GroupFooter4.Name = "GroupFooter4";
//
+ // xrRichText2
+ //
+ this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F);
+ this.xrRichText2.Name = "xrRichText2";
+ this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
+ this.xrRichText2.SizeF = new System.Drawing.SizeF(600F, 72.5F);
+ this.xrRichText2.StylePriority.UseFont = false;
+ //
// xrLabel19
//
this.xrLabel19.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -850,187 +1043,23 @@ namespace SHKService
this.xrRichText1.SizeF = new System.Drawing.SizeF(600F, 62.5F);
this.xrRichText1.StylePriority.UseFont = false;
//
- // xrRichText2
+ // fieldRelationGesamt
//
- this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
- this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F);
- this.xrRichText2.Name = "xrRichText2";
- this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
- this.xrRichText2.SizeF = new System.Drawing.SizeF(600F, 72.5F);
- this.xrRichText2.StylePriority.UseFont = false;
+ this.fieldRelationGesamt.DataMember = "EmployeeInfoList.EmployeeDetails";
+ this.fieldRelationGesamt.Expression = "(Sum([EmployeeDetail.FlsIst]) / Sum([EmployeeDetail.StundenGesamtIst])) * 100";
+ this.fieldRelationGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldRelationGesamt.Name = "fieldRelationGesamt";
//
- // xrLabel21
+ // fieldSummeAblaufplan
//
- this.xrLabel21.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
- this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 45F);
- this.xrLabel21.Multiline = true;
- this.xrLabel21.Name = "xrLabel21";
- this.xrLabel21.SizeF = new System.Drawing.SizeF(100F, 20F);
- this.xrLabel21.StylePriority.UseBorders = false;
- this.xrLabel21.StylePriority.UseFont = false;
- this.xrLabel21.StylePriority.UseTextAlignment = false;
- this.xrLabel21.Text = "Montag";
- this.xrLabel21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrLabel22
- //
- this.xrLabel22.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
- this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(100F, 45F);
- this.xrLabel22.Multiline = true;
- this.xrLabel22.Name = "xrLabel22";
- this.xrLabel22.SizeF = new System.Drawing.SizeF(100F, 20F);
- this.xrLabel22.StylePriority.UseBorders = false;
- this.xrLabel22.StylePriority.UseFont = false;
- this.xrLabel22.StylePriority.UseTextAlignment = false;
- this.xrLabel22.Text = "Dienstag";
- this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrLabel23
- //
- this.xrLabel23.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
- this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(200F, 45F);
- this.xrLabel23.Multiline = true;
- this.xrLabel23.Name = "xrLabel23";
- this.xrLabel23.SizeF = new System.Drawing.SizeF(100F, 20F);
- this.xrLabel23.StylePriority.UseBorders = false;
- this.xrLabel23.StylePriority.UseFont = false;
- this.xrLabel23.StylePriority.UseTextAlignment = false;
- this.xrLabel23.Text = "Mittwoch";
- this.xrLabel23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrLabel24
- //
- this.xrLabel24.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
- this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(300F, 45F);
- this.xrLabel24.Multiline = true;
- this.xrLabel24.Name = "xrLabel24";
- this.xrLabel24.SizeF = new System.Drawing.SizeF(100F, 20F);
- this.xrLabel24.StylePriority.UseBorders = false;
- this.xrLabel24.StylePriority.UseFont = false;
- this.xrLabel24.StylePriority.UseTextAlignment = false;
- this.xrLabel24.Text = "Donnerstag";
- this.xrLabel24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrLabel25
- //
- this.xrLabel25.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
- this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(400F, 45F);
- this.xrLabel25.Multiline = true;
- this.xrLabel25.Name = "xrLabel25";
- this.xrLabel25.SizeF = new System.Drawing.SizeF(100F, 20F);
- this.xrLabel25.StylePriority.UseBorders = false;
- this.xrLabel25.StylePriority.UseFont = false;
- this.xrLabel25.StylePriority.UseTextAlignment = false;
- this.xrLabel25.Text = "Freitag";
- this.xrLabel25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrLabel26
- //
- this.xrLabel26.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
- this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(500F, 45F);
- this.xrLabel26.Multiline = true;
- this.xrLabel26.Name = "xrLabel26";
- this.xrLabel26.SizeF = new System.Drawing.SizeF(100F, 20F);
- this.xrLabel26.StylePriority.UseBorders = false;
- this.xrLabel26.StylePriority.UseFont = false;
- this.xrLabel26.StylePriority.UseTextAlignment = false;
- this.xrLabel26.Text = "Summe";
- this.xrLabel26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrLabel27
- //
- this.xrLabel27.BackColor = System.Drawing.Color.Gainsboro;
- this.xrLabel27.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(0F, 70F);
- this.xrLabel27.Multiline = true;
- this.xrLabel27.Name = "xrLabel27";
- this.xrLabel27.SizeF = new System.Drawing.SizeF(100F, 20F);
- this.xrLabel27.StylePriority.UseBackColor = false;
- this.xrLabel27.StylePriority.UseBorders = false;
- this.xrLabel27.StylePriority.UseFont = false;
- this.xrLabel27.StylePriority.UseTextAlignment = false;
- this.xrLabel27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrLabel28
- //
- this.xrLabel28.BackColor = System.Drawing.Color.Gainsboro;
- this.xrLabel28.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(100F, 70F);
- this.xrLabel28.Multiline = true;
- this.xrLabel28.Name = "xrLabel28";
- this.xrLabel28.SizeF = new System.Drawing.SizeF(100F, 20F);
- this.xrLabel28.StylePriority.UseBackColor = false;
- this.xrLabel28.StylePriority.UseBorders = false;
- this.xrLabel28.StylePriority.UseFont = false;
- this.xrLabel28.StylePriority.UseTextAlignment = false;
- this.xrLabel28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrLabel29
- //
- this.xrLabel29.BackColor = System.Drawing.Color.Gainsboro;
- this.xrLabel29.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(200F, 70F);
- this.xrLabel29.Multiline = true;
- this.xrLabel29.Name = "xrLabel29";
- this.xrLabel29.SizeF = new System.Drawing.SizeF(100F, 20F);
- this.xrLabel29.StylePriority.UseBackColor = false;
- this.xrLabel29.StylePriority.UseBorders = false;
- this.xrLabel29.StylePriority.UseFont = false;
- this.xrLabel29.StylePriority.UseTextAlignment = false;
- this.xrLabel29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrLabel30
- //
- this.xrLabel30.BackColor = System.Drawing.Color.Gainsboro;
- this.xrLabel30.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(300F, 70F);
- this.xrLabel30.Multiline = true;
- this.xrLabel30.Name = "xrLabel30";
- this.xrLabel30.SizeF = new System.Drawing.SizeF(100F, 20F);
- this.xrLabel30.StylePriority.UseBackColor = false;
- this.xrLabel30.StylePriority.UseBorders = false;
- this.xrLabel30.StylePriority.UseFont = false;
- this.xrLabel30.StylePriority.UseTextAlignment = false;
- this.xrLabel30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrLabel31
- //
- this.xrLabel31.BackColor = System.Drawing.Color.Gainsboro;
- this.xrLabel31.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(400F, 70F);
- this.xrLabel31.Multiline = true;
- this.xrLabel31.Name = "xrLabel31";
- this.xrLabel31.SizeF = new System.Drawing.SizeF(100F, 20F);
- this.xrLabel31.StylePriority.UseBackColor = false;
- this.xrLabel31.StylePriority.UseBorders = false;
- this.xrLabel31.StylePriority.UseFont = false;
- this.xrLabel31.StylePriority.UseTextAlignment = false;
- this.xrLabel31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrLabel32
- //
- this.xrLabel32.BackColor = System.Drawing.Color.Gainsboro;
- this.xrLabel32.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(500F, 70F);
- this.xrLabel32.Multiline = true;
- this.xrLabel32.Name = "xrLabel32";
- this.xrLabel32.SizeF = new System.Drawing.SizeF(100F, 20F);
- this.xrLabel32.StylePriority.UseBackColor = false;
- this.xrLabel32.StylePriority.UseBorders = false;
- this.xrLabel32.StylePriority.UseFont = false;
- this.xrLabel32.StylePriority.UseTextAlignment = false;
- this.xrLabel32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.fieldSummeAblaufplan.DataMember = "ArbeitszeitkontoList";
+ this.fieldSummeAblaufplan.Expression = "[AblaufplanMontag]+[AblaufplanDienstag]+[AblaufplanMittwoch]+[AblaufplanDonnersta" +
+ "g]+[AblaufplanFreitag]";
+ this.fieldSummeAblaufplan.Name = "fieldSummeAblaufplan";
//
// bindingSource1
//
- this.bindingSource1.DataSource = typeof(ArbeitszeitkontoListRO);
+ this.bindingSource1.DataSource = typeof(SHKService.ArbeitszeitkontoListRO);
//
// Arbeitszeitkonto
//
@@ -1041,7 +1070,8 @@ namespace SHKService
this.DetailReport1});
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldFLS,
- this.fieldRelationGesamt});
+ this.fieldRelationGesamt,
+ this.fieldSummeAblaufplan});
this.DataSource = this.bindingSource1;
this.DisplayName = "Arbeitszeitkonto";
this.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -1058,8 +1088,8 @@ namespace SHKService
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
@@ -1150,5 +1180,6 @@ namespace SHKService
private DevExpress.XtraReports.UI.XRLabel xrLabel23;
private DevExpress.XtraReports.UI.XRLabel xrLabel22;
private DevExpress.XtraReports.UI.XRLabel xrLabel21;
+ private DevExpress.XtraReports.UI.CalculatedField fieldSummeAblaufplan;
}
}
diff --git a/ReportImp/SHKServiceSBD/ArbeitszeitkontoListRO.cs b/ReportImp/SHKServiceSBD/ArbeitszeitkontoListRO.cs
index 40c026c7e..37938e56d 100644
--- a/ReportImp/SHKServiceSBD/ArbeitszeitkontoListRO.cs
+++ b/ReportImp/SHKServiceSBD/ArbeitszeitkontoListRO.cs
@@ -1,4 +1,5 @@
using BeWo.Report.ReportObjects;
+using BS.Shared.DataContracts.Compact;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -14,6 +15,8 @@ namespace SHKService
ArbeitszeitkontoList = new List();
}
+ public DateTime EintraegeBeruecksichtigtBis { get; set; }
+
public List ArbeitszeitkontoList
{
get; set;
@@ -24,22 +27,45 @@ namespace SHKService
{
public ArbeitszeitkontoRO()
{
- ArbeitszeitkontoList = new List();
+ MonatDetails = new List();
}
- public class EmployeeDetailMonat
- {
+
+ public CompactEmployeeDC Employee { get; set; }
- public DateTime Monat { get; set; }
+ public decimal ArbeitszeitProMonat { get; set; }
- public decimal LaufendeGesamtsumme { get; set; }
+ public decimal ArbeitszeitProWoche { get; set; }
- public MitarbeiterstundenkontoRO.EmployeeDetail EmployeeDetail { get; set; }
+ public decimal AblaufplanMontag { get; set; }
- }
- public List ArbeitszeitkontoList
+ public decimal AblaufplanDienstag { get; set; }
+
+ public decimal AblaufplanMittwoch { get; set; }
+
+ public decimal AblaufplanDonnerstag { get; set; }
+
+ public decimal AblaufplanFreitag { get; set; }
+
+ public decimal AblaufplanSamstag { get; set; }
+
+
+ public List MonatDetails
{
get; set;
}
}
+
+ public class EmployeeDetailMonat
+ {
+
+ public DateTime Monat { get; set; }
+
+ public String Grundlage { get; set; }
+
+ public decimal LaufendeGesamtsumme { get; set; }
+
+ public MitarbeiterstundenkontoRO.EmployeeDetail EmployeeDetail { get; set; }
+
+ }
}
diff --git a/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnungMonate.cs b/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnungMonate.cs
index 6faae53a0..ad0f23e38 100644
--- a/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnungMonate.cs
+++ b/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnungMonate.cs
@@ -11,7 +11,38 @@ namespace SHKService
{
public class CustomMitarbeiterstundenkontoBerechnungMonate : MitarbeiterstundenkontoBerechnungMonate
{
+ public override void CreateReport(MitarbeiterstundenkontoMonateRO ro)
+ {
+ DateTime start = ro.ReportStartDate;
+ var roDieserMonat = MitarbeiterstundenkontoRO.Create(ro.EmployeeOid, ro.TeamOids, start, start.AddMonths(1), ro.EmployeeOids);
+ var b = CreateMitarbeiterstundenkontoBerechnung();
+ b.CreateReport(roDieserMonat);
+
+ var list = new List();
+ while (start < ro.ReportEndDate)
+ {
+ DateTime monatStart = new DateTime(start.Year, start.Month, 1);
+ DateTime monatEnde = monatStart.AddMonths(1);
+
+ if (monatStart == ro.ReportStartDate)
+ {
+ MitarbeiterstundenkontoRO roMonat = MitarbeiterstundenkontoRO.Create(ro.EmployeeOid, ro.TeamOids, monatStart, monatEnde, ro.EmployeeOids);
+ b = CreateMitarbeiterstundenkontoBerechnung();
+ b.CreateReport(roMonat);
+
+ list.Add(roMonat);
+ }
+ else
+ {
+ //Schon oben erzeugt
+ list.Add(roDieserMonat);
+ }
+ start = start.AddMonths(1);
+ }
+
+ InitData(ro, list);
+ }
public override MitarbeiterstundenkontoBerechnung CreateMitarbeiterstundenkontoBerechnung()
{
return new CustomMitarbeiterstundenkontoBerechnung();
diff --git a/ReportImp/WahlEv/WahlCalculations.cs b/ReportImp/WahlEv/WahlCalculations.cs
index 062782210..e8edd258f 100644
--- a/ReportImp/WahlEv/WahlCalculations.cs
+++ b/ReportImp/WahlEv/WahlCalculations.cs
@@ -54,10 +54,12 @@ namespace WahlEv
else if (!scap.ApprovedBEPerInterval.HasValue && scap.ApprovedBETotal.HasValue && scap.StartDate.HasValue && scap.EndDate.HasValue)
{
var months = GetTotalMonths(scap.StartDate.Value, scap.EndDate.Value);
+ if (months != 0)
+ {
+ var monatlich = scap.ApprovedBETotal.Value / months;
- var monatlich = scap.ApprovedBETotal.Value / months;
-
- return monatlich / 4.33m;
+ return monatlich / 4.33m;
+ }
}
return this.GetApprovedHoursPerDay(scap, costRatePeriods) * 7;
}
diff --git a/ReportImp/Wichernhaus/Budgetnachweis2.Designer.cs b/ReportImp/Wichernhaus/Budgetnachweis2.Designer.cs
index fe9aebd63..66c76d2c0 100644
--- a/ReportImp/Wichernhaus/Budgetnachweis2.Designer.cs
+++ b/ReportImp/Wichernhaus/Budgetnachweis2.Designer.cs
@@ -1,6 +1,6 @@
-namespace Wichernhaus
+namespace Wichernhaus.Neu
{
- partial class Budgetnachweis2
+ partial class Budgetnachweis
{
///
/// Required designer variable.
@@ -29,180 +29,199 @@ namespace Wichernhaus
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Budgetnachweis2));
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Budgetnachweis));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
- this.xrPanel1 = new DevExpress.XtraReports.UI.XRPanel();
- this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
- this.lblAktenzeichen = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLine2 = new DevExpress.XtraReports.UI.XRLine();
+ this.xrLine1 = new DevExpress.XtraReports.UI.XRLine();
+ this.xrLabel35 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.xrCheckBox2 = new DevExpress.XtraReports.UI.XRCheckBox();
this.xrCheckBox1 = new DevExpress.XtraReports.UI.XRCheckBox();
+ this.tableRechnungspositionen = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.cellStart1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellEnd1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellHourlyRate1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellFLS1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.cellStart2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellEnd2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellHourlyRate2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellFLS2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.cellStart3 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellEnd3 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellHourlyRate3 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellFLS3 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
- this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
- this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
+ this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ ((System.ComponentModel.ISupportInitialize)(this.tableRechnungspositionen)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
//
this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrPanel1,
- this.xrLabel12,
- this.xrCheckBox2,
- this.xrCheckBox1});
- this.Detail.HeightF = 444.7082F;
+ this.xrLabel1,
+ this.xrLabel16,
+ this.xrLabel10,
+ this.xrLabel7,
+ this.xrLabel14,
+ this.xrLabel15});
+ this.Detail.HeightF = 278.3333F;
this.Detail.Name = "Detail";
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail.StylePriority.UseFont = false;
this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
- // xrPanel1
+ // xrLabel1
//
- this.xrPanel1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrPanel1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrLabel15,
- this.lblAktenzeichen,
- this.xrLabel7,
- this.xrLabel10,
- this.xrLabel3,
- this.xrLabel9});
- this.xrPanel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrPanel1.Name = "xrPanel1";
- this.xrPanel1.SizeF = new System.Drawing.SizeF(673.3192F, 179.1617F);
- this.xrPanel1.StylePriority.UseBorders = false;
+ this.xrLabel1.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(60F, 53.95833F);
+ this.xrLabel1.Multiline = true;
+ this.xrLabel1.Name = "xrLabel1";
+ this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel1.SizeF = new System.Drawing.SizeF(642F, 66.25F);
+ this.xrLabel1.StylePriority.UseBackColor = false;
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.Text = "Sehr geehrte Damen und Herren,\r\n\r\nanbei der Budgetnachweis des Ambulant Betreuten" +
+ " Wohnens der Wichernhaus gGmbH";
//
- // xrLabel15
+ // xrLabel16
//
- this.xrLabel15.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel15.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.xrLabel15.CanShrink = true;
- this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 29.99999F);
- this.xrLabel15.Name = "xrLabel15";
- this.xrLabel15.SizeF = new System.Drawing.SizeF(650F, 20F);
- this.xrLabel15.StylePriority.UseBackColor = false;
- this.xrLabel15.StylePriority.UseBorders = false;
- this.xrLabel15.StylePriority.UseFont = false;
- this.xrLabel15.StylePriority.UsePadding = false;
- this.xrLabel15.Text = "[CustomerName], [CustomerStreet], [CustomerPostalCode] [CustomerTown]";
- this.xrLabel15.WordWrap = false;
- //
- // lblAktenzeichen
- //
- this.lblAktenzeichen.BackColor = System.Drawing.Color.Transparent;
- this.lblAktenzeichen.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.lblAktenzeichen.CanShrink = true;
- this.lblAktenzeichen.LocationFloat = new DevExpress.Utils.PointFloat(10F, 65F);
- this.lblAktenzeichen.Multiline = true;
- this.lblAktenzeichen.Name = "lblAktenzeichen";
- this.lblAktenzeichen.SizeF = new System.Drawing.SizeF(650F, 20F);
- this.lblAktenzeichen.StylePriority.UseBackColor = false;
- this.lblAktenzeichen.StylePriority.UseBorders = false;
- this.lblAktenzeichen.StylePriority.UseFont = false;
- this.lblAktenzeichen.StylePriority.UsePadding = false;
- this.lblAktenzeichen.Text = "Aktenzeichen: [CustomerReferenceNumber] Geburtsdatum: [CustomerBirthdayStr" +
- "ing]";
- this.lblAktenzeichen.WordWrap = false;
- //
- // xrLabel7
- //
- this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.xrLabel7.CanShrink = true;
- this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(10F, 100F);
- this.xrLabel7.Multiline = true;
- this.xrLabel7.Name = "xrLabel7";
- this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F);
- this.xrLabel7.StylePriority.UseBackColor = false;
- this.xrLabel7.StylePriority.UseBorders = false;
- this.xrLabel7.StylePriority.UseFont = false;
- this.xrLabel7.StylePriority.UsePadding = false;
- this.xrLabel7.Text = "Bewilligungszeitraum von [AccountingPeriod]";
- this.xrLabel7.WordWrap = false;
+ this.xrLabel16.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel16.CanShrink = true;
+ this.xrLabel16.Font = new System.Drawing.Font("Times New Roman", 14F, System.Drawing.FontStyle.Bold);
+ this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 10.00001F);
+ this.xrLabel16.Name = "xrLabel16";
+ this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel16.SizeF = new System.Drawing.SizeF(435.4167F, 23.24998F);
+ this.xrLabel16.StylePriority.UseBackColor = false;
+ this.xrLabel16.StylePriority.UseFont = false;
+ this.xrLabel16.Text = "Ambulant Betreutes Wohnen - Budgetnachweis";
+ this.xrLabel16.WordWrap = false;
//
// xrLabel10
//
this.xrLabel10.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel10.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(10F, 135F);
+ this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(60F, 224.0828F);
this.xrLabel10.Multiline = true;
this.xrLabel10.Name = "xrLabel10";
- this.xrLabel10.SizeF = new System.Drawing.SizeF(551.3751F, 27.08333F);
+ this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel10.SizeF = new System.Drawing.SizeF(642F, 27.08333F);
this.xrLabel10.StylePriority.UseBackColor = false;
- this.xrLabel10.StylePriority.UseBorders = false;
this.xrLabel10.StylePriority.UseFont = false;
- this.xrLabel10.StylePriority.UsePadding = false;
- this.xrLabel10.Text = "Tatsächlich geleistete Fachleistungsstunden im Bewilligungszeitraum lt. Anlage:";
+ this.xrLabel10.Text = "Im Bewilligungszeitraum tatsächlich geleistete Fachleistungsstunden (FLS)";
//
- // xrLabel3
+ // xrLabel7
//
- this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrLabel3.BorderWidth = 2F;
- this.xrLabel3.CanShrink = true;
- this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecordedFLSTotal", "{0:0.00}")});
- this.xrLabel3.Font = new System.Drawing.Font("Times New Roman", 12F, System.Drawing.FontStyle.Bold);
- this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(561.38F, 132F);
- this.xrLabel3.Multiline = true;
- this.xrLabel3.Name = "xrLabel3";
- this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel3.SizeF = new System.Drawing.SizeF(98.62469F, 27.08333F);
- this.xrLabel3.StylePriority.UseBackColor = false;
- this.xrLabel3.StylePriority.UseBorders = false;
- this.xrLabel3.StylePriority.UseBorderWidth = false;
- this.xrLabel3.StylePriority.UseFont = false;
- this.xrLabel3.StylePriority.UseTextAlignment = false;
- this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrLabel3.WordWrap = false;
+ this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel7.CanShrink = true;
+ this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(60F, 179.8749F);
+ this.xrLabel7.Multiline = true;
+ this.xrLabel7.Name = "xrLabel7";
+ this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F);
+ this.xrLabel7.StylePriority.UseBackColor = false;
+ this.xrLabel7.StylePriority.UseFont = false;
+ this.xrLabel7.Text = "Bewilligungszeitraum vom [AccountingPeriod]";
+ this.xrLabel7.WordWrap = false;
//
- // xrLabel9
+ // xrLabel14
//
- this.xrLabel9.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.xrLabel9.CanShrink = true;
- this.xrLabel9.Font = new System.Drawing.Font("Times New Roman", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
- this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 9.999974F);
- this.xrLabel9.Name = "xrLabel9";
- this.xrLabel9.SizeF = new System.Drawing.SizeF(650F, 20F);
- this.xrLabel9.StylePriority.UseBackColor = false;
- this.xrLabel9.StylePriority.UseBorders = false;
- this.xrLabel9.StylePriority.UseFont = false;
- this.xrLabel9.StylePriority.UsePadding = false;
- this.xrLabel9.Text = "Leistungsberechtigte/r:";
- this.xrLabel9.WordWrap = false;
+ this.xrLabel14.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel14.CanShrink = true;
+ this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(60F, 159.8749F);
+ this.xrLabel14.Multiline = true;
+ this.xrLabel14.Name = "xrLabel14";
+ this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel14.SizeF = new System.Drawing.SizeF(650F, 20F);
+ this.xrLabel14.StylePriority.UseBackColor = false;
+ this.xrLabel14.StylePriority.UseFont = false;
+ this.xrLabel14.Text = "Aktenzeichen LWL: [CustomerReferenceNumber]";
+ this.xrLabel14.WordWrap = false;
+ //
+ // xrLabel15
+ //
+ this.xrLabel15.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel15.CanShrink = true;
+ this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(60F, 139.8749F);
+ this.xrLabel15.Name = "xrLabel15";
+ this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel15.SizeF = new System.Drawing.SizeF(650F, 20F);
+ this.xrLabel15.StylePriority.UseBackColor = false;
+ this.xrLabel15.StylePriority.UseFont = false;
+ this.xrLabel15.Text = "für [Salutation2] [CustomerName], geb. [CustomerBirthday!dd.MM.yyyy]";
+ this.xrLabel15.WordWrap = false;
+ //
+ // xrLine2
+ //
+ this.xrLine2.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 274.3801F);
+ this.xrLine2.Name = "xrLine2";
+ this.xrLine2.SizeF = new System.Drawing.SizeF(270F, 9.75F);
+ //
+ // xrLine1
+ //
+ this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 204.38F);
+ this.xrLine1.Name = "xrLine1";
+ this.xrLine1.SizeF = new System.Drawing.SizeF(309.5687F, 9.749969F);
+ //
+ // xrLabel35
+ //
+ this.xrLabel35.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel35.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.xrLabel35.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+ this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 214.13F);
+ this.xrLabel35.Multiline = true;
+ this.xrLabel35.Name = "xrLabel35";
+ this.xrLabel35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel35.SizeF = new System.Drawing.SizeF(236.697F, 17F);
+ this.xrLabel35.StylePriority.UseBackColor = false;
+ this.xrLabel35.StylePriority.UseBorders = false;
+ this.xrLabel35.StylePriority.UseFont = false;
+ this.xrLabel35.Text = "Stempel, Unterschrift";
+ this.xrLabel35.WordWrap = false;
//
// xrLabel12
//
this.xrLabel12.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 267.0832F);
+ this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(65.00021F, 67.71322F);
this.xrLabel12.Multiline = true;
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel12.SizeF = new System.Drawing.SizeF(695.3123F, 177.625F);
+ this.xrLabel12.SizeF = new System.Drawing.SizeF(646.9999F, 120.3334F);
this.xrLabel12.StylePriority.UseBackColor = false;
this.xrLabel12.StylePriority.UseFont = false;
- this.xrLabel12.StylePriority.UseTextAlignment = false;
this.xrLabel12.Text = resources.GetString("xrLabel12.Text");
- this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopJustify;
//
// xrCheckBox2
//
- this.xrCheckBox2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 226.0367F);
+ this.xrCheckBox2.LocationFloat = new DevExpress.Utils.PointFloat(424.5832F, 9.999974F);
this.xrCheckBox2.Name = "xrCheckBox2";
this.xrCheckBox2.SizeF = new System.Drawing.SizeF(211.0832F, 21.875F);
this.xrCheckBox2.StylePriority.UseFont = false;
@@ -210,11 +229,207 @@ namespace Wichernhaus
//
// xrCheckBox1
//
- this.xrCheckBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192.7034F);
+ this.xrCheckBox1.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 9.999974F);
this.xrCheckBox1.Name = "xrCheckBox1";
- this.xrCheckBox1.SizeF = new System.Drawing.SizeF(493.5575F, 21.875F);
+ this.xrCheckBox1.SizeF = new System.Drawing.SizeF(359.5833F, 21.875F);
this.xrCheckBox1.StylePriority.UseFont = false;
- this.xrCheckBox1.Text = " Die Betreuung wurde beendet am";
+ this.xrCheckBox1.Text = " Die Betreuung wurde am beendet.";
+ //
+ // tableRechnungspositionen
+ //
+ this.tableRechnungspositionen.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.tableRechnungspositionen.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 0F);
+ this.tableRechnungspositionen.Name = "tableRechnungspositionen";
+ this.tableRechnungspositionen.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+ this.tableRechnungspositionen.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow2,
+ this.xrTableRow5,
+ this.xrTableRow6,
+ this.xrTableRow8});
+ this.tableRechnungspositionen.SizeF = new System.Drawing.SizeF(641.9999F, 102F);
+ this.tableRechnungspositionen.StylePriority.UseBorders = false;
+ this.tableRechnungspositionen.StylePriority.UseFont = false;
+ this.tableRechnungspositionen.StylePriority.UsePadding = false;
+ //
+ // xrTableRow2
+ //
+ this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell2,
+ this.xrTableCell4,
+ this.xrTableCell13,
+ this.xrTableCell5,
+ this.xrTableCell14});
+ this.xrTableRow2.Name = "xrTableRow2";
+ this.xrTableRow2.Weight = 1.0338469304739562D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell2.Multiline = true;
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.StylePriority.UseBorders = false;
+ this.xrTableCell2.StylePriority.UseTextAlignment = false;
+ this.xrTableCell2.Text = "Zeitraum von";
+ this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ this.xrTableCell2.Weight = 0.56074779116335471D;
+ //
+ // xrTableCell4
+ //
+ this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.StylePriority.UseBorders = false;
+ this.xrTableCell4.StylePriority.UseTextAlignment = false;
+ this.xrTableCell4.Text = "bis";
+ this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+ this.xrTableCell4.Weight = 0.56074776739576848D;
+ //
+ // xrTableCell13
+ //
+ this.xrTableCell13.Name = "xrTableCell13";
+ this.xrTableCell13.StylePriority.UseTextAlignment = false;
+ this.xrTableCell13.Text = "Vergütung pro Std.";
+ this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ this.xrTableCell13.Weight = 0.700934509358181D;
+ //
+ // xrTableCell5
+ //
+ this.xrTableCell5.Name = "xrTableCell5";
+ this.xrTableCell5.StylePriority.UseTextAlignment = false;
+ this.xrTableCell5.Text = "Anzahl FLS";
+ this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ this.xrTableCell5.Weight = 0.51401872857292652D;
+ //
+ // xrTableCell14
+ //
+ this.xrTableCell14.Multiline = true;
+ this.xrTableCell14.Name = "xrTableCell14";
+ this.xrTableCell14.Text = "davon gesondert\r\nbewilligt";
+ this.xrTableCell14.Weight = 0.663551203509769D;
+ //
+ // xrTableRow5
+ //
+ this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.cellStart1,
+ this.cellEnd1,
+ this.cellHourlyRate1,
+ this.cellFLS1,
+ this.xrTableCell20});
+ this.xrTableRow5.Name = "xrTableRow5";
+ this.xrTableRow5.Weight = 0.49230806213045519D;
+ //
+ // cellStart1
+ //
+ this.cellStart1.Name = "cellStart1";
+ this.cellStart1.Weight = 0.56074779116335471D;
+ //
+ // cellEnd1
+ //
+ this.cellEnd1.Name = "cellEnd1";
+ this.cellEnd1.Weight = 0.56074776739576848D;
+ //
+ // cellHourlyRate1
+ //
+ this.cellHourlyRate1.Name = "cellHourlyRate1";
+ this.cellHourlyRate1.Weight = 0.700934509358181D;
+ //
+ // cellFLS1
+ //
+ this.cellFLS1.Name = "cellFLS1";
+ this.cellFLS1.Weight = 0.51401872857292652D;
+ //
+ // xrTableCell20
+ //
+ this.xrTableCell20.Name = "xrTableCell20";
+ this.xrTableCell20.Weight = 0.663551203509769D;
+ //
+ // xrTableRow6
+ //
+ this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.cellStart2,
+ this.cellEnd2,
+ this.cellHourlyRate2,
+ this.cellFLS2,
+ this.xrTableCell21});
+ this.xrTableRow6.Name = "xrTableRow6";
+ this.xrTableRow6.Weight = 0.4923080621304553D;
+ //
+ // cellStart2
+ //
+ this.cellStart2.Name = "cellStart2";
+ this.cellStart2.Weight = 0.56074779116335471D;
+ //
+ // cellEnd2
+ //
+ this.cellEnd2.Name = "cellEnd2";
+ this.cellEnd2.Weight = 0.56074776739576848D;
+ //
+ // cellHourlyRate2
+ //
+ this.cellHourlyRate2.Name = "cellHourlyRate2";
+ this.cellHourlyRate2.Weight = 0.700934509358181D;
+ //
+ // cellFLS2
+ //
+ this.cellFLS2.Name = "cellFLS2";
+ this.cellFLS2.Weight = 0.51401872857292652D;
+ //
+ // xrTableCell21
+ //
+ this.xrTableCell21.Name = "xrTableCell21";
+ this.xrTableCell21.Weight = 0.663551203509769D;
+ //
+ // xrTableRow8
+ //
+ this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.cellStart3,
+ this.cellEnd3,
+ this.cellHourlyRate3,
+ this.cellFLS3,
+ this.xrTableCell29});
+ this.xrTableRow8.Name = "xrTableRow8";
+ this.xrTableRow8.Weight = 0.49230806213045525D;
+ //
+ // cellStart3
+ //
+ this.cellStart3.Name = "cellStart3";
+ this.cellStart3.Weight = 0.56074779116335471D;
+ //
+ // cellEnd3
+ //
+ this.cellEnd3.Name = "cellEnd3";
+ this.cellEnd3.Weight = 0.56074776739576848D;
+ //
+ // cellHourlyRate3
+ //
+ this.cellHourlyRate3.Name = "cellHourlyRate3";
+ this.cellHourlyRate3.Weight = 0.700934509358181D;
+ //
+ // cellFLS3
+ //
+ this.cellFLS3.Name = "cellFLS3";
+ this.cellFLS3.Weight = 0.51401872857292652D;
+ //
+ // xrTableCell29
+ //
+ this.xrTableCell29.Name = "xrTableCell29";
+ this.xrTableCell29.Weight = 0.663551203509769D;
+ //
+ // xrLabel17
+ //
+ this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel17.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 284.1301F);
+ this.xrLabel17.Multiline = true;
+ this.xrLabel17.Name = "xrLabel17";
+ this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel17.SizeF = new System.Drawing.SizeF(598.0811F, 27.08325F);
+ this.xrLabel17.StylePriority.UseBackColor = false;
+ this.xrLabel17.StylePriority.UseFont = false;
+ this.xrLabel17.Text = "¹vom LWL gesondert bewilligte Leistungen zur Deckung eines einmaligen Bedarfs";
//
// ruleRateFactorNull
//
@@ -224,93 +439,105 @@ namespace Wichernhaus
//
// topMarginBand1
//
- this.topMarginBand1.HeightF = 50F;
+ this.topMarginBand1.HeightF = 100F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
//
- this.bottomMarginBand1.HeightF = 50F;
+ this.bottomMarginBand1.HeightF = 90.33334F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
- //
- // lblAdresse
- //
- this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 161.8959F);
- this.lblAdresse.Multiline = true;
- this.lblAdresse.Name = "lblAdresse";
- this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.lblAdresse.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
- this.lblAdresse.SizeF = new System.Drawing.SizeF(329.9999F, 81.58333F);
- this.lblAdresse.StylePriority.UseFont = false;
- this.lblAdresse.Text = "Landschaftsverband Westfalen- Lippe\r\nLWL- Inklusionsamt Soziale Teilhabe\r\n48133 M" +
- "ünster\r\n";
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrRichText2,
this.xrLabel8,
- this.xrLabel6,
this.lblAdresse});
- this.GroupHeader1.HeightF = 316.2917F;
+ this.GroupHeader1.HeightF = 297.2498F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
- // xrLabel8
- //
- this.xrLabel8.Font = new System.Drawing.Font("Times New Roman", 12F, System.Drawing.FontStyle.Bold);
- this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 276.2917F);
- this.xrLabel8.Multiline = true;
- this.xrLabel8.Name = "xrLabel8";
- this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
- this.xrLabel8.SizeF = new System.Drawing.SizeF(673.319F, 40.00003F);
- this.xrLabel8.StylePriority.UseFont = false;
- this.xrLabel8.StylePriority.UseTextAlignment = false;
- this.xrLabel8.Text = "Budgetnachweis\r\nüber die Abrechnung von Fachleistungsstunden im Rahmen der Eingli" +
- "ederungshilfe";
- this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
- //
- // xrLabel6
- //
- this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", "Bochum, {0}")});
- this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(458.6595F, 223.4792F);
- this.xrLabel6.Name = "xrLabel6";
- this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel6.SizeF = new System.Drawing.SizeF(186.6738F, 20.00001F);
- //
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
- //
// xrRichText2
//
this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
- this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(413.3468F, 0F);
+ this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(531.1946F, 0F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
- this.xrRichText2.SizeF = new System.Drawing.SizeF(264.972F, 165.5556F);
+ this.xrRichText2.SizeF = new System.Drawing.SizeF(235.8053F, 165.5556F);
this.xrRichText2.StylePriority.UseFont = false;
//
+ // xrLabel8
+ //
+ this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", "{0:dd.MM.yyyy}")});
+ this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(531.1946F, 258.4164F);
+ this.xrLabel8.Name = "xrLabel8";
+ this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel8.SizeF = new System.Drawing.SizeF(204.9722F, 23F);
+ this.xrLabel8.StylePriority.UseTextAlignment = false;
+ this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // lblAdresse
+ //
+ this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(60F, 143.3333F);
+ this.lblAdresse.Multiline = true;
+ this.lblAdresse.Name = "lblAdresse";
+ this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblAdresse.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+ this.lblAdresse.SizeF = new System.Drawing.SizeF(376.3542F, 107.6665F);
+ this.lblAdresse.StylePriority.UseFont = false;
+ this.lblAdresse.Text = "Landschaftsverband Westfalen-Lippe\r\nBehindertenhilfe Westfalen\r\n\r\n48133 Münster\r\n" +
+ "";
+ //
+ // GroupFooter1
+ //
+ this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.tableRechnungspositionen});
+ this.GroupFooter1.HeightF = 102F;
+ this.GroupFooter1.Name = "GroupFooter1";
+ this.GroupFooter1.StylePriority.UseFont = false;
+ //
+ // GroupFooter2
+ //
+ this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLine2,
+ this.xrLine1,
+ this.xrLabel35,
+ this.xrLabel12,
+ this.xrCheckBox2,
+ this.xrLabel17,
+ this.xrCheckBox1});
+ this.GroupFooter2.HeightF = 311.2133F;
+ this.GroupFooter2.Level = 1;
+ this.GroupFooter2.Name = "GroupFooter2";
+ this.GroupFooter2.StylePriority.UseFont = false;
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
+ //
// Budgetnachweis
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
this.topMarginBand1,
this.bottomMarginBand1,
- this.GroupHeader1});
+ this.GroupHeader1,
+ this.GroupFooter1,
+ this.GroupFooter2});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.Font = new System.Drawing.Font("Times New Roman", 12F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
- this.Margins = new System.Drawing.Printing.Margins(80, 30, 50, 50);
+ this.Margins = new System.Drawing.Printing.Margins(30, 30, 100, 90);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "17.1";
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tableRechnungspositionen)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -322,20 +549,49 @@ namespace Wichernhaus
private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+ private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
+ private DevExpress.XtraReports.UI.XRLabel lblAdresse;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel7;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel14;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel10;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel16;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel15;
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel17;
+ private DevExpress.XtraReports.UI.XRTable tableRechnungspositionen;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
+ private DevExpress.XtraReports.UI.XRTableCell cellStart1;
+ private DevExpress.XtraReports.UI.XRTableCell cellEnd1;
+ private DevExpress.XtraReports.UI.XRTableCell cellHourlyRate1;
+ private DevExpress.XtraReports.UI.XRTableCell cellFLS1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
+ private DevExpress.XtraReports.UI.XRTableCell cellStart2;
+ private DevExpress.XtraReports.UI.XRTableCell cellEnd2;
+ private DevExpress.XtraReports.UI.XRTableCell cellHourlyRate2;
+ private DevExpress.XtraReports.UI.XRTableCell cellFLS2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
+ private DevExpress.XtraReports.UI.XRTableCell cellStart3;
+ private DevExpress.XtraReports.UI.XRTableCell cellEnd3;
+ private DevExpress.XtraReports.UI.XRTableCell cellHourlyRate3;
+ private DevExpress.XtraReports.UI.XRTableCell cellFLS3;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
private DevExpress.XtraReports.UI.XRCheckBox xrCheckBox2;
private DevExpress.XtraReports.UI.XRCheckBox xrCheckBox1;
- private DevExpress.XtraReports.UI.XRLabel lblAdresse;
- private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
- private DevExpress.XtraReports.UI.XRLabel xrLabel6;
- private DevExpress.XtraReports.UI.XRPanel xrPanel1;
- private DevExpress.XtraReports.UI.XRLabel xrLabel15;
- private DevExpress.XtraReports.UI.XRLabel lblAktenzeichen;
- private DevExpress.XtraReports.UI.XRLabel xrLabel7;
- private DevExpress.XtraReports.UI.XRLabel xrLabel10;
- private DevExpress.XtraReports.UI.XRLabel xrLabel3;
- private DevExpress.XtraReports.UI.XRLabel xrLabel9;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel35;
+ private DevExpress.XtraReports.UI.XRLine xrLine2;
+ private DevExpress.XtraReports.UI.XRLine xrLine1;
+ private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+ private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRRichText xrRichText2;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel1;
}
}
diff --git a/ReportImp/Wichernhaus/Budgetnachweis2.cs b/ReportImp/Wichernhaus/Budgetnachweis2.cs
index 41e5fd4ae..0703b7b06 100644
--- a/ReportImp/Wichernhaus/Budgetnachweis2.cs
+++ b/ReportImp/Wichernhaus/Budgetnachweis2.cs
@@ -1,24 +1,23 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Text;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report.ReportObjects;
using BeWo.Report;
+using BS.Shared.Core;
using BS.Shared.DataContracts;
using DevExpress.XtraReports.UI;
-namespace Wichernhaus
+namespace Wichernhaus.Neu
{
- public partial class Budgetnachweis2 : DevExpress.XtraReports.UI.XtraReport//, IBeWoReport
+ public partial class Budgetnachweis : DevExpress.XtraReports.UI.XtraReport, IBeWoReport
{
- public Budgetnachweis2()
+ public Budgetnachweis()
{
InitializeComponent();
}
- public void SetReportDataSource(SettlementRO pRO)
+ public void SetReportDataSource(Settlement2RO pRO)
{
if (pRO.RecipientOrganisation != "LWL" && !pRO.RecipientOrganisation.ToLower().Contains("westfalen-lippe"))
{
@@ -47,23 +46,88 @@ namespace Wichernhaus
lblAdresse.Text = sb.ToString();
}
+
xrCheckBox2.Checked = true;
+ DateTime? terminationDate = null;
- if (pRO.CostBearer2SupportConceptOid > 0)
+ if (pRO.InvoiceBaseOid.HasValue)
{
- var c2s = DAOFactory.GenericDAO.LoadByID(pRO.CostBearer2SupportConceptOid);
+ var ib = DAOFactory.GenericDAO.LoadByID(pRO.InvoiceBaseOid.Value);
+
+ var c2s = ib.CostBearer2SupportConcept;
if (c2s.SupportConcept.Customer.TerminationDate.HasValue)
{
- xrCheckBox1.Text = String.Format(" Die Betreuung wurde beendet am {0:dd.MM.yyyy}",
+ terminationDate = c2s.SupportConcept.Customer.TerminationDate;
+ xrCheckBox1.Text = String.Format(" Die Betreuung wurde am {0:dd.MM.yyyy} beendet.",
c2s.SupportConcept.Customer.TerminationDate);
xrCheckBox2.Checked = false;
xrCheckBox1.Checked = true;
}
}
+
+
+ ErstelleRechnungspositionen(pRO, terminationDate);
+
+
+
+
+
bindingSource1.DataSource = pRO;
}
+ private void ErstelleRechnungspositionen(Settlement2RO pRO, DateTime? terminationDate)
+ {
+
+ if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count > 0)
+ {
+ int rowIndex = 0;
+ foreach (var ii in pRO.InvoiceItems)
+ {
+ if (ii.UnitCount.HasValue && ii.UnitCount.Value > 0)
+ {
+ AddRechnungsposition(ii, rowIndex++);
+ }
+ }
+
+ }
+
+ }
+
+
+ private void AddRechnungsposition(Settlement2RO.SettlementInvoiceItemRO ii, int rowIndex)
+ {
+ XRTableRow newRow = null;
+ if (rowIndex > 2)
+ {
+ newRow = tableRechnungspositionen.InsertRowBelow(tableRechnungspositionen.Rows[tableRechnungspositionen.Rows.Count - 1]);
+ }
+ else
+ {
+ newRow = tableRechnungspositionen.Rows[rowIndex + 1];
+ }
+ newRow.Cells[0].Text = String.Format("{0:dd.MM.yyyy}", ii.PeriodStartDate);
+ newRow.Cells[1].Text = String.Format("{0:dd.MM.yyyy}", ii.PeriodEndDate);
+ newRow.Cells[2].Text = String.Format("{0:0.00}", ii.AmountPerUnit);
+ newRow.Cells[3].Text = String.Format("{0:0.00}", ii.UnitCount);
+ }
+ private string CorrectPossibleTerminationEndDate(string dateString, DateTime? terminationDate)
+ {
+ if (terminationDate.HasValue)
+ {
+ DateTime dt = DateTime.MinValue;
+ if (DateTime.TryParse(dateString, out dt))
+ {
+ if (terminationDate < dt)
+ {
+ return String.Format("{0:dd.MM.yyyy}", terminationDate);
+ }
+ }
+
+ }
+
+ return dateString;
+ }
}
}
diff --git a/ReportImp/Wichernhaus/Budgetnachweis2.resx b/ReportImp/Wichernhaus/Budgetnachweis2.resx
index 8ac1c26c0..7ac8db9cb 100644
--- a/ReportImp/Wichernhaus/Budgetnachweis2.resx
+++ b/ReportImp/Wichernhaus/Budgetnachweis2.resx
@@ -118,7 +118,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Hiermit wird erklärt, dass die Verpflichtungen aus den Vereinbarungen nach §§ 75 ff. SGB XII bzw. §§ 125 ff. SGB IX eingehalten wurden und alle hier gemachten Angaben je Betreuungskontakt anhand der Quittierungsbelege sowie der Betreuungsdokumentation jederzeit nachgewiesen werden können. Diese Unterlagen sind 5 Jahre aufzubewahren und auf Verlangen des Sozialhilfeträgers bzw. des Trägers der Eingliederungshilfe vorzulegen (§ 2 Abs.1 der Vergütungsvereinbarung).
+ Hiermit wird erklärt, dass die Verpflichtungen aus der Leistungs-, Prüfungs- und Vergütungsvereinbarung nach §§ 75 ff. SGB X II eingehalten wurden und alle hier gemachten Angaben anhand der vorgehaltenen Quittierungsbelege sowie der Betreuungsdokumentation jederzeit nachgewiesen werden können.
Mit freundlichen Grüßen
diff --git a/ReportImp/Wichernhaus/BudgetnachweisVariante2.Designer.cs b/ReportImp/Wichernhaus/BudgetnachweisVariante2.Designer.cs
new file mode 100644
index 000000000..e8f2af46d
--- /dev/null
+++ b/ReportImp/Wichernhaus/BudgetnachweisVariante2.Designer.cs
@@ -0,0 +1,341 @@
+namespace Wichernhaus
+{
+ partial class BudgetnachweisVariante2
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BudgetnachweisVariante2));
+ this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrPanel1 = new DevExpress.XtraReports.UI.XRPanel();
+ this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblAktenzeichen = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrCheckBox2 = new DevExpress.XtraReports.UI.XRCheckBox();
+ this.xrCheckBox1 = new DevExpress.XtraReports.UI.XRCheckBox();
+ this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
+ this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+ this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+ this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
+ this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+ //
+ // Detail
+ //
+ this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrPanel1,
+ this.xrLabel12,
+ this.xrCheckBox2,
+ this.xrCheckBox1});
+ this.Detail.HeightF = 444.7082F;
+ this.Detail.Name = "Detail";
+ this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.Detail.StylePriority.UseFont = false;
+ this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // xrPanel1
+ //
+ this.xrPanel1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrPanel1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel15,
+ this.lblAktenzeichen,
+ this.xrLabel7,
+ this.xrLabel10,
+ this.xrLabel3,
+ this.xrLabel9});
+ this.xrPanel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrPanel1.Name = "xrPanel1";
+ this.xrPanel1.SizeF = new System.Drawing.SizeF(673.3192F, 179.1617F);
+ this.xrPanel1.StylePriority.UseBorders = false;
+ //
+ // xrLabel15
+ //
+ this.xrLabel15.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel15.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.xrLabel15.CanShrink = true;
+ this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 29.99999F);
+ this.xrLabel15.Name = "xrLabel15";
+ this.xrLabel15.SizeF = new System.Drawing.SizeF(650F, 20F);
+ this.xrLabel15.StylePriority.UseBackColor = false;
+ this.xrLabel15.StylePriority.UseBorders = false;
+ this.xrLabel15.StylePriority.UseFont = false;
+ this.xrLabel15.StylePriority.UsePadding = false;
+ this.xrLabel15.Text = "[CustomerName], [CustomerStreet], [CustomerPostalCode] [CustomerTown]";
+ this.xrLabel15.WordWrap = false;
+ //
+ // lblAktenzeichen
+ //
+ this.lblAktenzeichen.BackColor = System.Drawing.Color.Transparent;
+ this.lblAktenzeichen.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.lblAktenzeichen.CanShrink = true;
+ this.lblAktenzeichen.LocationFloat = new DevExpress.Utils.PointFloat(10F, 65F);
+ this.lblAktenzeichen.Multiline = true;
+ this.lblAktenzeichen.Name = "lblAktenzeichen";
+ this.lblAktenzeichen.SizeF = new System.Drawing.SizeF(650F, 20F);
+ this.lblAktenzeichen.StylePriority.UseBackColor = false;
+ this.lblAktenzeichen.StylePriority.UseBorders = false;
+ this.lblAktenzeichen.StylePriority.UseFont = false;
+ this.lblAktenzeichen.StylePriority.UsePadding = false;
+ this.lblAktenzeichen.Text = "Aktenzeichen: [CustomerReferenceNumber] Geburtsdatum: [CustomerBirthdayStr" +
+ "ing]";
+ this.lblAktenzeichen.WordWrap = false;
+ //
+ // xrLabel7
+ //
+ this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.xrLabel7.CanShrink = true;
+ this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(10F, 100F);
+ this.xrLabel7.Multiline = true;
+ this.xrLabel7.Name = "xrLabel7";
+ this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F);
+ this.xrLabel7.StylePriority.UseBackColor = false;
+ this.xrLabel7.StylePriority.UseBorders = false;
+ this.xrLabel7.StylePriority.UseFont = false;
+ this.xrLabel7.StylePriority.UsePadding = false;
+ this.xrLabel7.Text = "Bewilligungszeitraum von [AccountingPeriod]";
+ this.xrLabel7.WordWrap = false;
+ //
+ // xrLabel10
+ //
+ this.xrLabel10.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel10.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(10F, 135F);
+ this.xrLabel10.Multiline = true;
+ this.xrLabel10.Name = "xrLabel10";
+ this.xrLabel10.SizeF = new System.Drawing.SizeF(551.3751F, 27.08333F);
+ this.xrLabel10.StylePriority.UseBackColor = false;
+ this.xrLabel10.StylePriority.UseBorders = false;
+ this.xrLabel10.StylePriority.UseFont = false;
+ this.xrLabel10.StylePriority.UsePadding = false;
+ this.xrLabel10.Text = "Tatsächlich geleistete Fachleistungsstunden im Bewilligungszeitraum lt. Anlage:";
+ //
+ // xrLabel3
+ //
+ this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel3.BorderWidth = 2F;
+ this.xrLabel3.CanShrink = true;
+ this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecordedFLSTotal", "{0:0.00}")});
+ this.xrLabel3.Font = new System.Drawing.Font("Times New Roman", 12F, System.Drawing.FontStyle.Bold);
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(561.38F, 132F);
+ this.xrLabel3.Multiline = true;
+ this.xrLabel3.Name = "xrLabel3";
+ this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel3.SizeF = new System.Drawing.SizeF(98.62469F, 27.08333F);
+ this.xrLabel3.StylePriority.UseBackColor = false;
+ this.xrLabel3.StylePriority.UseBorders = false;
+ this.xrLabel3.StylePriority.UseBorderWidth = false;
+ this.xrLabel3.StylePriority.UseFont = false;
+ this.xrLabel3.StylePriority.UseTextAlignment = false;
+ this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrLabel3.WordWrap = false;
+ //
+ // xrLabel9
+ //
+ this.xrLabel9.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.xrLabel9.CanShrink = true;
+ this.xrLabel9.Font = new System.Drawing.Font("Times New Roman", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
+ this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 9.999974F);
+ this.xrLabel9.Name = "xrLabel9";
+ this.xrLabel9.SizeF = new System.Drawing.SizeF(650F, 20F);
+ this.xrLabel9.StylePriority.UseBackColor = false;
+ this.xrLabel9.StylePriority.UseBorders = false;
+ this.xrLabel9.StylePriority.UseFont = false;
+ this.xrLabel9.StylePriority.UsePadding = false;
+ this.xrLabel9.Text = "Leistungsberechtigte/r:";
+ this.xrLabel9.WordWrap = false;
+ //
+ // xrLabel12
+ //
+ this.xrLabel12.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 267.0832F);
+ this.xrLabel12.Multiline = true;
+ this.xrLabel12.Name = "xrLabel12";
+ this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel12.SizeF = new System.Drawing.SizeF(695.3123F, 177.625F);
+ this.xrLabel12.StylePriority.UseBackColor = false;
+ this.xrLabel12.StylePriority.UseFont = false;
+ this.xrLabel12.StylePriority.UseTextAlignment = false;
+ this.xrLabel12.Text = resources.GetString("xrLabel12.Text");
+ this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopJustify;
+ //
+ // xrCheckBox2
+ //
+ this.xrCheckBox2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 226.0367F);
+ this.xrCheckBox2.Name = "xrCheckBox2";
+ this.xrCheckBox2.SizeF = new System.Drawing.SizeF(211.0832F, 21.875F);
+ this.xrCheckBox2.StylePriority.UseFont = false;
+ this.xrCheckBox2.Text = " Die Betreuung dauert an.";
+ //
+ // xrCheckBox1
+ //
+ this.xrCheckBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192.7034F);
+ this.xrCheckBox1.Name = "xrCheckBox1";
+ this.xrCheckBox1.SizeF = new System.Drawing.SizeF(493.5575F, 21.875F);
+ this.xrCheckBox1.StylePriority.UseFont = false;
+ this.xrCheckBox1.Text = " Die Betreuung wurde beendet am";
+ //
+ // ruleRateFactorNull
+ //
+ this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
+ this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+ this.ruleRateFactorNull.Name = "ruleRateFactorNull";
+ //
+ // topMarginBand1
+ //
+ this.topMarginBand1.HeightF = 50F;
+ this.topMarginBand1.Name = "topMarginBand1";
+ //
+ // bottomMarginBand1
+ //
+ this.bottomMarginBand1.HeightF = 50F;
+ this.bottomMarginBand1.Name = "bottomMarginBand1";
+ //
+ // lblAdresse
+ //
+ this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 161.8959F);
+ this.lblAdresse.Multiline = true;
+ this.lblAdresse.Name = "lblAdresse";
+ this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblAdresse.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+ this.lblAdresse.SizeF = new System.Drawing.SizeF(329.9999F, 81.58333F);
+ this.lblAdresse.StylePriority.UseFont = false;
+ this.lblAdresse.Text = "Landschaftsverband Westfalen- Lippe\r\nLWL- Inklusionsamt Soziale Teilhabe\r\n48133 M" +
+ "ünster\r\n";
+ //
+ // GroupHeader1
+ //
+ this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrRichText2,
+ this.xrLabel8,
+ this.xrLabel6,
+ this.lblAdresse});
+ this.GroupHeader1.HeightF = 316.2917F;
+ this.GroupHeader1.Name = "GroupHeader1";
+ this.GroupHeader1.StylePriority.UseFont = false;
+ //
+ // xrLabel8
+ //
+ this.xrLabel8.Font = new System.Drawing.Font("Times New Roman", 12F, System.Drawing.FontStyle.Bold);
+ this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 276.2917F);
+ this.xrLabel8.Multiline = true;
+ this.xrLabel8.Name = "xrLabel8";
+ this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+ this.xrLabel8.SizeF = new System.Drawing.SizeF(673.319F, 40.00003F);
+ this.xrLabel8.StylePriority.UseFont = false;
+ this.xrLabel8.StylePriority.UseTextAlignment = false;
+ this.xrLabel8.Text = "Budgetnachweis\r\nüber die Abrechnung von Fachleistungsstunden im Rahmen der Eingli" +
+ "ederungshilfe";
+ this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+ //
+ // xrLabel6
+ //
+ this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", "Bochum, {0}")});
+ this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(458.6595F, 223.4792F);
+ this.xrLabel6.Name = "xrLabel6";
+ this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel6.SizeF = new System.Drawing.SizeF(186.6738F, 20.00001F);
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
+ //
+ // xrRichText2
+ //
+ this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(413.3468F, 0F);
+ this.xrRichText2.Name = "xrRichText2";
+ this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
+ this.xrRichText2.SizeF = new System.Drawing.SizeF(264.972F, 165.5556F);
+ this.xrRichText2.StylePriority.UseFont = false;
+ //
+ // Budgetnachweis
+ //
+ this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail,
+ this.topMarginBand1,
+ this.bottomMarginBand1,
+ this.GroupHeader1});
+ this.DataSource = this.bindingSource1;
+ this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
+ this.Font = new System.Drawing.Font("Times New Roman", 12F);
+ this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+ this.ruleRateFactorNull});
+ this.Margins = new System.Drawing.Printing.Margins(80, 30, 50, 50);
+ this.PageHeight = 1169;
+ this.PageWidth = 827;
+ this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+ this.Version = "17.1";
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraReports.UI.DetailBand Detail;
+ private System.Windows.Forms.BindingSource bindingSource1;
+ private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull;
+ private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+ private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel12;
+ private DevExpress.XtraReports.UI.XRCheckBox xrCheckBox2;
+ private DevExpress.XtraReports.UI.XRCheckBox xrCheckBox1;
+ private DevExpress.XtraReports.UI.XRLabel lblAdresse;
+ private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+ private DevExpress.XtraReports.UI.XRPanel xrPanel1;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel15;
+ private DevExpress.XtraReports.UI.XRLabel lblAktenzeichen;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel7;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel10;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel9;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel8;
+ private DevExpress.XtraReports.UI.XRRichText xrRichText2;
+ }
+}
diff --git a/ReportImp/Wichernhaus/BudgetnachweisVariante2.cs b/ReportImp/Wichernhaus/BudgetnachweisVariante2.cs
new file mode 100644
index 000000000..7b4313ac9
--- /dev/null
+++ b/ReportImp/Wichernhaus/BudgetnachweisVariante2.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Report.ReportObjects;
+using BeWo.Report;
+using BS.Shared.DataContracts;
+using DevExpress.XtraReports.UI;
+
+namespace Wichernhaus
+{
+ public partial class BudgetnachweisVariante2 : DevExpress.XtraReports.UI.XtraReport//, IBeWoReport
+ {
+ public BudgetnachweisVariante2()
+ {
+ InitializeComponent();
+ }
+
+ public void SetReportDataSource(SettlementRO pRO)
+ {
+ if (pRO.RecipientOrganisation != "LWL" && !pRO.RecipientOrganisation.ToLower().Contains("westfalen-lippe"))
+ {
+ StringBuilder sb = new StringBuilder();
+
+ if (!String.IsNullOrEmpty(pRO.RecipientOrganisation))
+ {
+ sb.AppendLine(pRO.RecipientOrganisation);
+ }
+ if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
+ {
+ sb.AppendLine(pRO.RecipientContactPerson);
+ }
+ if (!String.IsNullOrEmpty(pRO.RecipientDivision))
+ {
+ sb.AppendLine(pRO.RecipientDivision);
+ }
+ if (!String.IsNullOrEmpty(pRO.RecipientStreet))
+ {
+ sb.AppendLine(pRO.RecipientStreet);
+ }
+ if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown))
+ {
+ sb.AppendLine(pRO.RecipientPostCodeAndTown);
+ }
+ lblAdresse.Text = sb.ToString();
+ }
+
+ xrCheckBox2.Checked = true;
+
+ if (pRO.CostBearer2SupportConceptOid > 0)
+ {
+ var c2s = DAOFactory.GenericDAO.LoadByID(pRO.CostBearer2SupportConceptOid);
+
+ if (c2s.SupportConcept.Customer.TerminationDate.HasValue)
+ {
+ xrCheckBox1.Text = String.Format(" Die Betreuung wurde beendet am {0:dd.MM.yyyy}",
+ c2s.SupportConcept.Customer.TerminationDate);
+ xrCheckBox2.Checked = false;
+ xrCheckBox1.Checked = true;
+ }
+ }
+
+ bindingSource1.DataSource = pRO;
+ }
+
+ }
+}
diff --git a/ReportImp/Wichernhaus/BudgetnachweisVariante2.resx b/ReportImp/Wichernhaus/BudgetnachweisVariante2.resx
new file mode 100644
index 000000000..8ac1c26c0
--- /dev/null
+++ b/ReportImp/Wichernhaus/BudgetnachweisVariante2.resx
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Hiermit wird erklärt, dass die Verpflichtungen aus den Vereinbarungen nach §§ 75 ff. SGB XII bzw. §§ 125 ff. SGB IX eingehalten wurden und alle hier gemachten Angaben je Betreuungskontakt anhand der Quittierungsbelege sowie der Betreuungsdokumentation jederzeit nachgewiesen werden können. Diese Unterlagen sind 5 Jahre aufzubewahren und auf Verlangen des Sozialhilfeträgers bzw. des Trägers der Eingliederungshilfe vorzulegen (§ 2 Abs.1 der Vergütungsvereinbarung).
+
+Mit freundlichen Grüßen
+
+
+ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGIAXABmADEAXABmAHMAMQA4AFwAYwBmADAAIABXAGkAYwBoAGUAcgBuAGgAYQB1AHMAIABnAEcAbQBiAEgAfQBcAGYAMQBcAGYAcwAyADQAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGIAXABmADEAXABmAHMAMQA4AFwAYwBmADAAIABBAG0AYgB1AGwAYQBuAHQAIABCAGUAdAByAGUAdQB0AGUAcwAgAFcAbwBoAG4AZQBuAH0AXABiAFwAZgAxAFwAZgBzADIANABcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMABcAGYAMQBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMAAgAFcAYQByAGUAbgBkAG8AcgBmAGUAcgAgAFMAdAByAC4AIAAxADQAfQBcAGYAMQBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMAAgADQANQA4ADkAMgAgAEcAZQBsAHMAZQBuAGsAaQByAGMAaABlAG4AfQBcAGYAMQBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMQBcAGYAcwAxADgAXABjAGYAMAAgAFQAZQBsAGUAZgBvAG4AOgAgADAAMgAwADkALwA5ADcANgAxADcAMQA0AH0AXABmADEAXABmAHMAMQA4AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmADEAXABmAHMAMQA4AFwAYwBmADAAIABGAGEAeAA6ACAAMAAyADAAOQAvADkANwA2ADEANwA5ADkAfQBcAGYAMQBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAaQBlAGwAZAB7AFwAKgBcAGYAbABkAGkAbgBzAHQAewBcAGYAMQBcAGYAcwAyADQAXABjAGYAMAAgAEgAWQBQAEUAUgBMAEkATgBLACAAIgBtAGEAaQBsAHQAbwA6AGIAZQB0AHIAZQB1AHQAZQBzAHcAbwBoAG4AZQBuAEAAdwBpAGMAaABlAHIAbgBoAGEAdQBzAC4AYwBvAG0AIgAgAH0AfQB7AFwAZgBsAGQAcgBzAGwAdAB7AFwAdQBsAFwAZgAxAFwAZgBzADEAOABcAGMAZgAyACAAYgBlAHQAcgBlAHUAdABlAHMAdwBvAGgAbgBlAG4AQAB3AGkAYwBoAGUAcgBuAGgAYQB1AHMALgBjAG8AbQB9AH0AfQBcAGYAMQBcAGYAcwAyADQAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMgA3ADUAXABzAGwAbQB1AGwAdAAxAFwAcwBhADIAMAAwAHsAXABmADEAXABmAHMAMQA4AFwAYwBmADAAIABBAG4AcwBwAHIAZQBjAGgAcABhAHIAdABuAGUAcgA6ACAARgAuACAAQwBvAGwAbABlAHQAfQBcAGwAYQBuAGcANwBcAGwAYQBuAGcAZgBlADcAXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/ReportImp/Wichernhaus/Wichernhaus.csproj b/ReportImp/Wichernhaus/Wichernhaus.csproj
index 97660ee22..41fa7122a 100644
--- a/ReportImp/Wichernhaus/Wichernhaus.csproj
+++ b/ReportImp/Wichernhaus/Wichernhaus.csproj
@@ -62,6 +62,12 @@
+
+ Component
+
+
+ Budgetnachweis2.cs
+
Component
@@ -85,14 +91,18 @@
Quittierungsbeleg.cs
-
+
Component
-
- Budgetnachweis2.cs
+
+ BudgetnachweisVariante2.cs
+
+ Budgetnachweis2.cs
+ Designer
+
Budgetnachweis.cs
Designer
@@ -106,8 +116,8 @@
Quittierungsbeleg.cs
Designer
-
- Budgetnachweis2.cs
+
+ BudgetnachweisVariante2.cs
Designer
diff --git a/Service/DCEntityMapper/InvoiceBaseDC_InvoiceBase.cs b/Service/DCEntityMapper/InvoiceBaseDC_InvoiceBase.cs
index 8894966c9..41c22317f 100644
--- a/Service/DCEntityMapper/InvoiceBaseDC_InvoiceBase.cs
+++ b/Service/DCEntityMapper/InvoiceBaseDC_InvoiceBase.cs
@@ -45,8 +45,13 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.DunningLetterCount = pEntity.DunningLetterCount;
pDataContract.InvoiceId = pEntity.InvoiceId;
pDataContract.InvoiceTypeText = pEntity.InvoiceTypeText;
+ pDataContract.StornoInvoiceBaseOid = pEntity.StornoInvoiceBaseOid;
+ if (pEntity.StornoInvoiceBaseOid.HasValue)
+ {
+ pDataContract.BackgroundColor = "#FFFFBBB0";
+ }
- if (pEntity.CostBearer2SupportConcept != null)
+ if (pEntity.CostBearer2SupportConcept != null)
{
try
{
@@ -171,6 +176,7 @@ namespace BeWo.Service.DCEntityMapper
pEntity.DunningLetterCount = pDataContract.DunningLetterCount;
pEntity.InvoiceId = pDataContract.InvoiceId;
pEntity.InvoiceTypeText = pDataContract.InvoiceTypeText;
+ pEntity.StornoInvoiceBaseOid = pDataContract.StornoInvoiceBaseOid;
if (pDataContract.ContainsSenderAddressData())
{
diff --git a/Service/DCEntityMapper/UserDC_User.cs b/Service/DCEntityMapper/UserDC_User.cs
index 969614bf1..4b0a1831f 100644
--- a/Service/DCEntityMapper/UserDC_User.cs
+++ b/Service/DCEntityMapper/UserDC_User.cs
@@ -20,7 +20,7 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.RC2Password = ""; //pEntity.RC2EncryptedHash;
//pDataContract.Salt = pEntity.Salt;
pDataContract.Zeitstempel = pEntity.Zeitstempel ?? DateTime.Now;
-
+ pDataContract.LicenseType = pEntity.LicenseType;
if (pEntity.Employee != null)
{
@@ -39,10 +39,10 @@ namespace BeWo.Service.DCEntityMapper
this.ConcurrencyCheck(pDataContract.UserVersion, pEntity);
pEntity.Oid = pDataContract.UserOid;
-
pEntity.Zeitstempel = pDataContract.Zeitstempel;
+ pEntity.LicenseType = pDataContract.LicenseType;
- if ((pEntity.Employee == null && pDataContract.Employee != null) || (pEntity.Employee != null && pDataContract.Employee != null && pDataContract.Employee.EmployeeOid != pEntity.Employee.Oid))
+ if ((pEntity.Employee == null && pDataContract.Employee != null) || (pEntity.Employee != null && pDataContract.Employee != null && pDataContract.Employee.EmployeeOid != pEntity.Employee.Oid))
{
pEntity.Employee = DAOFactory.GenericDAO.LoadByID(pDataContract.Employee.EmployeeOid);
}
diff --git a/Service/Plugins/AccountingService.cs b/Service/Plugins/AccountingService.cs
index b27681d17..e5e746a87 100644
--- a/Service/Plugins/AccountingService.cs
+++ b/Service/Plugins/AccountingService.cs
@@ -123,6 +123,14 @@ namespace BeWo.Service.Plugins
return newInvoice;
}
+ public virtual void SaveStornoRechnung(InvoiceBase originalInvoice, ServiceInvoice stornoInvoice)
+ {
+ DAOFactory.GenericDAO.Insert(stornoInvoice);
+ originalInvoice.StornoInvoiceBaseOid = stornoInvoice.Oid;
+ DAOFactory.GenericDAO.Update(originalInvoice);
+
+ }
+
public virtual void SetzeStornoInfos(InvoiceBase newInvoice)
{
foreach (var ii in newInvoice.InvoiceItems)
diff --git a/Service/ServiceImplementations/UserServiceImp.cs b/Service/ServiceImplementations/UserServiceImp.cs
index b0124e8f4..8b6f16858 100644
--- a/Service/ServiceImplementations/UserServiceImp.cs
+++ b/Service/ServiceImplementations/UserServiceImp.cs
@@ -552,7 +552,31 @@ namespace BeWo.Service.ServiceImplementations
try
{
SettingsLogic.AddToUsersHistory(pUserOid);
- return MapperFactory.UserDC_User.MapToNewDC(DAOFactory.GenericDAO.LoadByID(pUserOid));
+ var user = MapperFactory.UserDC_User.MapToNewDC(DAOFactory.GenericDAO.LoadByID(pUserOid));
+
+ //var m = DAOFactory.GenericDAO.LoadByID(1);
+ //if (m != null && m.ClientId == "SBD")
+ //{
+ // user.AllLicenseTypes = new List();
+ // user.AllLicenseTypes.Add("Volllizenz");
+ // user.AllLicenseTypes.Add("Schulbegleitung");
+
+ // if (String.IsNullOrEmpty(user.LicenseType))
+ // {
+ // user.LicenseType = "Volllizenz";
+ // }
+ //}
+#if DEBUG
+ user.AllLicenseTypes = new List();
+ user.AllLicenseTypes.Add("Volllizenz");
+ user.AllLicenseTypes.Add("Schulbegleitung");
+ if (String.IsNullOrEmpty(user.LicenseType))
+ {
+ user.LicenseType = "Volllizenz";
+ }
+
+#endif
+ return user;
}
catch (Exception e)
{
diff --git a/Shared/DataContracts/ClientPartials/InvoiceBaseDC.cs b/Shared/DataContracts/ClientPartials/InvoiceBaseDC.cs
index 849158ecd..3c586d93c 100644
--- a/Shared/DataContracts/ClientPartials/InvoiceBaseDC.cs
+++ b/Shared/DataContracts/ClientPartials/InvoiceBaseDC.cs
@@ -10,5 +10,5 @@ namespace BS.Shared.DataContracts
this.SenderContactInformations = new List();
this.RecipientContactInformations = new List();
}
- }
+ }
}
\ No newline at end of file
diff --git a/Shared/DataContracts/InvoiceBaseDC.cs b/Shared/DataContracts/InvoiceBaseDC.cs
index f028817c7..59d1260ec 100644
--- a/Shared/DataContracts/InvoiceBaseDC.cs
+++ b/Shared/DataContracts/InvoiceBaseDC.cs
@@ -201,6 +201,12 @@ namespace BS.Shared.DataContracts
[DataMember]
public InvoiceType Type { get; set; }
+ [DataMember]
+ public long? StornoInvoiceBaseOid { get; set; }
+
+ [DataMember]
+ public String BackgroundColor { get; set; }
+
public bool ContainsRecipientAddressData()
{
return !Utils.AreAllNullOrEmpty(this.RecipientStreet, this.RecipientPostCode, this.RecipientTown);
diff --git a/Shared/DataContracts/UserDC.cs b/Shared/DataContracts/UserDC.cs
index 164b84f72..5c18f2c82 100644
--- a/Shared/DataContracts/UserDC.cs
+++ b/Shared/DataContracts/UserDC.cs
@@ -44,5 +44,11 @@ namespace BS.Shared.DataContracts
[DataMember]
public DateTime Zeitstempel { get; set; }
+
+ [DataMember]
+ public List AllLicenseTypes { get; set; }
+
+ [DataMember]
+ public string LicenseType { get; set; }
}
}
\ No newline at end of file