Konflikt gelöst

This commit is contained in:
2026-05-11 12:49:50 +02:00
29 changed files with 2016 additions and 776 deletions

View File

@@ -1545,7 +1545,11 @@ namespace BeWoPlanerMobil.Controllers
{
//if(Model.NewServiceRecord.CostBearer != null && Model.ShowSignature && (Model.NewServiceRecord.ServiceDescription.Category.IsBillable || Model.NewServiceRecord.ServiceDescription.Category.BillableAmount > 0m || Model.NewServiceRecord.ServiceDescription.BillableAmount > 0m))
//{
var valRes = OperationsService.ValidateServiceRecord(Model.NewServiceRecord, null, 0, null, null);
var dummystats = new SupportConceptStatisticsDC();
dummystats.PeriodStatistics = new List<SupportConceptPeriodStatisticsDC>();
var valRes = OperationsService.ValidateServiceRecord(Model.NewServiceRecord, dummystats, 0, null, null);
var doppelt = valRes.Count > 0 && valRes.FirstOrDefault(v => v.ResultType == DoppelterEintrag) != null;
if(!doppelt)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 MiB

View File

@@ -30,6 +30,7 @@ namespace BeWo.ABCBetreuungenReports.Alt
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
DevExpress.XtraPrinting.Drawing.Watermark watermark1 = new DevExpress.XtraPrinting.Drawing.Watermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
@@ -62,7 +63,6 @@ namespace BeWo.ABCBetreuungenReports.Alt
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
@@ -94,6 +94,7 @@ namespace BeWo.ABCBetreuungenReports.Alt
this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -111,7 +112,7 @@ namespace BeWo.ABCBetreuungenReports.Alt
//
// ReportHeader
//
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 0F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
@@ -119,7 +120,7 @@ namespace BeWo.ABCBetreuungenReports.Alt
// xrTable1
//
this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTable1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.xrTable1.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 443.8749F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -157,7 +158,7 @@ namespace BeWo.ABCBetreuungenReports.Alt
this.xrTableCell6.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell6.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell6.StylePriority.UseBorderColor = false;
@@ -200,7 +201,7 @@ namespace BeWo.ABCBetreuungenReports.Alt
//
this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell7.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell7.FormattingRules.Add(this.ruleRateFactorNull);
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -252,7 +253,7 @@ namespace BeWo.ABCBetreuungenReports.Alt
//
// xrLabel6
//
this.xrLabel6.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 368.8749F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
@@ -263,7 +264,7 @@ namespace BeWo.ABCBetreuungenReports.Alt
//
// xrLabel5
//
this.xrLabel5.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 335.8749F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -275,7 +276,7 @@ namespace BeWo.ABCBetreuungenReports.Alt
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 293.5417F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
@@ -290,7 +291,7 @@ namespace BeWo.ABCBetreuungenReports.Alt
//
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 277.5417F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -304,7 +305,7 @@ namespace BeWo.ABCBetreuungenReports.Alt
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 260.5418F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -317,18 +318,19 @@ namespace BeWo.ABCBetreuungenReports.Alt
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox1,
this.xrLabel10,
this.xrTable3,
this.xrLabel12});
this.ReportFooter.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.ReportFooter.HeightF = 171.5F;
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.ReportFooter.HeightF = 195.2501F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// xrLabel10
//
this.xrLabel10.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 79.49998F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -338,7 +340,7 @@ namespace BeWo.ABCBetreuungenReports.Alt
//
// xrTable3
//
this.xrTable3.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.xrTable3.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 21.19446F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -398,8 +400,8 @@ namespace BeWo.ABCBetreuungenReports.Alt
//
// xrLabel12
//
this.xrLabel12.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 154.5F);
this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 172.2083F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F);
@@ -408,18 +410,17 @@ namespace BeWo.ABCBetreuungenReports.Alt
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 190F;
this.topMarginBand1.HeightF = 193.5F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 100F;
this.bottomMarginBand1.HeightF = 113.738F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel11,
this.xrLabel9,
this.xrLabel8,
this.xrLabel7,
@@ -431,25 +432,15 @@ namespace BeWo.ABCBetreuungenReports.Alt
this.xrLabel5,
this.xrLabel6,
this.xrTable1});
this.GroupHeader1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.GroupHeader1.HeightF = 511.8749F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
// xrLabel11
//
this.xrLabel11.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 0F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(351.3749F, 17.45835F);
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.Text = "SCHUBKRAFT - Hildegard-von-Bingen-Straße 19 - 49124 Georgsmarienhütte";
//
// xrLabel9
//
this.xrLabel9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(522.7916F, 65.91669F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
@@ -459,10 +450,12 @@ namespace BeWo.ABCBetreuungenReports.Alt
this.xrLabel9.Text = "Hildegard-von-Bingen-Straße 19\r\n49124 Georgsmarienhütte\r\n\r\nFon 05401 - 849 06 49\r" +
"\nFax 05401 - 849 06 50\r\n\r\ninfo@schubkraft-coaching.de\r\nwww.schubkraft-coaching.d" +
"e";
this.xrLabel9.Visible = false;
//
// xrLabel8
//
this.xrLabel8.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 9F, DevExpress.Drawing.DXFontStyle.Italic, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(522.7916F, 34.91669F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
@@ -470,6 +463,7 @@ namespace BeWo.ABCBetreuungenReports.Alt
this.xrLabel8.SizeF = new System.Drawing.SizeF(191.2084F, 17.45835F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.Text = "Dipl.Soz.päd./Dipl.Soz.arb.";
this.xrLabel8.Visible = false;
//
// xrLabel7
//
@@ -480,21 +474,22 @@ namespace BeWo.ABCBetreuungenReports.Alt
this.xrLabel7.SizeF = new System.Drawing.SizeF(191.2084F, 17.45834F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "Anne Kerk";
this.xrLabel7.Visible = false;
//
// xrLabel1
//
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", "Georgsmarienhütte, den {0:dd.MM.yyyy}")});
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(470.3735F, 212.625F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(417.8319F, 212.625F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(243.6264F, 23.95834F);
this.xrLabel1.StylePriority.UseTextAlignment = false;
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
//
// lblAdresse
//
this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(10.00001F, 17.45834F);
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);
@@ -515,7 +510,7 @@ namespace BeWo.ABCBetreuungenReports.Alt
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable5});
this.Detail1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.Detail1.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.Detail1.HeightF = 17F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
@@ -523,7 +518,7 @@ namespace BeWo.ABCBetreuungenReports.Alt
// xrTable5
//
this.xrTable5.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTable5.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.xrTable5.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable5.Name = "xrTable5";
this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -578,7 +573,7 @@ namespace BeWo.ABCBetreuungenReports.Alt
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable4});
this.GroupFooter1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.GroupFooter1.HeightF = 132F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
@@ -586,7 +581,7 @@ namespace BeWo.ABCBetreuungenReports.Alt
// xrTable4
//
this.xrTable4.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTable4.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.xrTable4.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable4.Name = "xrTable4";
this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -780,7 +775,7 @@ namespace BeWo.ABCBetreuungenReports.Alt
this.xrTableCell58.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell58.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell58.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell58.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell58.Name = "xrTableCell58";
this.xrTableCell58.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell58.StylePriority.UseBorderColor = false;
@@ -791,6 +786,14 @@ namespace BeWo.ABCBetreuungenReports.Alt
this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell58.Weight = 0.21685899000901443D;
//
// xrPictureBox1
//
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 96.49998F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(125F, 75.70833F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
@@ -810,11 +813,16 @@ namespace BeWo.ABCBetreuungenReports.Alt
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(75, 28, 190, 100);
this.Margins = new DevExpress.Drawing.DXMargins(64F, 28F, 193.5F, 113.738F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
this.Version = "23.2";
watermark1.Id = "Watermark1";
watermark1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("watermark1.ImageSource"));
watermark1.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom;
watermark1.PageRange = "1";
this.Watermarks.Add(watermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
@@ -887,9 +895,9 @@ namespace BeWo.ABCBetreuungenReports.Alt
private DevExpress.XtraReports.UI.XRTableCell xrTableCell58;
private DevExpress.XtraReports.UI.XRLabel lblAdresse;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
}
}

File diff suppressed because one or more lines are too long

View File

@@ -51,6 +51,7 @@ namespace BeWo.ABCBetreuungenReports
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -64,9 +65,6 @@ namespace BeWo.ABCBetreuungenReports
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -95,7 +93,6 @@ namespace BeWo.ABCBetreuungenReports
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
@@ -121,7 +118,7 @@ namespace BeWo.ABCBetreuungenReports
//
this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTable1.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 443.8731F);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 352.2065F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow9,
@@ -254,7 +251,7 @@ namespace BeWo.ABCBetreuungenReports
// xrLabel6
//
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 368.8731F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 277.2064F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -265,7 +262,7 @@ namespace BeWo.ABCBetreuungenReports
// xrLabel5
//
this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 335.8732F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 244.2065F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
@@ -277,7 +274,7 @@ namespace BeWo.ABCBetreuungenReports
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 293.54F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 212.375F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -292,7 +289,7 @@ namespace BeWo.ABCBetreuungenReports
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 277.54F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 196.375F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F);
@@ -307,10 +304,10 @@ namespace BeWo.ABCBetreuungenReports
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 260.54F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 179.3751F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 17F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(384.375F, 17F);
this.xrLabel2.StylePriority.UseBackColor = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]";
@@ -329,6 +326,14 @@ namespace BeWo.ABCBetreuungenReports
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// xrPictureBox1
//
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 99.97221F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(125F, 75.70833F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel10
//
this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
@@ -423,9 +428,6 @@ namespace BeWo.ABCBetreuungenReports
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel13,
this.xrLabel7,
this.xrLabel8,
this.xrLabel9,
this.lblAdresse,
this.xrLabel2,
this.xrLabel3,
@@ -434,7 +436,7 @@ namespace BeWo.ABCBetreuungenReports
this.xrLabel6,
this.xrTable1});
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F);
this.GroupHeader1.HeightF = 511.8731F;
this.GroupHeader1.HeightF = 420.2065F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
@@ -442,51 +444,12 @@ namespace BeWo.ABCBetreuungenReports
//
this.xrLabel13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", "Georgsmarienhütte, den {0:dd.MM.yyyy}")});
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(419.3321F, 188.0417F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(421.4154F, 179.3751F);
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(243.6264F, 23.95834F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(243.6264F, 16.99994F);
this.xrLabel13.StylePriority.UseTextAlignment = false;
this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
//
// xrLabel7
//
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(522.7916F, 17.45834F);
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(191.2084F, 17.45834F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "Anne Kerk";
this.xrLabel7.Visible = false;
//
// xrLabel8
//
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 9F, DevExpress.Drawing.DXFontStyle.Italic, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(522.7916F, 34.91669F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(191.2084F, 17.45835F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.Text = "Dipl.Soz.päd./Dipl.Soz.arb.";
this.xrLabel8.Visible = false;
//
// xrLabel9
//
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(522.7916F, 65.91669F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(191.2084F, 122.125F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.Text = "Hildegard-von-Bingen-Straße 19\r\n49124 Georgsmarienhütte\r\n\r\nFon 05401 - 849 06 49\r" +
"\nFax 05401 - 849 06 50\r\n\r\ninfo@schubkraft-coaching.de\r\nwww.schubkraft-coaching.d" +
"e";
this.xrLabel9.Visible = false;
this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// lblAdresse
//
@@ -793,14 +756,6 @@ namespace BeWo.ABCBetreuungenReports
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// xrPictureBox1
//
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 99.97221F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(125F, 75.70833F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -897,9 +852,6 @@ namespace BeWo.ABCBetreuungenReports
private DevExpress.XtraReports.UI.XRLabel lblAdresse;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
}

File diff suppressed because one or more lines are too long

View File

@@ -81,9 +81,6 @@ namespace AsbRheinErftDueren
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
this.TotalFLMBillableAlsStunden = new DevExpress.XtraReports.UI.CalculatedField();
this.MinutesAlsStunden = new DevExpress.XtraReports.UI.CalculatedField();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -125,12 +122,12 @@ namespace AsbRheinErftDueren
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow6});
this.xrTable3.SizeF = new System.Drawing.SizeF(747F, 25F);
this.xrTable3.SizeF = new System.Drawing.SizeF(644.6393F, 25F);
this.xrTable3.StylePriority.UseFont = false;
this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
@@ -142,8 +139,7 @@ namespace AsbRheinErftDueren
this.xrTableCell10,
this.xrTableCell2,
this.xrTableCell15,
this.xrTableCell12,
this.xrTableCell18});
this.xrTableCell12});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -233,7 +229,7 @@ namespace AsbRheinErftDueren
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell12.TextFormatString = "{0:0.00}";
this.xrTableCell12.Weight = 0.071269990461128627D;
this.xrTableCell12.Weight = 0.10112285952499941D;
//
// GroupHeader1
//
@@ -250,13 +246,13 @@ namespace AsbRheinErftDueren
this.xrTableServiceRecords1.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableServiceRecords1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 0F);
this.xrTableServiceRecords1.Name = "xrTableServiceRecords1";
this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2,
this.xrTableRow1});
this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(747F, 70F);
this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(644.639F, 70F);
this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
this.xrTableServiceRecords1.StylePriority.UseBorders = false;
this.xrTableServiceRecords1.StylePriority.UseFont = false;
@@ -268,8 +264,7 @@ namespace AsbRheinErftDueren
this.xrTableCell3,
this.xrTableCell4,
this.xrTableCell11,
this.xrTableCell9,
this.xrTableCell16});
this.xrTableCell9});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -339,7 +334,7 @@ namespace AsbRheinErftDueren
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "FLS in";
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrTableCell9.Weight = 0.15766966850921618D;
this.xrTableCell9.Weight = 0.22371302944965665D;
//
// xrTableRow1
//
@@ -348,8 +343,7 @@ namespace AsbRheinErftDueren
this.xrTableCell8,
this.xrTableCell5,
this.xrTableCell6,
this.xrTableCell7,
this.xrTableCell17});
this.xrTableCell7});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 1.223644578313253D;
//
@@ -422,7 +416,7 @@ namespace AsbRheinErftDueren
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "Stunden";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell7.Weight = 0.15766989674118953D;
this.xrTableCell7.Weight = 0.22371311503664676D;
//
// bindingSource1
//
@@ -685,10 +679,10 @@ namespace AsbRheinErftDueren
this.xrLabel10.BackColor = System.Drawing.Color.Gainsboro;
this.xrLabel10.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(141.93F, 0F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(322.7116F, 0F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(250F, 20F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(220.5151F, 20F);
this.xrLabel10.StylePriority.UseBackColor = false;
this.xrLabel10.StylePriority.UseBorders = false;
this.xrLabel10.StylePriority.UseFont = false;
@@ -701,7 +695,7 @@ namespace AsbRheinErftDueren
//
this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Right;
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(56.93002F, 0F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(237.7116F, 0F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(85F, 20F);
@@ -719,10 +713,10 @@ namespace AsbRheinErftDueren
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMBillableAlsStunden")});
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(391.9301F, 0F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(543.2266F, 0F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(84.3299F, 20F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(150.7739F, 20F);
this.xrLabel1.StylePriority.UseBackColor = false;
this.xrLabel1.StylePriority.UseBorders = false;
this.xrLabel1.StylePriority.UseFont = false;
@@ -749,51 +743,6 @@ namespace AsbRheinErftDueren
this.MinutesAlsStunden.Expression = "[Minutes] / 60";
this.MinutesAlsStunden.Name = "MinutesAlsStunden";
//
// xrTableCell16
//
this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell16.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell16.Multiline = true;
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrTableCell16.StylePriority.UseBorders = false;
this.xrTableCell16.StylePriority.UseFont = false;
this.xrTableCell16.StylePriority.UsePadding = false;
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.Text = "Bemerkungen";
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrTableCell16.Weight = 0.50619631022645872D;
//
// xrTableCell17
//
this.xrTableCell17.BackColor = System.Drawing.Color.Gainsboro;
this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell17.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell17.Multiline = true;
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.StylePriority.UseBackColor = false;
this.xrTableCell17.StylePriority.UseBorders = false;
this.xrTableCell17.StylePriority.UseFont = false;
this.xrTableCell17.StylePriority.UseTextAlignment = false;
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell17.Weight = 0.50619616758147545D;
//
// xrTableCell18
//
this.xrTableCell18.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell18.Multiline = true;
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.StylePriority.UseBorders = false;
this.xrTableCell18.StylePriority.UseFont = false;
this.xrTableCell18.StylePriority.UsePadding = false;
this.xrTableCell18.StylePriority.UseTextAlignment = false;
this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell18.Weight = 0.22881087286891738D;
//
// QuittierungsbelegJugendamt
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -881,8 +830,5 @@ namespace AsbRheinErftDueren
private DevExpress.XtraReports.UI.XRLabel xrLabel20;
private DevExpress.XtraReports.UI.CalculatedField TotalFLMBillableAlsStunden;
private DevExpress.XtraReports.UI.CalculatedField MinutesAlsStunden;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
}
}

View File

@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using DevExpress.XtraReports.UI;
@@ -12,13 +10,16 @@ namespace BeWoImFlow
{
public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
{
List<ServicesOverviewRO> lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay);
List<ServicesOverviewRO> lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
if (lROs.Count > 0)
{
var rootReport = CreateServicesOverviewReportForRo(lROs[0]);
rootReport.CreateDocument();
if (rootReport.Pages.Count == 0)
{
rootReport.CreateDocument();
}
for (int i = 1; i < lROs.Count; i++)
{
var lNext = CreateServicesOverviewReportForRo(lROs[i]);
@@ -31,20 +32,49 @@ namespace BeWoImFlow
return new XtraReport();
}
public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
public override XtraReport CreateServiceOverviewReportForCustomers(IList<long> customerOids, int month, int year, long? orgaOid, long? empOid, long? serviceCategoryOid, int startDay, int endDay, bool nurFehlende)
{
var roList = new List<ServicesOverviewRO>();
foreach (var coid in customerOids)
{
var ro = ServicesOverviewRO.Create(coid, month, year, true, orgaOid ?? 0, empOid ?? 0, startDay, endDay, serviceCategoryOid);
if (ro != null)
{
roList.Add(ro);
}
}
if (roList.Count > 0)
{
var rootReport = CreateServicesOverviewReportForRo(roList[0]);
rootReport.CreateDocument();
for (int i = 1; i < roList.Count; i++)
{
var lNext = CreateServicesOverviewReportForRo(roList[i]);
lNext.CreateDocument();
rootReport.Pages.AddRange(lNext.Pages);
}
return rootReport;
}
return new XtraReport();
}
public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
{
var ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
return CreateServicesOverviewReportForRo(ro);
}
public override XtraReport CreateReportForServicesOverviewRo(ServicesOverviewRO ro, string reportId)
public override XtraReport CreateReportForServicesOverviewRo(ServicesOverviewRO ro, string reportId)
{
return CreateServicesOverviewReportForRo(ro);
return CreateServicesOverviewReportForRo(ro);
}
private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro)
private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro)
{
IBeWoReport<ServicesOverviewRO> report = null;

View File

@@ -116,9 +116,6 @@ namespace BeWoImFlow
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -302,9 +299,9 @@ namespace BeWoImFlow
this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")});
this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(6.103516E-05F, 0F);
this.picSignature.Name = "picSignature";
this.picSignature.SizeF = new System.Drawing.SizeF(160F, 35.00002F);
this.picSignature.SizeF = new System.Drawing.SizeF(160F, 31.99999F);
this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
this.picSignature.StylePriority.UseBorders = false;
this.picSignature.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.picSignature_BeforePrint);
@@ -550,10 +547,6 @@ namespace BeWoImFlow
this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell49.Weight = 0.44692737430167606D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -729,9 +722,6 @@ namespace BeWoImFlow
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblUnterschriftKlient,
this.xrPictureBox2,
this.xrLabel18,
this.xrLabel17,
this.xrPictureBox1,
this.xrLabel9,
@@ -853,7 +843,7 @@ namespace BeWoImFlow
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableAbwesenheiten.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 91.45832F);
this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 91.45831F);
this.xrTableAbwesenheiten.Name = "xrTableAbwesenheiten";
this.xrTableAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableAbwesenheiten.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -1096,7 +1086,7 @@ namespace BeWoImFlow
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblHatGruppen.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 91.45832F);
this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 91.45831F);
this.lblHatGruppen.Name = "lblHatGruppen";
this.lblHatGruppen.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.lblHatGruppen.SizeF = new System.Drawing.SizeF(30F, 30F);
@@ -1119,7 +1109,7 @@ namespace BeWoImFlow
// xrRichText1
//
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 91.45832F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 91.45831F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(264.9721F, 50F);
@@ -1128,7 +1118,7 @@ namespace BeWoImFlow
// xrLabel15
//
this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Underline);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 91.45832F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 91.45831F);
this.xrLabel15.Multiline = true;
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -1213,7 +1203,7 @@ namespace BeWoImFlow
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(329F, 0F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(86.00003F, 20F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(86.00002F, 20F);
this.xrLabel1.StylePriority.UseBackColor = false;
this.xrLabel1.StylePriority.UseBorders = false;
this.xrLabel1.StylePriority.UseFont = false;
@@ -1228,42 +1218,6 @@ namespace BeWoImFlow
this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.fieldKontaktArt.Name = "fieldKontaktArt";
//
// lblUnterschriftKlient
//
this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.lblUnterschriftKlient.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(94.99995F, 250F);
this.lblUnterschriftKlient.Name = "lblUnterschriftKlient";
this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(304.5972F, 20F);
this.lblUnterschriftKlient.StylePriority.UseBackColor = false;
this.lblUnterschriftKlient.StylePriority.UseBorders = false;
this.lblUnterschriftKlient.StylePriority.UseFont = false;
this.lblUnterschriftKlient.StylePriority.UsePadding = false;
this.lblUnterschriftKlient.StylePriority.UseTextAlignment = false;
this.lblUnterschriftKlient.Text = "Datum, Unterschrift Klient/in";
this.lblUnterschriftKlient.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrPictureBox2
//
this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")});
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(200.236F, 214.5F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel18
//
this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")});
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(94.99995F, 214.5F);
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel18.SizeF = new System.Drawing.SizeF(105.2361F, 35.50002F);
this.xrLabel18.StylePriority.UseTextAlignment = false;
this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// Quittierungsbeleg
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1284,7 +1238,7 @@ namespace BeWoImFlow
this.formattingRuleEmployeeName});
this.Margins = new DevExpress.Drawing.DXMargins(50F, 30F, 100F, 30F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PageWidth = 826;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
@@ -1384,8 +1338,5 @@ namespace BeWoImFlow
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRLabel lblUnterschriftKlient;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
private DevExpress.XtraReports.UI.XRLabel xrLabel18;
}
}

