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

MH: Fehlerbehebung WahlEV und neues Briefpapier für BloemelingUndTeckhaus

Browse Source
This commit is contained in:
Marcel Hirschle
2022-05-30 11:45:28 +02:00
parent fdb71746e2
commit a7f09f4639
7 changed files with 42750 additions and 929 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ReportImp/BloemelingUndTeckhaus/Briefpapier_B&T_Briefkopf_solo.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 MiB

BIN
ReportImp/BloemelingUndTeckhaus/Briefpapier_B&T_komplett.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 MiB

230
ReportImp/BloemelingUndTeckhaus/ServiceInvoiceReport.Designer.cs generated
View File

@@ -31,7 +31,6 @@ namespace BloemelingUndTeckhaus
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
@@ -81,7 +80,6 @@ namespace BloemelingUndTeckhaus
this.vertragsarztNrLabel = new DevExpress.XtraReports.UI.XRTableCell();
this.vkGueltigBisLabel = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
this.lblAddress = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
@@ -188,9 +186,6 @@ namespace BloemelingUndTeckhaus
this.xrTableCell118 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell119 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLine3 = new DevExpress.XtraReports.UI.XRLine();
this.xrLine2 = new DevExpress.XtraReports.UI.XRLine();
this.xrLine1 = new DevExpress.XtraReports.UI.XRLine();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
@@ -213,9 +208,6 @@ namespace BloemelingUndTeckhaus
this.xrTableRow17 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell130 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell131 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow18 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell132 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell133 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -228,6 +220,12 @@ namespace BloemelingUndTeckhaus
this.xrTableCell125 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrTableRow18 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell123 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
@@ -246,33 +244,20 @@ namespace BloemelingUndTeckhaus
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox1});
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.HeightF = 110F;
this.ReportHeader.HeightF = 0F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(674.5829F, 81.25F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// ruleRateFactorNull
//
this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
//
//
//
this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.ruleRateFactorNull.Name = "ruleRateFactorNull";
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 30F;
this.topMarginBand1.HeightF = 186F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
@@ -291,10 +276,9 @@ namespace BloemelingUndTeckhaus
this.xrLabel2,
this.xrTable2,
this.xrLabel10,
this.xrTable1,
this.lblAddress});
this.xrTable1});
this.Page1.Font = new System.Drawing.Font("Arial", 9F);
this.Page1.HeightF = 441.6667F;
this.Page1.HeightF = 409.375F;
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
@@ -303,10 +287,12 @@ namespace BloemelingUndTeckhaus
this.xrLabel8.CanGrow = false;
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientPostCodeAndTown")});
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 90.74996F);
this.xrLabel8.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(7.388735F, 55.99998F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(373F, 23F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.Text = "xrLabel8";
//
// xrLabel7
@@ -314,10 +300,12 @@ namespace BloemelingUndTeckhaus
this.xrLabel7.CanGrow = false;
this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientStreet")});
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 67.74998F);
this.xrLabel7.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(7.388735F, 32.99999F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(373F, 23F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "xrLabel7";
//
// xrLabel5
@@ -325,10 +313,12 @@ namespace BloemelingUndTeckhaus
this.xrLabel5.CanGrow = false;
this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientOrganisation")});
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 44.74999F);
this.xrLabel5.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(7.388735F, 10.00001F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(373F, 23F);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "xrLabel5";
//
// endabrechnungsCB
@@ -336,6 +326,7 @@ namespace BloemelingUndTeckhaus
this.endabrechnungsCB.LocationFloat = new DevExpress.Utils.PointFloat(430F, 255F);
this.endabrechnungsCB.Name = "endabrechnungsCB";
this.endabrechnungsCB.SizeF = new System.Drawing.SizeF(192.9998F, 23.00003F);
this.endabrechnungsCB.StylePriority.UseTextAlignment = false;
this.endabrechnungsCB.Text = "Endabrechnung";
//
// zwischenabrechnungsCB
@@ -343,15 +334,16 @@ namespace BloemelingUndTeckhaus
this.zwischenabrechnungsCB.LocationFloat = new DevExpress.Utils.PointFloat(430F, 232F);
this.zwischenabrechnungsCB.Name = "zwischenabrechnungsCB";
this.zwischenabrechnungsCB.SizeF = new System.Drawing.SizeF(192.9998F, 23.00003F);
this.zwischenabrechnungsCB.StylePriority.UseTextAlignment = false;
this.zwischenabrechnungsCB.Text = "Zwischenabrechnung";
//
// xrLabel2
//
this.xrLabel2.Font = new System.Drawing.Font("Arial", 9F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 408F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 390.2917F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(677F, 33.66669F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(677F, 19.08334F);
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.StylePriority.UseTextAlignment = false;
this.xrLabel2.Text = "Tag der Behandlung";
@@ -362,7 +354,7 @@ namespace BloemelingUndTeckhaus
this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 340F);
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 330.625F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1,
@@ -793,16 +785,6 @@ namespace BloemelingUndTeckhaus
this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell27.Weight = 1D;
//
// lblAddress
//
this.lblAddress.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Underline);
this.lblAddress.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 0F);
this.lblAddress.Name = "lblAddress";
this.lblAddress.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAddress.SizeF = new System.Drawing.SizeF(317F, 17F);
this.lblAddress.StylePriority.UseFont = false;
this.lblAddress.Text = "P. Teckhaus, Bahnhofstr. 16-18, 51143 Köln";
//
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1748,7 +1730,7 @@ namespace BloemelingUndTeckhaus
this.xrTableCell86.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell86.StylePriority.UsePadding = false;
this.xrTableCell86.StylePriority.UseTextAlignment = false;
this.xrTableCell86.Text = "Therapieeinh.";
this.xrTableCell86.Text = "Therapieeinheit";
this.xrTableCell86.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell86.Weight = 0.38995569248847456D;
//
@@ -2003,9 +1985,6 @@ namespace BloemelingUndTeckhaus
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLine3,
this.xrLine2,
this.xrLine1,
this.xrLabel14,
this.xrLabel9,
this.xrLabel1,
@@ -2014,72 +1993,61 @@ namespace BloemelingUndTeckhaus
this.xrTable6,
this.xrLabel3});
this.GroupFooter1.Font = new System.Drawing.Font("Arial", 9F);
this.GroupFooter1.HeightF = 412F;
this.GroupFooter1.HeightF = 332.2317F;
this.GroupFooter1.KeepTogether = true;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// xrLine3
//
this.xrLine3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 388.3984F);
this.xrLine3.Name = "xrLine3";
this.xrLine3.SizeF = new System.Drawing.SizeF(88F, 23F);
//
// xrLine2
//
this.xrLine2.LocationFloat = new DevExpress.Utils.PointFloat(127.5276F, 388.3984F);
this.xrLine2.Name = "xrLine2";
this.xrLine2.SizeF = new System.Drawing.SizeF(226.4723F, 23F);
//
// xrLine1
//
this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(430.5277F, 388.3984F);
this.xrLine1.Name = "xrLine1";
this.xrLine1.SizeF = new System.Drawing.SizeF(202.8629F, 23F);
//
// xrLabel14
//
this.xrLabel14.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel14.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(430.5277F, 321.4922F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(430.0001F, 293.0468F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(202.8629F, 17.72656F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(246.4723F, 17.72656F);
this.xrLabel14.StylePriority.UseBorders = false;
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.Text = "Teilnahmebestätigung Patient/in:";
this.xrLabel14.Text = "Teilnahmebestätigung Patient/in";
//
// xrLabel9
//
this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel9.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(127.5276F, 321.4922F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(126.9999F, 293.0468F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(227.4723F, 17.72656F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(283.4724F, 17.72656F);
this.xrLabel9.StylePriority.UseBorders = false;
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.Text = "Stempel/Unterschrift der Einrichtung:";
this.xrLabel9.Text = "Stempel/Unterschrift der Einrichtung";
//
// xrLabel1
//
this.xrLabel1.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 321.4922F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 293.0468F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(88.00002F, 17.72656F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(107F, 17.72656F);
this.xrLabel1.StylePriority.UseBorders = false;
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "Datum:";
this.xrLabel1.Text = "Datum";
//
// xrTable7
//
this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 174.3751F);
this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 136.4583F);
this.xrTable7.Name = "xrTable7";
this.xrTable7.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow8,
this.xrTableRow19,
this.xrTableRow18,
this.xrTableRow20,
this.xrTableRow14,
this.xrTableRow10,
this.xrTableRow16,
this.xrTableRow17,
this.xrTableRow18});
this.xrTable7.SizeF = new System.Drawing.SizeF(309.8332F, 112F);
this.xrTableRow17});
this.xrTable7.SizeF = new System.Drawing.SizeF(309.8332F, 128F);
//
// xrTableRow8
//
@@ -2127,7 +2095,7 @@ namespace BloemelingUndTeckhaus
//
this.cellIKNr.Name = "cellIKNr";
this.cellIKNr.StylePriority.UsePadding = false;
this.cellIKNr.Text = "490 534 390";
this.cellIKNr.Text = "490 534 083";
this.cellIKNr.Weight = 1.84D;
//
// xrTableRow14
@@ -2162,7 +2130,7 @@ namespace BloemelingUndTeckhaus
//
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.StylePriority.UsePadding = false;
this.xrTableCell9.Text = "Kontoinhaberin:";
this.xrTableCell9.Text = "Kontoinhaber:";
this.xrTableCell9.Weight = 1.2583322143554687D;
//
// cellKontoInhaber
@@ -2191,7 +2159,7 @@ namespace BloemelingUndTeckhaus
//
this.xrTableCell129.Name = "xrTableCell129";
this.xrTableCell129.StylePriority.UsePadding = false;
this.xrTableCell129.Text = "Postbank";
this.xrTableCell129.Text = "Volksbank Köln Bonn eG";
this.xrTableCell129.Weight = 1.84D;
//
// xrTableRow17
@@ -2204,56 +2172,38 @@ namespace BloemelingUndTeckhaus
//
// xrTableCell130
//
this.xrTableCell130.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrTableCell130.Name = "xrTableCell130";
this.xrTableCell130.StylePriority.UseFont = false;
this.xrTableCell130.StylePriority.UsePadding = false;
this.xrTableCell130.Text = "IBAN:";
this.xrTableCell130.Weight = 1.2583322143554687D;
//
// xrTableCell131
//
this.xrTableCell131.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrTableCell131.Name = "xrTableCell131";
this.xrTableCell131.StylePriority.UseFont = false;
this.xrTableCell131.StylePriority.UsePadding = false;
this.xrTableCell131.Text = "DE35250100300696639305";
this.xrTableCell131.Text = "DE07380601866705651017";
this.xrTableCell131.Weight = 1.84D;
//
// xrTableRow18
//
this.xrTableRow18.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell132,
this.xrTableCell133});
this.xrTableRow18.Name = "xrTableRow18";
this.xrTableRow18.Weight = 0.6399999999999999D;
//
// xrTableCell132
//
this.xrTableCell132.Name = "xrTableCell132";
this.xrTableCell132.StylePriority.UsePadding = false;
this.xrTableCell132.Text = "BIC:";
this.xrTableCell132.Weight = 1.2583322143554687D;
//
// xrTableCell133
//
this.xrTableCell133.Name = "xrTableCell133";
this.xrTableCell133.StylePriority.UsePadding = false;
this.xrTableCell133.Text = "PBNKDEFF";
this.xrTableCell133.Weight = 1.84D;
//
// xrLabel4
//
this.xrLabel4.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 129.375F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.1668135F, 92.91668F);
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(430F, 30F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(487F, 29.99998F);
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "Ich bitte um Überweisung des Gesamtbetrages.\r\nBitte Rechnungs-Nr. und Patientenna" +
"me bei Überweisung angeben.";
"me und KGNR bei Überweisung angeben.";
//
// xrTable6
//
this.xrTable6.Font = new System.Drawing.Font("Arial", 9F);
this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 60F);
this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0.1668135F, 32.99999F);
this.xrTable6.Name = "xrTable6";
this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow5,
@@ -2346,7 +2296,7 @@ namespace BloemelingUndTeckhaus
// xrLabel3
//
this.xrLabel3.Font = new System.Drawing.Font("Arial", 9F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 23.78904F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(310F, 23F);
@@ -2357,6 +2307,48 @@ namespace BloemelingUndTeckhaus
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// xrTableRow18
//
this.xrTableRow18.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell5,
this.xrTableCell12});
this.xrTableRow18.Name = "xrTableRow18";
this.xrTableRow18.Weight = 0.64D;
//
// xrTableCell5
//
this.xrTableCell5.Font = new System.Drawing.Font("Arial", 9F);
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.StylePriority.UseFont = false;
this.xrTableCell5.Text = "Buchungsnummer:";
this.xrTableCell5.Weight = 1.2583322143554687D;
//
// xrTableCell12
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Weight = 1.84D;
//
// xrTableRow20
//
this.xrTableRow20.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell19,
this.xrTableCell123});
this.xrTableRow20.Name = "xrTableRow20";
this.xrTableRow20.Weight = 0.64D;
//
// xrTableCell19
//
this.xrTableCell19.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.StylePriority.UseFont = false;
this.xrTableCell19.Text = "KGNR:";
this.xrTableCell19.Weight = 1.2583322143554687D;
//
// xrTableCell123
//
this.xrTableCell123.Name = "xrTableCell123";
this.xrTableCell123.Weight = 1.84D;
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -2371,11 +2363,13 @@ namespace BloemelingUndTeckhaus
this.Font = new System.Drawing.Font("Verdana", 10F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(75, 75, 30, 10);
this.Margins = new System.Drawing.Printing.Margins(75, 38, 186, 10);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "13.1";
this.Version = "17.1";
this.Watermark.Image = ((System.Drawing.Image)(resources.GetObject("ServiceInvoiceReport.Watermark.Image")));
this.Watermark.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom;
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
@@ -2409,8 +2403,6 @@ namespace BloemelingUndTeckhaus
private DevExpress.XtraReports.UI.DetailReportBand DetailReport2;
private DevExpress.XtraReports.UI.DetailBand Detail3;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRLabel lblAddress;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
@@ -2563,16 +2555,10 @@ namespace BloemelingUndTeckhaus
private DevExpress.XtraReports.UI.XRTableRow xrTableRow17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell130;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell131;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow18;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell132;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell133;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell127;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRLine xrLine3;
private DevExpress.XtraReports.UI.XRLine xrLine2;
private DevExpress.XtraReports.UI.XRLine xrLine1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell136;
private DevExpress.XtraReports.UI.XRTableCell cellIKNr;
@@ -2587,5 +2573,11 @@ namespace BloemelingUndTeckhaus
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow18;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell123;
}
}

