diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index 7cd85396e..6a08b02be 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -527,6 +527,7 @@ namespace BeWo
showMarker = true;
showUrlaubsplanung = true;
showDienstplanung = true;
+ showHilfeplanBezeichnung = true;
//showInfoButtonInCalender = true;
#endif
diff --git a/BeWo/View/Detail/RatingEditView.xaml b/BeWo/View/Detail/RatingEditView.xaml
index 29d46ddba..de365114f 100644
--- a/BeWo/View/Detail/RatingEditView.xaml
+++ b/BeWo/View/Detail/RatingEditView.xaml
@@ -41,7 +41,7 @@
-
+
@@ -67,10 +67,10 @@
Margin="3,0,3,3"/>
-
+
+
-
@@ -84,8 +84,7 @@
-
-
+
diff --git a/ReportImp/AsbRheinErftDuerenSBD/AsbRheinErftDuerenSBD.csproj b/ReportImp/AsbRheinErftDuerenSBD/AsbRheinErftDuerenSBD.csproj
index 1436c8e04..ca32611d3 100644
--- a/ReportImp/AsbRheinErftDuerenSBD/AsbRheinErftDuerenSBD.csproj
+++ b/ReportImp/AsbRheinErftDuerenSBD/AsbRheinErftDuerenSBD.csproj
@@ -101,6 +101,12 @@
NotizenReport.cs
+
+ Component
+
+
+ SbdRechnung.cs
+
Component
@@ -142,6 +148,10 @@
Designer
+
+ SbdRechnung.cs
+ Designer
+
Teamstundenkonto.cs
diff --git a/ReportImp/AsbRheinErftDuerenSBD/SbdRechnung.Designer.cs b/ReportImp/AsbRheinErftDuerenSBD/SbdRechnung.Designer.cs
new file mode 100644
index 000000000..49e8f99d1
--- /dev/null
+++ b/ReportImp/AsbRheinErftDuerenSBD/SbdRechnung.Designer.cs
@@ -0,0 +1,507 @@
+using BeWo.Report.ReportObjects;
+namespace AsbRheinErftDuerenSBD
+{
+ partial class ServiceInvoiceReport
+ {
+ ///
+ /// 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);
+ }
+
+
+ ///
+ /// 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(ServiceInvoiceReport));
+ this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+ this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
+ this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+ this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+ this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblKlient = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblMitarbeiter = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
+ this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblAnzahlZuschlag = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblGesamtBetrag = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblBetragEinheitZuschlag = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblGesamtBetragZuschlag = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblZuschlagText = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblBetragStunden = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblStundensatz = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblStunden = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+ this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+ this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
+ this.GroupFooter3 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.xrSubreport1 = new DevExpress.XtraReports.UI.XRSubreport();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+ //
+ // Detail
+ //
+ this.Detail.Expanded = false;
+ 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;
+ //
+ // ruleRateFactorNull
+ //
+ this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
+ this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+ this.ruleRateFactorNull.Name = "ruleRateFactorNull";
+ //
+ // topMarginBand1
+ //
+ this.topMarginBand1.HeightF = 210F;
+ this.topMarginBand1.Name = "topMarginBand1";
+ //
+ // bottomMarginBand1
+ //
+ this.bottomMarginBand1.HeightF = 125F;
+ this.bottomMarginBand1.Name = "bottomMarginBand1";
+ //
+ // xrLabel15
+ //
+ this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0.1668294F, 9.999974F);
+ this.xrLabel15.Multiline = true;
+ this.xrLabel15.Name = "xrLabel15";
+ this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel15.SizeF = new System.Drawing.SizeF(260.4167F, 52.41668F);
+ this.xrLabel15.StylePriority.UseFont = false;
+ this.xrLabel15.Text = "Mit freundlichem Gruß\r\ni.A.";
+ //
+ // xrLabel14
+ //
+ this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0.1668294F, 84.99998F);
+ 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(332.7916F, 90.85419F);
+ this.xrLabel14.StylePriority.UseFont = false;
+ this.xrLabel14.Text = "[CreatorName]\r\nSchulbegleitender Dienst\r\n\r\n\r\nAnlage: Stundennachweis";
+ //
+ // xrLabel2
+ //
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 200F);
+ this.xrLabel2.Name = "xrLabel2";
+ this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel2.SizeF = new System.Drawing.SizeF(206F, 20F);
+ this.xrLabel2.StylePriority.UseBorders = false;
+ this.xrLabel2.StylePriority.UseTextAlignment = false;
+ this.xrLabel2.Text = "Abrechnungsmonat:";
+ this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+ //
+ // lblKlient
+ //
+ this.lblKlient.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "AccountingPeriodStart", "{0:MMMM yyyy}")});
+ this.lblKlient.LocationFloat = new DevExpress.Utils.PointFloat(206.458F, 200F);
+ this.lblKlient.Name = "lblKlient";
+ this.lblKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblKlient.SizeF = new System.Drawing.SizeF(281.25F, 20F);
+ this.lblKlient.StylePriority.UseBorders = false;
+ this.lblKlient.StylePriority.UseTextAlignment = false;
+ this.lblKlient.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+ //
+ // lblMitarbeiter
+ //
+ this.lblMitarbeiter.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")});
+ this.lblMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(206.458F, 180F);
+ this.lblMitarbeiter.Name = "lblMitarbeiter";
+ this.lblMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblMitarbeiter.SizeF = new System.Drawing.SizeF(281.25F, 20F);
+ this.lblMitarbeiter.StylePriority.UseBorders = false;
+ this.lblMitarbeiter.StylePriority.UseTextAlignment = false;
+ this.lblMitarbeiter.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+ //
+ // xrLabel3
+ //
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 180F);
+ this.xrLabel3.Name = "xrLabel3";
+ this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel3.SizeF = new System.Drawing.SizeF(206F, 20F);
+ this.xrLabel3.StylePriority.UseBorders = false;
+ this.xrLabel3.StylePriority.UseTextAlignment = false;
+ this.xrLabel3.Text = "Rechnungsnummer:";
+ this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+ //
+ // xrLabel12
+ //
+ this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(206.4585F, 220F);
+ this.xrLabel12.Name = "xrLabel12";
+ this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel12.SizeF = new System.Drawing.SizeF(470.54F, 20F);
+ this.xrLabel12.StylePriority.UseBorders = false;
+ this.xrLabel12.StylePriority.UseTextAlignment = false;
+ this.xrLabel12.Text = "[CustomerLastName], [CustomerFirstName], geb. [CustomerBirthdate!dd.MM.yyyy]";
+ this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+ //
+ // xrLabel11
+ //
+ this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 220F);
+ this.xrLabel11.Name = "xrLabel11";
+ this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel11.SizeF = new System.Drawing.SizeF(206.4585F, 20F);
+ this.xrLabel11.StylePriority.UseBorders = false;
+ this.xrLabel11.StylePriority.UseTextAlignment = false;
+ this.xrLabel11.Text = "Betreute(r):";
+ this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+ //
+ // xrLabel10
+ //
+ this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(206.4585F, 240F);
+ this.xrLabel10.Name = "xrLabel10";
+ this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel10.SizeF = new System.Drawing.SizeF(470.54F, 20F);
+ this.xrLabel10.StylePriority.UseBorders = false;
+ this.xrLabel10.StylePriority.UseTextAlignment = false;
+ this.xrLabel10.Text = "[CustomerStreet], [CustomerPostalCode] [CustomerTown]";
+ this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+ //
+ // xrLabel4
+ //
+ this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 240F);
+ this.xrLabel4.Name = "xrLabel4";
+ this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel4.SizeF = new System.Drawing.SizeF(206.4585F, 20F);
+ this.xrLabel4.StylePriority.UseBorders = false;
+ this.xrLabel4.StylePriority.UseTextAlignment = false;
+ this.xrLabel4.Text = "wohnhaft:";
+ this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+ //
+ // xrLabel5
+ //
+ this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerReferenceNumber")});
+ this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(206.4585F, 260F);
+ this.xrLabel5.Name = "xrLabel5";
+ this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel5.SizeF = new System.Drawing.SizeF(281.25F, 20F);
+ this.xrLabel5.StylePriority.UseBorders = false;
+ this.xrLabel5.StylePriority.UseTextAlignment = false;
+ this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+ //
+ // xrLabel13
+ //
+ this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 260F);
+ this.xrLabel13.Name = "xrLabel13";
+ this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel13.SizeF = new System.Drawing.SizeF(206.4585F, 20F);
+ this.xrLabel13.StylePriority.UseBorders = false;
+ this.xrLabel13.StylePriority.UseTextAlignment = false;
+ this.xrLabel13.Text = "Kennzeichen d. Betreuten:";
+ this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+ //
+ // GroupHeader1
+ //
+ this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel1,
+ this.lblAnzahlZuschlag,
+ this.lblGesamtBetrag,
+ this.lblBetragEinheitZuschlag,
+ this.lblGesamtBetragZuschlag,
+ this.lblZuschlagText,
+ this.lblBetragStunden,
+ this.lblStundensatz,
+ this.lblStunden,
+ this.xrLabel7,
+ this.xrLabel6});
+ this.GroupHeader1.HeightF = 243.75F;
+ this.GroupHeader1.Name = "GroupHeader1";
+ //
+ // xrLabel1
+ //
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 206.25F);
+ 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(189.1665F, 37.50001F);
+ this.xrLabel1.StylePriority.UseBorders = false;
+ this.xrLabel1.StylePriority.UseTextAlignment = false;
+ this.xrLabel1.Text = "Gesamtbetrag:";
+ //
+ // lblAnzahlZuschlag
+ //
+ this.lblAnzahlZuschlag.CanShrink = true;
+ this.lblAnzahlZuschlag.LocationFloat = new DevExpress.Utils.PointFloat(285.8744F, 137.5F);
+ this.lblAnzahlZuschlag.Multiline = true;
+ this.lblAnzahlZuschlag.Name = "lblAnzahlZuschlag";
+ this.lblAnzahlZuschlag.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblAnzahlZuschlag.SizeF = new System.Drawing.SizeF(92.4581F, 37.49998F);
+ this.lblAnzahlZuschlag.StylePriority.UseBorders = false;
+ this.lblAnzahlZuschlag.StylePriority.UseTextAlignment = false;
+ this.lblAnzahlZuschlag.Text = "0,00 €";
+ this.lblAnzahlZuschlag.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // lblGesamtBetrag
+ //
+ this.lblGesamtBetrag.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblGesamtBetrag.LocationFloat = new DevExpress.Utils.PointFloat(473.3327F, 206.25F);
+ this.lblGesamtBetrag.Multiline = true;
+ this.lblGesamtBetrag.Name = "lblGesamtBetrag";
+ this.lblGesamtBetrag.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblGesamtBetrag.SizeF = new System.Drawing.SizeF(145.0002F, 37.49999F);
+ this.lblGesamtBetrag.StylePriority.UseBorders = false;
+ this.lblGesamtBetrag.StylePriority.UseFont = false;
+ this.lblGesamtBetrag.StylePriority.UseTextAlignment = false;
+ this.lblGesamtBetrag.Text = "1.000,00 €";
+ this.lblGesamtBetrag.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // lblBetragEinheitZuschlag
+ //
+ this.lblBetragEinheitZuschlag.CanShrink = true;
+ this.lblBetragEinheitZuschlag.LocationFloat = new DevExpress.Utils.PointFloat(378.3325F, 137.5F);
+ this.lblBetragEinheitZuschlag.Multiline = true;
+ this.lblBetragEinheitZuschlag.Name = "lblBetragEinheitZuschlag";
+ this.lblBetragEinheitZuschlag.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblBetragEinheitZuschlag.SizeF = new System.Drawing.SizeF(95.00018F, 37.49999F);
+ this.lblBetragEinheitZuschlag.StylePriority.UseBorders = false;
+ this.lblBetragEinheitZuschlag.StylePriority.UseTextAlignment = false;
+ this.lblBetragEinheitZuschlag.Text = "0,00 €";
+ this.lblBetragEinheitZuschlag.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // lblGesamtBetragZuschlag
+ //
+ this.lblGesamtBetragZuschlag.CanShrink = true;
+ this.lblGesamtBetragZuschlag.LocationFloat = new DevExpress.Utils.PointFloat(473.3327F, 137.5F);
+ this.lblGesamtBetragZuschlag.Multiline = true;
+ this.lblGesamtBetragZuschlag.Name = "lblGesamtBetragZuschlag";
+ this.lblGesamtBetragZuschlag.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblGesamtBetragZuschlag.SizeF = new System.Drawing.SizeF(145.0002F, 37.49999F);
+ this.lblGesamtBetragZuschlag.StylePriority.UseBorders = false;
+ this.lblGesamtBetragZuschlag.StylePriority.UseTextAlignment = false;
+ this.lblGesamtBetragZuschlag.Text = "1.000,00 €";
+ this.lblGesamtBetragZuschlag.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // lblZuschlagText
+ //
+ this.lblZuschlagText.CanShrink = true;
+ this.lblZuschlagText.LocationFloat = new DevExpress.Utils.PointFloat(0F, 137.5F);
+ this.lblZuschlagText.Multiline = true;
+ this.lblZuschlagText.Name = "lblZuschlagText";
+ this.lblZuschlagText.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblZuschlagText.SizeF = new System.Drawing.SizeF(273.0835F, 37.50002F);
+ this.lblZuschlagText.StylePriority.UseBorders = false;
+ this.lblZuschlagText.StylePriority.UseTextAlignment = false;
+ this.lblZuschlagText.Text = "5,0% Zuschlag auf Betreuungszeit";
+ //
+ // lblBetragStunden
+ //
+ this.lblBetragStunden.LocationFloat = new DevExpress.Utils.PointFloat(473.3327F, 100F);
+ this.lblBetragStunden.Multiline = true;
+ this.lblBetragStunden.Name = "lblBetragStunden";
+ this.lblBetragStunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblBetragStunden.SizeF = new System.Drawing.SizeF(145.0002F, 37.49999F);
+ this.lblBetragStunden.StylePriority.UseBorders = false;
+ this.lblBetragStunden.StylePriority.UseTextAlignment = false;
+ this.lblBetragStunden.Text = "1.000,00 €";
+ this.lblBetragStunden.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // lblStundensatz
+ //
+ this.lblStundensatz.LocationFloat = new DevExpress.Utils.PointFloat(378.3325F, 100F);
+ this.lblStundensatz.Multiline = true;
+ this.lblStundensatz.Name = "lblStundensatz";
+ this.lblStundensatz.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblStundensatz.SizeF = new System.Drawing.SizeF(95.00018F, 37.49999F);
+ this.lblStundensatz.StylePriority.UseBorders = false;
+ this.lblStundensatz.StylePriority.UseTextAlignment = false;
+ this.lblStundensatz.Text = "0,00 €";
+ this.lblStundensatz.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // lblStunden
+ //
+ this.lblStunden.LocationFloat = new DevExpress.Utils.PointFloat(189.1663F, 100F);
+ this.lblStunden.Multiline = true;
+ this.lblStunden.Name = "lblStunden";
+ this.lblStunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblStunden.SizeF = new System.Drawing.SizeF(189.1665F, 37.50001F);
+ this.lblStunden.StylePriority.UseBorders = false;
+ this.lblStunden.StylePriority.UseTextAlignment = false;
+ this.lblStunden.Text = "100,00 Stunden zu je";
+ //
+ // xrLabel7
+ //
+ this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100F);
+ 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(189.1665F, 37.50001F);
+ this.xrLabel7.StylePriority.UseBorders = false;
+ this.xrLabel7.StylePriority.UseTextAlignment = false;
+ this.xrLabel7.Text = "Betreuungseinsätze";
+ //
+ // xrLabel6
+ //
+ this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0.1668294F, 0F);
+ this.xrLabel6.Multiline = true;
+ this.xrLabel6.Name = "xrLabel6";
+ this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel6.SizeF = new System.Drawing.SizeF(676.67F, 100F);
+ this.xrLabel6.StylePriority.UseBorders = false;
+ this.xrLabel6.StylePriority.UseTextAlignment = false;
+ this.xrLabel6.Text = resources.GetString("xrLabel6.Text");
+ //
+ // GroupHeader2
+ //
+ this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel9,
+ this.xrLabel2,
+ this.lblKlient,
+ this.lblMitarbeiter,
+ this.xrLabel3,
+ this.xrLabel12,
+ this.xrLabel11,
+ this.xrLabel10,
+ this.xrLabel4,
+ this.xrLabel5,
+ this.xrLabel13,
+ this.lblAdresse});
+ this.GroupHeader2.HeightF = 320F;
+ this.GroupHeader2.Level = 1;
+ this.GroupHeader2.Name = "GroupHeader2";
+ //
+ // xrLabel9
+ //
+ this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(487.3332F, 124.625F);
+ this.xrLabel9.Name = "xrLabel9";
+ this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel9.SizeF = new System.Drawing.SizeF(189.5035F, 20F);
+ this.xrLabel9.StylePriority.UseBorders = false;
+ this.xrLabel9.StylePriority.UseTextAlignment = false;
+ this.xrLabel9.Text = "[InvoiceDate]";
+ this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+ //
+ // lblAdresse
+ //
+ this.lblAdresse.CanGrow = false;
+ this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.lblAdresse.Multiline = true;
+ this.lblAdresse.Name = "lblAdresse";
+ this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblAdresse.SizeF = new System.Drawing.SizeF(332.9585F, 139.2083F);
+ this.lblAdresse.StylePriority.UseFont = false;
+ //
+ // GroupFooter3
+ //
+ this.GroupFooter3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel15,
+ this.xrLabel14});
+ this.GroupFooter3.HeightF = 175.8542F;
+ this.GroupFooter3.Name = "GroupFooter3";
+ //
+ // GroupFooter1
+ //
+ this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrSubreport1});
+ this.GroupFooter1.HeightF = 25.2498F;
+ this.GroupFooter1.Level = 1;
+ this.GroupFooter1.Name = "GroupFooter1";
+ this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand;
+ //
+ // xrSubreport1
+ //
+ this.xrSubreport1.LocationFloat = new DevExpress.Utils.PointFloat(0.1668294F, 0F);
+ this.xrSubreport1.Name = "xrSubreport1";
+ this.xrSubreport1.SizeF = new System.Drawing.SizeF(676.8331F, 25.2498F);
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
+ //
+ // ServiceInvoiceReport
+ //
+ this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail,
+ this.topMarginBand1,
+ this.bottomMarginBand1,
+ this.GroupHeader1,
+ this.GroupHeader2,
+ this.GroupFooter3,
+ this.GroupFooter1});
+ this.DataSource = this.bindingSource1;
+ this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
+ this.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+ this.ruleRateFactorNull});
+ this.Margins = new System.Drawing.Printing.Margins(90, 50, 210, 125);
+ 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)).EndInit();
+
+ }
+
+
+ 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.XRLabel xrLabel15;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel14;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+ private DevExpress.XtraReports.UI.XRLabel lblKlient;
+ private DevExpress.XtraReports.UI.XRLabel lblMitarbeiter;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel12;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel11;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel10;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel13;
+ private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+ private DevExpress.XtraReports.UI.XRLabel lblAnzahlZuschlag;
+ private DevExpress.XtraReports.UI.XRLabel lblGesamtBetrag;
+ private DevExpress.XtraReports.UI.XRLabel lblBetragEinheitZuschlag;
+ private DevExpress.XtraReports.UI.XRLabel lblGesamtBetragZuschlag;
+ private DevExpress.XtraReports.UI.XRLabel lblZuschlagText;
+ private DevExpress.XtraReports.UI.XRLabel lblBetragStunden;
+ private DevExpress.XtraReports.UI.XRLabel lblStundensatz;
+ private DevExpress.XtraReports.UI.XRLabel lblStunden;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel7;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+ private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
+ private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter3;
+ private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel9;
+ private DevExpress.XtraReports.UI.XRLabel lblAdresse;
+ private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+ private DevExpress.XtraReports.UI.XRSubreport xrSubreport1;
+ }
+}
diff --git a/ReportImp/AsbRheinErftDuerenSBD/SbdRechnung.cs b/ReportImp/AsbRheinErftDuerenSBD/SbdRechnung.cs
new file mode 100644
index 000000000..66a8cf8dd
--- /dev/null
+++ b/ReportImp/AsbRheinErftDuerenSBD/SbdRechnung.cs
@@ -0,0 +1,342 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.Plugins;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.Services;
+using DevExpress.XtraReports.UI;
+
+namespace AsbRheinErftDuerenSBD
+{
+ [IDSpecificClass(Identifier = "SBD")]
+ public partial class ServiceInvoiceReport : XtraReport, IBeWoReport
+ {
+ public ServiceInvoiceReport()
+ {
+ this.InitializeComponent();
+ }
+
+ public void SetReportDataSource(ServiceInvoiceRO pRO)
+ {
+
+ //CreateAbrechnungsItems(pRO);
+
+ SetzeEmpfaengerAdresse(pRO);
+
+ SetzeBetraege(pRO);
+
+ var subReport = new LeistungsnachweisAbrechnung();
+ subReport.SetReportDataSource(pRO);
+
+ this.xrSubreport1.ReportSource = subReport;
+
+ this.bindingSource1.DataSource = pRO;
+
+ }
+
+ //private void CreateAbrechnungsItems(ServiceInvoiceRO pRo)
+ //{
+ // if (pRo.InvoiceBase.SupportConceptCostBearerRelDc != null)
+ // {
+ // var c2s = DAOFactory.GenericDAO.LoadByID(pRo.InvoiceBase.SupportConceptCostBearerRelDc.CostBearer2SupportConceptOid.Value);
+
+ // var list = ErstelleStundenplanItems(c2s.SupportConcept.Customer, pRo.AccountingPeriodStart, pRo.AccountingPeriodEnd);
+
+
+ // var srList = HoleAbrechenbareServiceRecords(c2s, pRo.AccountingPeriodStart, pRo.AccountingPeriodEnd);
+
+ // pRo.BillableServiceRecords = MergeBillableServiceRecords(list, srList);
+
+ // }
+ //}
+
+ //private List MergeBillableServiceRecords(List stundenplanItems, List srList)
+ //{
+ // List result = new List();
+
+ // Dictionary dayExistDict = new Dictionary();
+
+ // foreach (var sr in srList)
+ // {
+ // if (!dayExistDict.ContainsKey(sr.Start.Value.Day))
+ // {
+ // dayExistDict.Add(sr.Start.Value.Day, true);
+ // }
+ // result.Add(sr);
+ // }
+
+ // foreach (var sr in stundenplanItems)
+ // {
+ // if (!dayExistDict.ContainsKey(sr.Start.Value.Day))
+ // {
+ // result.Add(sr);
+ // }
+ // }
+
+ // return result;
+ //}
+
+ //private List HoleAbrechenbareServiceRecords(CostBearer2SupportConcept c2S, DateTime pRoAccountingPeriodStart, DateTime pRoAccountingPeriodEnd)
+ //{
+ // var srList = c2S.ServiceRecords;
+ // List result = new List();
+
+ // foreach (var sr in srList)
+ // {
+ // var dc = MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDC(sr);
+
+ // result.Add(dc);
+
+ // }
+ // return result;
+ //}
+
+ //private List ErstelleStundenplanItems(Customer customer, DateTime start, DateTime ende)
+ //{
+ // var stundenplan = GetStundenplan(customer, start);
+
+ // List items = new List();
+
+ // while (start <= ende)
+ // {
+ // var subItems = ErstelleStundenplanEintraege(stundenplan, start);
+
+ // items.AddRange(subItems);
+
+
+ // start = start.AddDays(1);
+ // }
+
+ // return items;
+ //}
+
+ private static Organisation SucheSchule(Customer customer)
+ {
+ foreach (var c2o in customer.Customer2OrganisationList)
+ {
+ foreach (var v2o in c2o.ValueList)
+ {
+ if (v2o.Entry.Value != null && v2o.Entry.Value.Contains("Schule"))
+ {
+ return c2o.Organisation;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ //private static Arbeitszeit GetStundenplan(Customer customer, DateTime date)
+ //{
+ // var stundenplan = SucheStundenplan(customer.Arbeitszeiten, date);
+
+
+ // if (stundenplan == null)
+ // {
+ // //Kein Stundenplan hinterlegt, suche Stundenplan bei der Organisation (Schule)
+ // var org = SucheSchule(customer);
+
+ // if (org != null)
+ // {
+ // return SucheStundenplan(org.Arbeitszeiten, date);
+ // }
+
+ // }
+
+ // return stundenplan;
+ //}
+
+ //private static Arbeitszeit SucheStundenplan(IList arbeitszeiten, DateTime date)
+ //{
+ // if (arbeitszeiten != null && arbeitszeiten.Count > 0)
+ // {
+ // foreach (var az in arbeitszeiten)
+ // {
+ // if ((!az.GueltigVon.HasValue || az.GueltigVon <= date) && (!az.GueltigBis.HasValue || az.GueltigBis >= date))
+ // {
+ // return az;
+ // }
+ // }
+ // }
+
+ // return null;
+ //}
+
+ //private static List ErstelleStundenplanEintraege(Arbeitszeit arbeitszeit, DateTime datum)
+ //{
+ // List items = new List();
+
+ // if (arbeitszeit != null && arbeitszeit.ArbeitszeitEintraege != null && arbeitszeit.ArbeitszeitEintraege.Count > 0)
+ // {
+ // if (arbeitszeit.GueltigVon <= datum && datum <= arbeitszeit.GueltigBis)
+ // {
+ // var day = datum.DayOfWeek;
+
+ // foreach (var ae in arbeitszeit.ArbeitszeitEintraege)
+ // {
+ // if (SindAmGleichenWochentag(day, ae.Tag))
+ // {
+ // String dateStr1 = String.Format("{0:dd.MM.yyyy} {1}", datum, ae.UhrzeitVon);
+ // String dateStr2 = String.Format("{0:dd.MM.yyyy} {1}", datum, ae.UhrzeitBis);
+
+ // DateTime date1;
+ // DateTime date2;
+
+ // if (DateTime.TryParse(dateStr1, out date1) && DateTime.TryParse(dateStr2, out date2))
+ // {
+
+ // var item = new ServiceRecordDC();
+
+ // item.Start = date1;
+ // item.End = date2;
+
+ // items.Add(item);
+ // }
+
+
+ // }
+ // }
+ // }
+ // }
+
+ // return items;
+ //}
+
+ //private static decimal BerechneStunden(ArbeitszeitEintrag ae)
+ //{
+ // String dateStr1 = String.Format("31.12.2018 {0}", ae.UhrzeitVon);
+ // String dateStr2 = String.Format("31.12.2018 {0}", ae.UhrzeitBis);
+
+ // DateTime date1;
+ // DateTime date2;
+
+ // if (DateTime.TryParse(dateStr1, out date1) && DateTime.TryParse(dateStr2, out date2))
+ // {
+ // return (decimal)date2.Subtract(date1).TotalHours;
+ // }
+
+ // return 0;
+ //}
+
+ //private static bool SindAmGleichenWochentag(DayOfWeek day, AppointmentDayOfWeek aeTag)
+ //{
+ // if (day == DayOfWeek.Monday && aeTag == AppointmentDayOfWeek.Montag)
+ // {
+ // return true;
+ // }
+ // if (day == DayOfWeek.Tuesday && aeTag == AppointmentDayOfWeek.Dienstag)
+ // {
+ // return true;
+ // }
+ // if (day == DayOfWeek.Wednesday && aeTag == AppointmentDayOfWeek.Mittwoch)
+ // {
+ // return true;
+ // }
+ // if (day == DayOfWeek.Thursday && aeTag == AppointmentDayOfWeek.Donnerstag)
+ // {
+ // return true;
+ // }
+ // if (day == DayOfWeek.Friday && aeTag == AppointmentDayOfWeek.Freitag)
+ // {
+ // return true;
+ // }
+ // if (day == DayOfWeek.Saturday && aeTag == AppointmentDayOfWeek.Samstag)
+ // {
+ // return true;
+ // }
+ // return false;
+ //}
+
+ private void SetzeBetraege(ServiceInvoiceRO pRo)
+ {
+ lblZuschlagText.Text = "";
+ lblAnzahlZuschlag.Text = "";
+ lblBetragEinheitZuschlag.Text = "";
+ lblGesamtBetragZuschlag.Text = "";
+
+ decimal stundenAnzahl = 0;
+ decimal stundenSatz = 0;
+
+ String prozentZuschlag = "";
+ decimal anzahlZuschlag = 0;
+ decimal betragEinheitZuschlag = 0;
+
+
+ if (pRo.ServiceInvoicePeriods != null)
+ {
+ foreach (var sip in pRo.ServiceInvoicePeriods)
+ {
+ if (sip.ServiceInvoiceItems != null)
+ {
+ foreach (var ii in sip.ServiceInvoiceItems)
+ {
+ if (ii.ServiceDescription != null)
+ {
+ if (ii.ServiceDescription == "Betreuungseinsätze")
+ {
+ stundenAnzahl = ii.UnitCount ?? 0;
+ stundenSatz = ii.AmountPerUnit ?? 0;
+ }
+ else if (ii.ServiceDescription.Contains("Zuschlag auf Betreuungszeit"))
+ {
+ anzahlZuschlag = ii.UnitCount ?? 0;
+ betragEinheitZuschlag = ii.AmountPerUnit ?? 0;
+
+ prozentZuschlag = ii.RateFactor;
+ prozentZuschlag = prozentZuschlag.Replace(",00%", "%");
+ }
+ }
+ }
+ }
+ }
+ }
+
+ lblStunden.Text = String.Format("{0:0.00}", stundenAnzahl);
+ lblStundensatz.Text = String.Format("{0:c}", stundenSatz);
+ lblBetragStunden.Text = String.Format("{0:c}", stundenAnzahl * stundenSatz);
+ if (!String.IsNullOrWhiteSpace(prozentZuschlag))
+ {
+ lblZuschlagText.Text = String.Format("{0} Zuschlag auf Betreuungszeit", prozentZuschlag);
+ lblAnzahlZuschlag.Text = String.Format("{0:0.00}", anzahlZuschlag);
+ lblBetragEinheitZuschlag.Text = String.Format("{0:c}", betragEinheitZuschlag);
+ lblGesamtBetragZuschlag.Text = String.Format("{0:c}", anzahlZuschlag * betragEinheitZuschlag);
+ }
+
+ lblGesamtBetrag.Text = pRo.GrossClaim;
+ }
+
+ private void SetzeEmpfaengerAdresse(ServiceInvoiceRO pRO)
+ {
+ StringBuilder sb = new StringBuilder();
+
+ if (!String.IsNullOrEmpty(pRO.RecipientOrganisation))
+ {
+ sb.AppendLine(pRO.RecipientOrganisation);
+ }
+ if (!String.IsNullOrEmpty(pRO.RecipientDivision))
+ {
+ sb.AppendLine(pRO.RecipientDivision);
+ }
+ if (!String.IsNullOrEmpty(pRO.RecipientAddressLine1))
+ {
+ sb.AppendLine(pRO.RecipientAddressLine1);
+ }
+ if (!String.IsNullOrEmpty(pRO.RecipientStreet))
+ {
+ sb.AppendLine(pRO.RecipientStreet);
+ }
+ if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown))
+ {
+ sb.AppendLine(pRO.RecipientPostCodeAndTown);
+ }
+ lblAdresse.Text = sb.ToString();
+ }
+ }
+}
\ No newline at end of file
diff --git a/ReportImp/AsbRheinErftDuerenSBD/SbdRechnung.resx b/ReportImp/AsbRheinErftDuerenSBD/SbdRechnung.resx
new file mode 100644
index 000000000..b844af4fa
--- /dev/null
+++ b/ReportImp/AsbRheinErftDuerenSBD/SbdRechnung.resx
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+ Sehr geehrte Damen und Herren,
+
+wir haben im o.g. Zeitraum für [CustomerFirstName] [CustomerLastName] Leistungen
+im Bereich Schulbegleitender Dienst gem. § 53 SGB XII erbracht.
+Wir stellen diese hiermit in Rechnung.
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs
index 327431eef..8cd36bcfd 100644
--- a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs
+++ b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs
@@ -28,9 +28,14 @@ namespace BeWo.DiakonieKKKleve
foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services)
{
var serviceRecord = DAOFactory.GenericDAO.LoadByID(s.ServiceRecordOid);
-
+ pRO.ReferenceNumber = serviceRecord.CostBearer2SupportConcept.CustomerReferenceNumber;
+ if (serviceRecord.CostBearer2SupportConcept.ApprovedStartDate != null)
+ pRO.ApprovedStartDate = String.Format("{0:dd.MM.yyyy}", serviceRecord.CostBearer2SupportConcept.ApprovedStartDate);
+ if (serviceRecord.CostBearer2SupportConcept.ApprovedEndDate != null)
+ pRO.ApprovedEndDate = String.Format("{0:dd.MM.yyyy}", serviceRecord.CostBearer2SupportConcept.ApprovedEndDate);
var srDc = MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDC(serviceRecord);
+
s.GoalList = String.Empty;
if (srDc.Goals != null && srDc.Goals.Count > 0)
{
diff --git a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.designer.cs b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.designer.cs
index e9f375577..b69ba29a7 100644
--- a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.designer.cs
+++ b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.designer.cs
@@ -41,6 +41,7 @@ namespace BeWo.DiakonieKKKleve
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
@@ -54,10 +55,15 @@ namespace BeWo.DiakonieKKKleve
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.cellGesamt = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
@@ -65,10 +71,9 @@ namespace BeWo.DiakonieKKKleve
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
- this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
- this.cellGesamt = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldEinzel = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
@@ -88,12 +93,7 @@ namespace BeWo.DiakonieKKKleve
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldArt = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldGroup = new DevExpress.XtraReports.UI.CalculatedField();
- this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
- this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -194,6 +194,12 @@ namespace BeWo.DiakonieKKKleve
this.xrTableCell16.Text = "Leistungsform";
this.xrTableCell16.Weight = 0.280438005341767D;
//
+ // xrTableCell19
+ //
+ this.xrTableCell19.Name = "xrTableCell19";
+ this.xrTableCell19.Text = "Schlüssel";
+ this.xrTableCell19.Weight = 0.19508730895313436D;
+ //
// xrTableCell14
//
this.xrTableCell14.Name = "xrTableCell14";
@@ -330,6 +336,16 @@ namespace BeWo.DiakonieKKKleve
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Weight = 0.14520203233717263D;
//
+ // xrTableCell20
+ //
+ this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.GoalList")});
+ this.xrTableCell20.Name = "xrTableCell20";
+ this.xrTableCell20.StylePriority.UseTextAlignment = false;
+ this.xrTableCell20.Text = "xrTableCell20";
+ this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell20.Weight = 0.10101011051826002D;
+ //
// xrTableCell18
//
this.xrTableCell18.Name = "xrTableCell18";
@@ -370,6 +386,57 @@ namespace BeWo.DiakonieKKKleve
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
+ // cellGesamt
+ //
+ this.cellGesamt.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.cellGesamt.BorderWidth = 1F;
+ this.cellGesamt.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+ this.cellGesamt.LocationFloat = new DevExpress.Utils.PointFloat(449.9998F, 0F);
+ this.cellGesamt.Name = "cellGesamt";
+ this.cellGesamt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+ this.cellGesamt.SizeF = new System.Drawing.SizeF(85F, 24.25F);
+ this.cellGesamt.StylePriority.UseBorders = false;
+ this.cellGesamt.StylePriority.UseBorderWidth = false;
+ this.cellGesamt.StylePriority.UseFont = false;
+ this.cellGesamt.StylePriority.UsePadding = false;
+ this.cellGesamt.StylePriority.UseTextAlignment = false;
+ this.cellGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrLabel8
+ //
+ this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(630.0004F, 36.41668F);
+ this.xrLabel8.Name = "xrLabel8";
+ this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel8.SizeF = new System.Drawing.SizeF(386.3333F, 17.99997F);
+ this.xrLabel8.StylePriority.UseBorders = false;
+ this.xrLabel8.StylePriority.UseFont = false;
+ this.xrLabel8.Text = "Datum, Unterschrift Leistungserbringer";
+ //
+ // xrLabel6
+ //
+ this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+ this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(630F, 82.02082F);
+ this.xrLabel6.Name = "xrLabel6";
+ this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel6.SizeF = new System.Drawing.SizeF(467.4581F, 17.99997F);
+ this.xrLabel6.StylePriority.UseBorders = false;
+ this.xrLabel6.StylePriority.UseFont = false;
+ //
+ // xrLabel11
+ //
+ this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.Right;
+ this.xrLabel11.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+ this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(200F, 0F);
+ this.xrLabel11.Name = "xrLabel11";
+ this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F);
+ this.xrLabel11.SizeF = new System.Drawing.SizeF(249.9996F, 24.24997F);
+ this.xrLabel11.StylePriority.UseBorders = false;
+ this.xrLabel11.StylePriority.UseFont = false;
+ this.xrLabel11.StylePriority.UsePadding = false;
+ this.xrLabel11.StylePriority.UseTextAlignment = false;
+ this.xrLabel11.Text = "Einheiten gesamt:";
+ this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ //
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -421,56 +488,39 @@ namespace BeWo.DiakonieKKKleve
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
- // xrLabel11
+ // xrLabel10
//
- this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.Right;
- this.xrLabel11.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
- this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(200F, 0F);
- this.xrLabel11.Name = "xrLabel11";
- this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F);
- this.xrLabel11.SizeF = new System.Drawing.SizeF(249.9996F, 24.24997F);
- this.xrLabel11.StylePriority.UseBorders = false;
- this.xrLabel11.StylePriority.UseFont = false;
- this.xrLabel11.StylePriority.UsePadding = false;
- this.xrLabel11.StylePriority.UseTextAlignment = false;
- this.xrLabel11.Text = "Einheiten gesamt:";
- this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(570.1245F, 0F);
+ this.xrLabel10.Multiline = true;
+ this.xrLabel10.Name = "xrLabel10";
+ this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel10.SizeF = new System.Drawing.SizeF(538.8751F, 77.97917F);
+ this.xrLabel10.StylePriority.UseFont = false;
+ this.xrLabel10.Text = resources.GetString("xrLabel10.Text");
//
- // xrLabel8
+ // xrLabel7
//
- this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(630.0004F, 36.41668F);
- this.xrLabel8.Name = "xrLabel8";
- this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel8.SizeF = new System.Drawing.SizeF(386.3333F, 17.99997F);
- this.xrLabel8.StylePriority.UseBorders = false;
- this.xrLabel8.StylePriority.UseFont = false;
- this.xrLabel8.Text = "Datum, Unterschrift Leistungserbringer";
+ this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrLabel7.Name = "xrLabel7";
+ this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel7.SizeF = new System.Drawing.SizeF(100F, 20F);
+ this.xrLabel7.StylePriority.UseFont = false;
+ this.xrLabel7.Text = "Schlüssel:";
//
- // xrLabel6
+ // xrLabel4
//
- this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
- this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(630F, 82.02082F);
- this.xrLabel6.Name = "xrLabel6";
- this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel6.SizeF = new System.Drawing.SizeF(467.4581F, 17.99997F);
- this.xrLabel6.StylePriority.UseBorders = false;
- this.xrLabel6.StylePriority.UseFont = false;
- //
- // cellGesamt
- //
- this.cellGesamt.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.cellGesamt.BorderWidth = 1F;
- this.cellGesamt.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
- this.cellGesamt.LocationFloat = new DevExpress.Utils.PointFloat(449.9998F, 0F);
- this.cellGesamt.Name = "cellGesamt";
- this.cellGesamt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
- this.cellGesamt.SizeF = new System.Drawing.SizeF(85F, 24.25F);
- this.cellGesamt.StylePriority.UseBorders = false;
- this.cellGesamt.StylePriority.UseBorderWidth = false;
- this.cellGesamt.StylePriority.UseFont = false;
- this.cellGesamt.StylePriority.UsePadding = false;
- this.cellGesamt.StylePriority.UseTextAlignment = false;
- this.cellGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(100.4163F, 0F);
+ this.xrLabel4.Multiline = true;
+ this.xrLabel4.Name = "xrLabel4";
+ this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel4.SizeF = new System.Drawing.SizeF(413.1665F, 77.97917F);
+ this.xrLabel4.StylePriority.UseFont = false;
+ this.xrLabel4.Text = "1 Soziotherapeutische Dokumentation\r\n2 Verordnung Formular 26 & 27, Erstellung So" +
+ "ziotherapieplan\r\n3 Arbeiten im sozialen Umfeld\r\n4 Motivation- (Antrieb) relevant" +
+ "es Training";
//
// fieldEinzel
//
@@ -599,7 +649,7 @@ namespace BeWo.DiakonieKKKleve
// xrLabel14
//
this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "Costbearer")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.CostBearer")});
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(774.396F, 70.00002F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -649,60 +699,10 @@ namespace BeWo.DiakonieKKKleve
this.fieldGroup.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldGroup.Name = "fieldGroup";
//
- // xrLabel4
- //
- this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F);
- this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(100.4163F, 0F);
- this.xrLabel4.Multiline = true;
- this.xrLabel4.Name = "xrLabel4";
- this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel4.SizeF = new System.Drawing.SizeF(413.1665F, 77.97917F);
- this.xrLabel4.StylePriority.UseFont = false;
- this.xrLabel4.Text = "1 Soziotherapeutische Dokumentation\r\n2 Verordnung Formular 26 & 27, Erstellung So" +
- "ziotherapieplan\r\n3 Arbeiten im sozialen Umfeld\r\n4 Motivation- (Antrieb) relevant" +
- "es Training";
- //
- // xrLabel7
- //
- this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F);
- this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrLabel7.Name = "xrLabel7";
- this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel7.SizeF = new System.Drawing.SizeF(100F, 20F);
- this.xrLabel7.StylePriority.UseFont = false;
- this.xrLabel7.Text = "Schlüssel:";
- //
- // xrLabel10
- //
- this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F);
- this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(570.1245F, 0F);
- this.xrLabel10.Multiline = true;
- this.xrLabel10.Name = "xrLabel10";
- this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel10.SizeF = new System.Drawing.SizeF(538.8751F, 77.97917F);
- this.xrLabel10.StylePriority.UseFont = false;
- this.xrLabel10.Text = resources.GetString("xrLabel10.Text");
- //
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
- // xrTableCell19
- //
- this.xrTableCell19.Name = "xrTableCell19";
- this.xrTableCell19.Text = "Schlüssel";
- this.xrTableCell19.Weight = 0.19508730895313436D;
- //
- // xrTableCell20
- //
- this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.GoalList")});
- this.xrTableCell20.Name = "xrTableCell20";
- this.xrTableCell20.StylePriority.UseTextAlignment = false;
- this.xrTableCell20.Text = "xrTableCell20";
- this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell20.Weight = 0.10101011051826002D;
- //
// LeistungsnachweisSoziotherapie
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
diff --git a/ReportImp/VkmHamm/Teamauslastung.cs b/ReportImp/VkmHamm/Teamauslastung.cs
index 959efa0a7..abcad4a0f 100644
--- a/ReportImp/VkmHamm/Teamauslastung.cs
+++ b/ReportImp/VkmHamm/Teamauslastung.cs
@@ -39,10 +39,9 @@ namespace VkmHamm
if (v2o.Entry.Type == ValueListEntryType.StaffRoleType)
{
if (v2o.Entry.Value.Contains("Bezugsbetreuer"))
-
{
if (e2c.Employee != null && e2c.Employee.Person != null)
- scd.Custom3 = e2c.Employee.Person.LastName + ", " + scd.Customer.Employee2CustomerList[0].Employee.Person.FirstName;
+ scd.Custom3 = e2c.Employee.Person.LastName + ", " + e2c.Employee.Person.FirstName;
if (e2c.Employee.Contracts != null && e2c.Employee.Contracts.Count != 0)
{
var contract = e2c.Employee.Contracts.FirstOrDefault(x => (!x.EntryDate.HasValue ||