View File

@@ -28,7 +28,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
@@ -76,8 +75,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -88,7 +85,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.bindingSource1 = new System.Windows.Forms.BindingSource();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
@@ -214,10 +211,11 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
//
// xrLabel12
//
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 98.25007F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 98.25002F);
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(225F, 17F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(323.5063F, 16.99999F);
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.Text = "[CreatorName]";
//
@@ -268,8 +266,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
this.xrLabel17,
this.xrLabel16,
this.xrLabel15,
this.xrLabel14,
this.xrLabel9,
this.xrLabel7,
this.xrLabel1,
this.xrLabel_RecipientContactPerson,
@@ -283,7 +279,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
//
// xrLabel2
//
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(481.25F, 175.25F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(481.2494F, 168.3333F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(204.75F, 22.20834F);
@@ -294,7 +290,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
//
// xrLabel35
//
this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(481.25F, 151.2917F);
this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(481.2494F, 144.375F);
this.xrLabel35.Name = "xrLabel35";
this.xrLabel35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel35.SizeF = new System.Drawing.SizeF(204.75F, 22.20834F);
@@ -573,7 +569,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
//
this.xrLabel19.CanShrink = true;
this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Verdana", 8F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))));
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(421.0833F, 125.2501F);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(421.0828F, 118.3334F);
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel19.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -587,7 +583,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
//
this.xrLabel8.CanShrink = true;
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Verdana", 8F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))));
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(421.0833F, 108.2501F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(421.0828F, 101.3334F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -602,7 +598,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
this.xrLabel18.CanShrink = true;
this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(421.0833F, 84.99998F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(421.0828F, 78.08329F);
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel18.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -617,7 +613,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
this.xrLabel17.CanShrink = true;
this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(421.0833F, 68.00003F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(421.0828F, 61.08332F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -632,7 +628,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
this.xrLabel16.CanShrink = true;
this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(421.0833F, 51.00002F);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(421.0828F, 44.08333F);
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel16.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -647,7 +643,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
this.xrLabel15.CanShrink = true;
this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(421.0833F, 34.00002F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(421.0828F, 27.08333F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -657,36 +653,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
this.xrLabel15.Text = "Wilhelmstraße 50/52";
this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel14
//
this.xrLabel14.CanShrink = true;
this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(421.0833F, 17.00001F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel14.SizeF = new System.Drawing.SizeF(264.9167F, 17F);
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.StylePriority.UseTextAlignment = false;
this.xrLabel14.Text = "Verwaltung";
this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel9
//
this.xrLabel9.CanShrink = true;
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(421.0833F, 0F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel9.SizeF = new System.Drawing.SizeF(264.9167F, 17F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.Text = "Sylke Dohlen";
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel7
//
this.xrLabel7.CanShrink = true;
@@ -1087,8 +1053,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.XRLabel xrLabel15;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;

View File

@@ -18,6 +18,10 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt
public void SetReportDataSource(SettlementRO pRO)
{
if (pRO.CreatorName != null && pRO.CreatorName.Contains("Conrad"))
{
pRO.CreatorName += "\nAssistentin der Geschäftsführung";
}
var cb2sc = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(DAOFactory.GenericDAO.GetByID<CostBearer2SupportConcept>(pRO.CostBearer2SupportConceptOid));
DateTime bewilligungStart = cb2sc.ApprovedStartDate.HasValue ? cb2sc.ApprovedStartDate.Value : pRO.AccountingStartDate;

View File

@@ -29,7 +29,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
@@ -72,8 +71,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel31 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = 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.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
@@ -90,7 +87,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.bindingSource1 = new System.Windows.Forms.BindingSource();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -216,10 +213,11 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
//
// xrLabel12
//
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 102.4167F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0.000406901F, 102.4167F);
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(225F, 17F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(328.5045F, 17.00001F);
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.Text = "[CreatorName]";
//
@@ -266,8 +264,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.xrLabel30,
this.xrLabel31,
this.xrLabel20,
this.xrLabel9,
this.xrLabel14,
this.xrLabel15,
this.xrLabel16,
this.xrLabel17,
@@ -286,7 +282,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
//
// xrLabel2
//
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(509.7523F, 182.2502F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(509.7518F, 165.2502F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(181.2482F, 22.20834F);
@@ -400,7 +396,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
//
// xrLabel35
//
this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(509.7523F, 160.0419F);
this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(509.7518F, 143.0419F);
this.xrLabel35.Name = "xrLabel35";
this.xrLabel35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel35.SizeF = new System.Drawing.SizeF(181.2482F, 22.20834F);
@@ -584,42 +580,12 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.xrLabel20.StylePriority.UseFont = false;
this.xrLabel20.Text = "BAW Aachen Wilhelmstraße 50/52 52070 Aachen";
//
// xrLabel9
//
this.xrLabel9.CanShrink = true;
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(426.0833F, 0F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel9.SizeF = new System.Drawing.SizeF(264.9167F, 17F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.Text = "Sylke Dohlen";
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel14
//
this.xrLabel14.CanShrink = true;
this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(426.0839F, 17.00004F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel14.SizeF = new System.Drawing.SizeF(264.9167F, 17F);
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.StylePriority.UseTextAlignment = false;
this.xrLabel14.Text = "Verwaltung";
this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel15
//
this.xrLabel15.CanShrink = true;
this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(426.0839F, 34.00005F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(426.0834F, 17.00005F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -634,7 +600,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.xrLabel16.CanShrink = true;
this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(426.0839F, 51.00005F);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(426.0834F, 34.00006F);
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel16.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -649,7 +615,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.xrLabel17.CanShrink = true;
this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(426.0839F, 68.00006F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(426.0834F, 51.00006F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -664,7 +630,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
this.xrLabel18.CanShrink = true;
this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(426.0839F, 85.00001F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(426.0834F, 68.00001F);
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel18.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -678,7 +644,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
//
this.xrLabel7.CanShrink = true;
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Verdana", 8F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))));
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(426.0839F, 113.4584F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(426.0834F, 96.45841F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -692,7 +658,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
//
this.xrLabel19.CanShrink = true;
this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Verdana", 8F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))));
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(426.0839F, 130.4585F);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(426.0834F, 113.4585F);
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel19.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -1098,8 +1064,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.XRLabel xrLabel15;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;

View File

@@ -21,7 +21,11 @@ namespace BetreuungsserviceFuerAlltagUndWohnen
public void SetReportDataSource(Settlement2RO pRO)
{
var invoiceBase = MapperFactory.InvoiceBaseDC_InvoiceBase.MapToNewDC(DAOFactory.GenericDAO.GetByID<InvoiceBase>(pRO.InvoiceBaseOid.Value));
if (pRO.CreatorName != null && pRO.CreatorName.Contains("Conrad"))
{
pRO.CreatorName += "\nAssistentin der Geschäftsführung";
}
var invoiceBase = MapperFactory.InvoiceBaseDC_InvoiceBase.MapToNewDC(DAOFactory.GenericDAO.GetByID<InvoiceBase>(pRO.InvoiceBaseOid.Value));
var sc = invoiceBase.SupportConceptCostBearerRelDc;
DateTime bewilligungStart = sc.ApprovedStartDate.HasValue ? sc.ApprovedStartDate.Value : pRO.AccountingStartDate;

View File

@@ -270,6 +270,15 @@ namespace HshCologne.Invoicing
stundensatz = preisAK;
ii.UnitDescription = "Assistenzkraft";
}
else if (qOid.Any(q => q == 1461))
{
stundensatz = preisFK;
}
else if (qOid.Any(q => q == 1462))
{
stundensatz = preisAK2Jahre;
ii.UnitDescription = "Assistenzkraft mit 2 jähriger BE";
}
}
// Erfstadt hat in der Familienhilfe teileweise noch den Sonderfall UMA, dort wird geringer bezahlt, Stundensatz nach Quali bei Organisation, sonst normal
// Erftstadt hat keine SB

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,69 @@
using System;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using BS.Shared.Extensions;
using DevExpress.XtraReports.UI;
namespace LebenshilfeKusel
{
public partial class GkvBegleitzettel : XtraReport, IBeWoReport<GkvAbrechnungRO>
{
public GkvBegleitzettel()
{
this.InitializeComponent();
}
public void SetReportDataSource(GkvAbrechnungRO pRO)
{
xrPictureBox1.ImageSource = pRO.Logo;
if (pRO.KrankenkasseName.Equals("IKK SÜDWEST"))
{
pRO.ReceiverDatenannahmestelle = "IKK SÜDWEST";
pRO.ReceiverStreet = "Europaallee 34";
pRO.ReceiverPostCodeAndTown = "66113 Saarbrücken";
}
else if (pRO.KrankenkasseName.Equals("BKK Pfaff") || pRO.KrankenkasseName.Equals("HKK Krankenkasse"))
{
pRO.ReceiverDatenannahmestelle = "Abrechnungszentrum Emmendingen";
pRO.ReceiverStreet = "Bundesstraße 6";
pRO.ReceiverPostCodeAndTown = "79312 Emmendingen";
}
if (pRO.SenderWebsite.ToNullIfEmpty() is null)
xrTableRowSenderWebsite.Visible = false;
if (pRO.ReceiverContactPerson.ToNullIfEmpty() is null)
xrTableRowReceiverContactPerson.Visible = false;
/*
if (pRO.ReceiverDatenannahmestelle.ToNullIfEmpty() is null)
xrTableRowReceiverDatenannahmestelle.Visible = false;
*/
if (pRO.ReceiverDivision.ToNullIfEmpty() is null)
xrTableRowReceiverDivision.Visible = false;
/*
if (pRO.ReceiverStreet.ToNullIfEmpty() is null)
xrTableRowReceiverStreet.Visible = false;
if (pRO.ReceiverPostCodeAndTown.ToNullIfEmpty() is null)
xrTableRowReceiverPostCodeTown.Visible = false;
*/
if (pRO.SenderBankName.ToNullIfEmpty() is null ||
pRO.SenderBankIBAN.ToNullIfEmpty() is null ||
pRO.SenderBankName.ToNullIfEmpty() is null)
{
xrLineBankConnection.Visible = false;
xrRichTextBankConnection.Visible = false;
}
bindingSource1.DataSource = pRO;
}
}
}

View File

@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="xrRichTextBankConnection.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAE0AZQB0AGEATQBlAGQAaQB1AG0ALQBSAG8AbQBhAG4AOwB9AH0AewBcAGMAbwBsAG8AcgB0AGIAbAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAyADUANQAgADsAfQB7AFwAKgBcAGQAZQBmAGMAaABwACAAXABmADEAXABmAHMAMgA0AH0AewBcACoAXABkAGUAZgBwAGEAcAAgAFwAdwBpAGQAYwB0AGwAcABhAHIAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXABmADEAXABmAHMAMgA0AFwAdQBsAFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAaAB0AG0AYQB1AHQAcwBwAFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGMAXABzAGEAMwAwAFwAdABxAGMAXAB0AHgANAA1ADMANgBcAHQAcQByAFwAdAB4ADkANAA5ADgAewBcAGYAMgBcAGYAcwAxADYAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAIABbAFMAZQBuAGQAZQByAEIAYQBuAGsATgBhAG0AZQBdAH0AewBcAGYAMgBcAGYAcwAxADYAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAIAAgACAAIAAgAH0AewBcAGYAMgBcAGYAcwAxADYAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAIABJAEIAQQBOADoAIABbAFMAZQBuAGQAZQByAEIAYQBuAGsASQBCAEEATgBdAH0AewBcAGYAMgBcAGYAcwAxADYAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAIAAgACAAIAAgAH0AewBcAGYAMgBcAGYAcwAxADYAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAIABCAEkAQwA6ACAAWwBTAGUAbgBkAGUAcgBCAGEAbgBrAEIASQBDAF0AfQBcAGYAMgBcAGYAcwAxADYAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABmADEAXABmAHMAMgA0AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGMAZgAxAFwAcABhAHIAfQA=</value>
</data>
</root>

View File

@@ -56,6 +56,12 @@
</ItemGroup>
<ItemGroup>
<Compile Include="CustomReportCreator.cs" />
<Compile Include="GkvBegleitzettel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="GkvBegleitzettel.Designer.cs">
<DependentUpon>GkvBegleitzettel.cs</DependentUpon>
</Compile>
<Compile Include="NichtaerztlicheDialysesachleistungRechnung.cs">
<SubType>Component</SubType>
</Compile>
@@ -110,6 +116,10 @@
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="GkvBegleitzettel.resx">
<DependentUpon>GkvBegleitzettel.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="NichtaerztlicheDialysesachleistungRechnung.resx">
<DependentUpon>NichtaerztlicheDialysesachleistungRechnung.cs</DependentUpon>
<SubType>Designer</SubType>

View File

@@ -401,25 +401,26 @@ namespace Mittelpunkt
}
return new XtraReport();
}
//public override XtraReport CreateAuslastungReport(long? employeeOid, IList<long> teamOids, DateTime startDate, DateTime endDate)
//{
// IBeWoReport<MitarbeiterauslastungRO> report;
// if (teamOids != null && teamOids.Count > 0)
// report = FindReportImp<MitarbeiterauslastungRO>("Teamauslastung");
// else
// report = FindReportImp<MitarbeiterauslastungRO>("Mitarbeiterauslastung");
// IList<long> employeeOids = new List<long>();
public override XtraReport CreateAuslastungReport(long? employeeOid, IList<long> teamOids, DateTime startDate, DateTime endDate)
{
IBeWoReport<MitarbeiterauslastungRO> report;
if (teamOids != null && teamOids.Count > 0)
report = FindReportImp<MitarbeiterauslastungRO>("Teamauslastung");
else
report = FindReportImp<MitarbeiterauslastungRO>("Mitarbeiterauslastung");
// if (employeeOid.HasValue)
// {
// employeeOids.Add(employeeOid.Value);
// }
IList<long> employeeOids = new List<long>();
// var x = MitarbeiterauslastungRO.Create(employeeOids, teamOids, startDate, endDate, false);
// report.SetReportDataSource(x);
if (employeeOid.HasValue)
{
employeeOids.Add(employeeOid.Value);
}
// return report as XtraReport;
//}
var x = MitarbeiterauslastungRO.Create(employeeOids, teamOids, startDate, endDate, false);
report.SetReportDataSource(x);
return report as XtraReport;
}
}
}

View File

@@ -111,6 +111,12 @@
<DependentUpon>Lohnliste.cs</DependentUpon>
</Compile>
<Compile Include="Service\CustomEmployeeService.cs" />
<Compile Include="Teamauslastung.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Teamauslastung.designer.cs">
<DependentUpon>Teamauslastung.cs</DependentUpon>
</Compile>
<Compile Include="ZuschlaegeArbeit.cs">
<SubType>Component</SubType>
</Compile>
@@ -229,6 +235,9 @@
<EmbeddedResource Include="Lohnliste.resx">
<DependentUpon>Lohnliste.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Teamauslastung.resx">
<DependentUpon>Teamauslastung.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ZuschlaegeArbeit.resx">
<DependentUpon>ZuschlaegeArbeit.cs</DependentUpon>
<SubType>Designer</SubType>

View File

@@ -43,7 +43,7 @@ namespace SBBMainzReports.Invoicing
i.ServiceDescription.Category.ServiceCategoryOid;
return valid;
}).ToList();
if (cb2sc.CustomerReferenceNumber.Trim().EndsWith("b") || cb2sc.AuswahlBezeichnung.Trim().ToLower().Contains("bienen"))
if (cb2sc.CustomerReferenceNumber != null && cb2sc.CustomerReferenceNumber.Trim().ToLower().EndsWith("b") || (cb2sc.AuswahlBezeichnung != null && cb2sc.AuswahlBezeichnung.Trim().ToLower().Contains("bienen")))
{
bienen_ = true;
}
@@ -113,11 +113,11 @@ namespace SBBMainzReports.Invoicing
{
var calc = PluginLoader.FindClass<Calculations>(_SpecificID) ?? Calculations.GetInstance(_SpecificID);
var scap = supportConceptApprovalPeriod;
var scapCrps = scap.ServiceCategory?.CostRatePeriods;
if (scapCrps != null && scapCrps.Count > 0)
var crList = scap.ServiceCategory.CostRatePeriods;
var cr = crList.GetCostRatePeriodForDate(BS.Shared.CostRatePeriodType.AmountOfMoney, serviceInvoicePeriod.Start.Value);
if (cr != null && cr.CostRateValue.HasValue)
{
var hourlyRate = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs((IEnumerable<CostRatePeriod>)scapCrps).GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, serviceInvoicePeriod.Start.Value).CostRateValue;
decimal? hourlyRate = cr.CostRateValue.Value;
decimal weeklyFactor = 4.33m;
if (scap.StartDate.HasValue && scap.StartDate.Value.Day > 7)
{
@@ -154,6 +154,7 @@ namespace SBBMainzReports.Invoicing
ItemPeriodEnd = serviceInvoicePeriod.End,
AmountPerUnit = hourlyRate.Value,
ItemDescription = "Fachleistungseinheiten/Woche",
UnitDescription = "QA/Woche",
UnitCount = approvedHours
});
}
@@ -181,7 +182,7 @@ namespace SBBMainzReports.Invoicing
wegepauschale = base.GetPreis("Wegepauschale", invoicePeriod.StartDate);
int countWege = 0;
//Anzahl der Zeiterfassungseinträge, die nicht im Büro stattfinden
countWege = serviceRecordsInPeriod.Where(r => r.ServiceDescription.CategoryName.Contains("QA") && r.ServiceDescription.Name != "Büro").Count();
countWege = serviceRecordsInPeriod.Where(r => r.ServiceDescription.CategoryName.Contains("QA") && !r.ServiceDescription.Name.Contains("Büro")).Count();
if (countWege > 0)
{
@@ -194,7 +195,7 @@ namespace SBBMainzReports.Invoicing
invoiceItem.ItemPeriodEnd = invoicePeriod.EndDate;
invoiceItem.RateFactor = null;
invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
invoiceItem.ItemDescription = "Wegepauschale/Wocche";
invoiceItem.ItemDescription = "Wegepauschale/Monat";
if (scap != null)
{
invoiceItem.SupportConceptApprovalPeriodOid = scap.Oid;

View File

@@ -1,10 +1,12 @@
using System;
using System.Linq;
using System.Text;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Extensions;
using DevExpress.XtraReports.UI;
using System;
using System.Linq;
using System.Text;
namespace SBBMainzReports
{
@@ -17,6 +19,7 @@ namespace SBBMainzReports
public void SetReportDataSource(ServiceInvoiceRO pRO)
{
bool qa = false;
if (pRO.InvoiceBase.InvoiceTypeText != null && pRO.InvoiceBase.InvoiceTypeText.Contains("Storno"))
lblTitel.Text = "Stornorechnung";
@@ -60,9 +63,19 @@ namespace SBBMainzReports
{
lblUeberschrift.Text = "Hilfe zur Erziehung gemäß § 27 ff SGB VIII i.V. m. § 30 SGB VIII - \nErziehungsbeistandschaft";
}
if (sip.ServiceInvoiceItems.Any(i => i.ServiceDescription != null && i.ServiceDescription.Contains("QA")))
if (sip.ServiceInvoiceItems.Any(i => i.UnitDescription != null && i.UnitDescription.Contains("QA") || i.ServiceDescription != null && i.ServiceDescription.Contains("Fachleistungseinheit")))
{
lblUeberschrift.Text = "Qualifizierte Assistenz im Rahmen der Eingliederungshilfe \ngem. § 99 i.V.m. §§ 113-116 SGB IX";
lblUeberschrift.Text = "";
if (pRO.InvoiceBase != null && pRO.InvoiceBase.SupportConceptCostBearerRelDc != null)
{
var cb2sc = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(pRO.InvoiceBase.SupportConceptCostBearerRelDc.CostBearer2SupportConceptOid.Value);
if (pRO.CustomerReferenceNumber != null && pRO.CustomerReferenceNumber.Trim().ToLower().EndsWith("b") || (cb2sc.AuswahlBezeichnung != null && cb2sc.AuswahlBezeichnung.Trim().ToLower().Contains("bienen")))
{
lblUeberschrift.Text = "Bienenprojekt\n";
}
}
lblUeberschrift.Text += "Qualifizierte Assistenz im Rahmen der Eingliederungshilfe \ngem. § 99 i.V.m. §§ 113-116 SGB IX";
qa = true;
}
if (sip.ServiceInvoiceItems.Any(i => i.ServiceDescription != null && i.ServiceDescription.Contains("Tagesstätte")))
{
@@ -70,7 +83,7 @@ namespace SBBMainzReports
}
foreach (var ii in sip.ServiceInvoiceItems)
{
if (!ii.ServiceDescription.ToLower().Contains("handgeld") && !ii.ServiceDescription.ToLower().Contains("hangeld"))
if (!ii.ServiceDescription.ToLower().Contains("handgeld") && !ii.ServiceDescription.ToLower().Contains("hangeld") && !qa)
{
ii.ServiceDescription = "Fachleistungstunden / Monat";
ii.HourlyRateString = String.Format("zu {0:0.00} €", ii.HourlyRate);

File diff suppressed because it is too large Load Diff

View File

@@ -1,8 +1,9 @@
using System;
using System.Text;
using BeWo.Report.ReportObjects;
using BS.Shared.Extensions;
using DevExpress.XtraReports.UI;
using System;
using System.Text;
using System.Text.RegularExpressions;
namespace BeWo.Report.DefaultReports
{
@@ -33,12 +34,29 @@ namespace BeWo.Report.DefaultReports
SetzeAdresse(pRO);
String name = Regex.Replace(String.Format("{0}, {1}", pRO.CustomerLastName, pRO.CustomerFirstName), @"\s*\(.*?\)", "");
pRO.CustomerName = name;
foreach (var sip in pRO.ServiceInvoicePeriods)
{
foreach (var item in sip.ServiceInvoiceItems)
{
if (sip.ServiceInvoiceItems.Count == 1)
{
item.ServiceDescription = String.Format("{0} (geb. {1:dd.MM.yyyy})", name, pRO.CustomerBirthdate);
}
}
}
this.bindingSource1.DataSource = pRO;
}
private void SetzeAdresse(ServiceInvoiceRO pRO)
{
StringBuilder sb = new StringBuilder();
if (!String.IsNullOrEmpty(pRO.RecipientDivision) && !String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation.ToLower().Trim() != "selbstzahler")
{
sb.AppendLine(pRO.RecipientDivision);
}
if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation.ToLower().Trim() != "selbstzahler")
{
sb.AppendLine(pRO.RecipientOrganisation);
@@ -51,10 +69,7 @@ namespace BeWo.Report.DefaultReports
{
sb.AppendLine(pRO.RecipientContactPerson);
}
if (!String.IsNullOrEmpty(pRO.RecipientDivision) && !String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation.ToLower().Trim() != "selbstzahler")
{
sb.AppendLine(pRO.RecipientDivision);
}
if (!String.IsNullOrEmpty(pRO.RecipientPoBox))
{
sb.AppendLine(pRO.RecipientPoBox);

View File

@@ -117,4 +117,20 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="xrLabel9.Text" xml:space="preserve">
<value>Steuerfreie Leistung gem. § 4 Nr. 16 UStG
Bitte überweisen Sie den Rechnungsbetrag auf das untenstehende Konto innerhalb der nächsten 14 Tage.
Sergej Becker
Sparkasse KölnBonn
DE65370501981902811676
COLSDE33XXX
Mit freundlichen Grüßen
i.A. Borgart</value>
</data>
</root>

View File

@@ -125,11 +125,6 @@
<Compile Include="OverlappingServiceRecords.designer.cs">
<DependentUpon>OverlappingServiceRecords.cs</DependentUpon>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Quittierungsbeleg.cs">
<SubType>Component</SubType>
</Compile>
@@ -205,10 +200,6 @@
<EmbeddedResource Include="OverlappingServiceRecords.resx">
<DependentUpon>OverlappingServiceRecords.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Quittierungsbeleg.resx">
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
<SubType>Designer</SubType>

View File

@@ -32,27 +32,13 @@ namespace TeamPfeil.Validation
});
}
SupportConceptPeriodStatisticsDC periodStat = GetStatisticsForServiceRecord(statistics, newServiceRecord);
if (periodStat == null && newServiceRecord.ServiceDescription.CategoryName.Contains("Qualifikationsniveau"))
if (statistics != null)
{
if (!statistics.PeriodStatistics.Any(s => s.SupportConceptApprovalPeriod.ServiceCategory.Name == newServiceRecord.ServiceDescription.CategoryName))
{
String handlungsOption = "Möchten Sie trotzdem Speichern?";
bool hatDasRechtTrotzdemZuSpeichern = true;
list.Add(new ServiceRecordValidationResultDC
SupportConceptPeriodStatisticsDC periodStat = GetStatisticsForServiceRecord(statistics, newServiceRecord);
if (periodStat == null && newServiceRecord.ServiceDescription.CategoryName.Contains("Qualifikationsniveau"))
{
if (!statistics.PeriodStatistics.Any(s => s.SupportConceptApprovalPeriod.ServiceCategory.Name == newServiceRecord.ServiceDescription.CategoryName))
{
ResultType = ServiceRecordValidationResult.Custom,
Message = "Achtung für Ihr Qualifikationsniveau gibt in diesem Hilfeplan keine passende Bewilligung." +
" \nBitte anderes Qualifikationsniveau als Leistungskategorie wählen.\n" + handlungsOption,
Allow = hatDasRechtTrotzdemZuSpeichern
});
}
else
{
var aplist = statistics.PeriodStatistics.Where(s => s.SupportConceptApprovalPeriod.ServiceCategory.Name == newServiceRecord.ServiceDescription.CategoryName).ToList();
if (aplist == null && !aplist.Any(a => a.SupportConceptApprovalPeriod.StartDate <= newServiceRecord.Start && a.SupportConceptApprovalPeriod.EndDate >= newServiceRecord.Start))
{
String handlungsOption = "Möchten Sie trotzdem Speichern?";
bool hatDasRechtTrotzdemZuSpeichern = true;
@@ -64,6 +50,23 @@ namespace TeamPfeil.Validation
Allow = hatDasRechtTrotzdemZuSpeichern
});
}
else
{
var aplist = statistics.PeriodStatistics.Where(s => s.SupportConceptApprovalPeriod.ServiceCategory.Name == newServiceRecord.ServiceDescription.CategoryName).ToList();
if (aplist == null && !aplist.Any(a => a.SupportConceptApprovalPeriod.StartDate <= newServiceRecord.Start && a.SupportConceptApprovalPeriod.EndDate >= newServiceRecord.Start))
{
String handlungsOption = "Möchten Sie trotzdem Speichern?";
bool hatDasRechtTrotzdemZuSpeichern = true;
list.Add(new ServiceRecordValidationResultDC
{
ResultType = ServiceRecordValidationResult.Custom,
Message = "Achtung für Ihr Qualifikationsniveau gibt in diesem Hilfeplan keine passende Bewilligung." +
" \nBitte anderes Qualifikationsniveau als Leistungskategorie wählen.\n" + handlungsOption,
Allow = hatDasRechtTrotzdemZuSpeichern
});
}
}
}
}
return list;

View File

@@ -83,7 +83,7 @@ namespace BeWo.Service.Plugins
//t = "7282396774"; // Caritas Unna
//t = "6884855402"; // IBP
//t = "4867997795"; // ADiK Kleve
t = "3184859776"; // Sergej Becker
//t = "3184859776"; // Sergej Becker
//t = "7752610643"; // BWK Gbr
//t = "3785623125"; // Betreuwo
//t = "7130228334"; // LH Borken
@@ -270,7 +270,7 @@ namespace BeWo.Service.Plugins
//t = "2998118179"; // BeWo Plus
//t = "9254115251"; // Praunheimer Werkstätten 2.DB
//t = "5880845152"; // Bewegt Systemische Beratung und Begleitung (Kathrin Lilly)
//t = "5798370140"; // Team Pfeil
t = "5798370140"; // Team Pfeil
//t = "8242644560"; // Bewolonia - Fr. Sultan Schulz
//t = "4817284046"; // Verein für Sozialmedizin Stade e.V.
//t = "6323001211"; // ASB Faßbacher Hof gGmbH
@@ -433,6 +433,7 @@ namespace BeWo.Service.Plugins
//t = "9885937567"; // Antje Boland - BeWo Boland
//t = "3829321035"; // Diakoniewerk Essen
//t = "3583014513"; // Bezirksverein für soziale Rechtspflege Villingen-Schwenningen Körperschaft des öffentlichen Rechts Sebastian Kopp
//t = "1561235939"; // Arya Steffens - Hevia Therapie
return t;
#else

View File

@@ -474,7 +474,7 @@ namespace BeWo.Service.ServiceImplementations
else
{
supportPIN = y[0];
if ((supportPIN.ExpirationDate < DateTime.Now) || (supportPIN.UsingDate.HasValue && supportPIN.UsingDate.Value.AddDays(1) < DateTime.Now))
if ((supportPIN.ExpirationDate < DateTime.Now) || (supportPIN.UsingDate.HasValue && supportPIN.UsingDate.Value.AddDays(2) < DateTime.Now))
{
//if (supportPIN.IsUsed.HasValue && supportPIN.IsUsed.Value)
// result = UserValidationResult.PinAlreadyUsed;