38
ReportImp/BloemelingUndTeckhaus/ServiceInvoiceReport.cs
View File

@@ -14,7 +14,7 @@ namespace BloemelingUndTeckhaus
{
public partial class ServiceInvoiceReport : XtraReport, IBeWoReport<ServiceInvoiceRO>
{
private int mEinheitenTotal = 0;
private decimal mEinheitenTotal = 0;
public List<SoziotherapieRow> SoziotherapieRowList { get; set; }
@@ -45,7 +45,7 @@ namespace BloemelingUndTeckhaus
{
var units = firstRow.Days[i - 1];
xrTable3.Rows[0].Cells[i].Text = units == 0 ? String.Empty : "X";
xrTable3.Rows[1].Cells[i].Text = units == 0 ? String.Empty : units.ToString();
xrTable3.Rows[1].Cells[i].Text = units == 0 ? String.Empty : string.Format("{0:0.0}", units);
}
if (SoziotherapieRowList.Count > 1)
@@ -61,9 +61,10 @@ namespace BloemelingUndTeckhaus
newRow2.Height = xrTable3.Rows[1].Height;
newRow1.Cells[0].Text = obj.Title;
newRow1.Cells[0].TextAlignment = TextAlignment.MiddleLeft;
newRow1.Cells[0].Padding = xrTable3.Rows[1].Cells[0].Padding;
newRow2.Cells[0].Text = "Therapieeinh.";
newRow2.Cells[0].TextAlignment = xrTable3.Rows[0].TextAlignment;
newRow2.Cells[0].Text = "Therapieeinheit";
newRow2.Cells[0].TextAlignment = TextAlignment.MiddleLeft;
newRow2.Cells[0].Padding = xrTable3.Rows[1].Cells[0].Padding;
@@ -74,11 +75,11 @@ namespace BloemelingUndTeckhaus
var units = obj.Days[i - 1];
newRow1.Cells[i].Text = units == 0 ? String.Empty : "X";
newRow1.Cells[i].TextAlignment = TextAlignment.MiddleCenter;
newRow1.Cells[i].TextAlignment = TextAlignment.MiddleLeft;
newRow1.Cells[i].Padding = xrTable3.Rows[0].Cells[1].Padding;
newRow2.Cells[i].Text = units == 0 ? String.Empty : units.ToString();
newRow2.Cells[i].TextAlignment = TextAlignment.MiddleCenter;
newRow2.Cells[i].Text = units == 0 ? String.Empty : string.Format("{0:0.0}", units);
newRow2.Cells[i].TextAlignment = TextAlignment.MiddleLeft;
newRow2.Cells[i].Padding = xrTable3.Rows[0].Cells[1].Padding;
}
}
@@ -97,7 +98,7 @@ namespace BloemelingUndTeckhaus
}
cellAnzahlEinheitenGesamt.Text = String.Format("{0:0}", mEinheitenTotal);
cellAnzahlEinheitenGesamt.Text = String.Format("{0:0.0}", mEinheitenTotal);
SetAnbieterFields(pRO);
SetVarFields(pRO);
@@ -138,9 +139,9 @@ namespace BloemelingUndTeckhaus
e2c => e2c.ValueList.Any(ve => ve.Entry.SystemEntryID.HasValue && ve.Entry.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant));
if (hauptbetreuer != null && hauptbetreuer.Employee.Person.LastName == "Blömeling")
{
lblAddress.Text = "M.Blömeling, Bahnhofstr. 16-18, 51143 Köln";
cellKontoInhaber.Text = "Michaela Blömeling";
cellIKNr.Text = "490 534 083";
//lblAddress.Text = "M.Blömeling, Bahnhofstr. 16-18, 51143 Köln";
//cellKontoInhaber.Text = "Michaela Blömeling";
//cellIKNr.Text = "490 534 083";
}
}
}
@@ -228,7 +229,8 @@ namespace BloemelingUndTeckhaus
foreach (var item in serviceItems)
{
if (!item.AccountingPeriodStart.HasValue) continue;
if (!item.AccountingPeriodStart.HasValue)
continue;
var date = item.AccountingPeriodStart.Value;
var title = String.Format("{0}. {1}", date.ToString("MMM"), date.ToString("yy"));
@@ -240,15 +242,15 @@ namespace BloemelingUndTeckhaus
var row = SoziotherapieRowList.First(f => f.Title.Equals(title));
int volleStunden = 0;
decimal stunden = 0;
if (item.Hours.HasValue)
{
volleStunden = (int)Math.Floor(item.Hours.Value);
stunden = item.Hours.Value;
}
row.Days[item.AccountingPeriodStart.Value.Day - 1] += volleStunden;
row.Days[item.AccountingPeriodStart.Value.Day - 1] += stunden;
mEinheitenTotal += volleStunden;
mEinheitenTotal += stunden;
}
}
}
@@ -257,12 +259,12 @@ namespace BloemelingUndTeckhaus
{
public String Title { get; set; }
public int[] Days { get; set; }
public decimal[] Days { get; set; }
public SoziotherapieRow()
{
Title = string.Empty;
Days = new int[31];
Days = new decimal[31];
}
}
}

43401
ReportImp/BloemelingUndTeckhaus/ServiceInvoiceReport.resx
View File

File diff suppressed because it is too large Load Diff

2
ReportImp/WahlEv/RosterReport.cs
View File

@@ -118,7 +118,7 @@ namespace WahlEv
BorderWidth = xrLabel_Image.BorderWidth,
BackColor = ColorTranslator.FromHtml(d.Farbe),
ForeColor = foreColor,
Text = d.DienstName + " (" + dienste[0].Kurz + ")"
Text = d.DienstName + " (" + d.Kurz + ")"
});
this.ReportFooter.Controls.Add(
new XRLabel()

8
Service/Plugins/PluginLoader.cs
View File

@@ -77,7 +77,7 @@ namespace BeWo.Service.Plugins
//t = "4941141927"; // Signcom
//t = "8897605322"; // SPZ Ratingen
//t = "6483870127"; // Wigonetz
//t = "9482484652"; // Blömeling und Teckhaus
t = "9482484652"; // Blömeling und Teckhaus
//t = "8001550599"; // Biallas BeWo
//t = "7282396774"; // Caritas Unna
//t = "6884855402"; // IBP
@@ -146,7 +146,7 @@ namespace BeWo.Service.Plugins
//t = "9975231461"; // Selwo
//t = "8181286349"; // BeWo am Rhein
//t = "4595275645"; // Eigenständig
t = "7912635399"; // Prof. Dr. Eggers Stiftung
//t = "7912635399"; // Prof. Dr. Eggers Stiftung
//t = "3549726254"; // Socia
//t = "1992495802"; // Monvita
//t = "7381352241"; // Ressource e.V.
@@ -296,9 +296,9 @@ namespace BeWo.Service.Plugins
//t = "5478434972"; // LebensWert - Kai Lippel
//t = "5381886394"; // PZDDuesseldorf
//t = "3640152169"; // Claudia Charisius
//t = "3884496709"; // Wahl e.V.
t = "3884496709"; // Wahl e.V.
//t = "3536079480"; // Behindertenhilfe Menden
//t = "5427523619"; // ChristopherusHausFamilienhilfe
//t = "5427523619"; // Christopherus-Haus Familienhilfe
//t = "8251343124"; // Rat Plus Tat
//t = "6819347851"; // Awo Kreisverband Plön
//t = "2385915144"; // AKGG GmbHd