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

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

Browse Source
This commit is contained in:
Alexandra
2025-04-16 17:34:46 +02:00
parent 95739f9c9a 1620ad2099
commit 698587f3f0
13 changed files with 136 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ReportImp/TagwerkReports/SammelrechnungJA.Designer.cs generated
View File

@@ -50,7 +50,7 @@ namespace TagwerkReports
this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel();
this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -135,7 +135,7 @@ namespace TagwerkReports
this.xrLabel3,
this.xrTable5,
this.lblAdresse,
this.xrLabel5,
this.lblAnrede,
this.lblAbrechnungszeitraum});
this.Page1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.Page1.HeightF = 443.2499F;
@@ -344,15 +344,15 @@ namespace TagwerkReports
this.lblAdresse.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" +
"tStreet]\r\n[RecipientPostCodeAndTown]";
//
// xrLabel5
// lblAnrede
//
this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 339.1666F);
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);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "Sehr geehrte Damen und Herren,";
this.lblAnrede.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 339.1666F);
this.lblAnrede.Name = "lblAnrede";
this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F);
this.lblAnrede.StylePriority.UseFont = false;
this.lblAnrede.Text = "Sehr geehrte Damen und Herren,";
//
// lblAbrechnungszeitraum
//
@@ -709,7 +709,7 @@ namespace TagwerkReports
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.GroupHeaderBand Page1;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel lblAnrede;
private DevExpress.XtraReports.UI.XRLabel lblAbrechnungszeitraum;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.DetailBand Detail1;

8
ReportImp/TagwerkReports/SammelrechnungJA.cs
View File

@@ -2,7 +2,7 @@ using System;
using System.Text;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Extensions;
using DevExpress.XtraReports.UI;
namespace TagwerkReports
@@ -29,6 +29,12 @@ namespace TagwerkReports
SetzeAdresse(pRO);
if (pRO.CustomerSalutation.IsNullOrEmpty())
{
lblAnrede.Text = "Guten Tag " + pRO.CustomerFirstName + " " + pRO.CustomerLastName + ",";
}
this.bindingSource1.DataSource = pRO;
}

62
ReportImp/TagwerkReports/ServiceInvoiceReport.Designer.cs generated
View File

@@ -47,7 +47,7 @@ namespace BeWo.TagwerkReports
this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
@@ -66,6 +66,7 @@ namespace BeWo.TagwerkReports
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.lblRestlicheStunden = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -74,7 +75,6 @@ namespace BeWo.TagwerkReports
this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.lblRestlicheStunden = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -93,7 +93,7 @@ namespace BeWo.TagwerkReports
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel11});
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 130F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
@@ -131,10 +131,10 @@ namespace BeWo.TagwerkReports
this.lblAdresse,
this.xrLabel3,
this.xrLabel2,
this.xrLabel5,
this.lblAnrede,
this.xrLabel8,
this.lblAbrechnungszeitraum});
this.Page1.Font = new System.Drawing.Font("Arial", 10F);
this.Page1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.Page1.HeightF = 435.3383F;
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
@@ -257,7 +257,7 @@ namespace BeWo.TagwerkReports
//
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 262F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
@@ -273,7 +273,7 @@ namespace BeWo.TagwerkReports
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 245F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -283,14 +283,14 @@ namespace BeWo.TagwerkReports
this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]";
this.xrLabel2.WordWrap = false;
//
// xrLabel5
// lblAnrede
//
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 330.3383F);
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);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "Sehr geehrte Damen und Herren,";
this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 330.3383F);
this.lblAnrede.Name = "lblAnrede";
this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F);
this.lblAnrede.StylePriority.UseFont = false;
this.lblAnrede.Text = "Sehr geehrte Damen und Herren,";
//
// xrLabel8
//
@@ -337,7 +337,7 @@ namespace BeWo.TagwerkReports
// lblNotice
//
this.lblNotice.CanShrink = true;
this.lblNotice.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Italic);
this.lblNotice.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Italic);
this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 83.34724F);
this.lblNotice.Name = "lblNotice";
this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -375,7 +375,7 @@ namespace BeWo.TagwerkReports
//
this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.Detail3.Font = new System.Drawing.Font("Arial", 10F);
this.Detail3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.Detail3.HeightF = 25F;
this.Detail3.Name = "Detail3";
this.Detail3.StylePriority.UseFont = false;
@@ -501,11 +501,20 @@ namespace BeWo.TagwerkReports
this.xrTable4,
this.xrLabel14,
this.xrLabel15});
this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F);
this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.GroupFooter1.HeightF = 247.1927F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// lblRestlicheStunden
//
this.lblRestlicheStunden.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F);
this.lblRestlicheStunden.Multiline = true;
this.lblRestlicheStunden.Name = "lblRestlicheStunden";
this.lblRestlicheStunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblRestlicheStunden.SizeF = new System.Drawing.SizeF(559.9592F, 17.79166F);
this.lblRestlicheStunden.StylePriority.UseFont = false;
//
// xrTable2
//
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(571.4175F, 0F);
@@ -529,7 +538,7 @@ namespace BeWo.TagwerkReports
this.xrTableCell23.BorderWidth = 2F;
this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")});
this.xrTableCell23.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell23.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell23.StylePriority.UseBorders = false;
@@ -582,15 +591,6 @@ namespace BeWo.TagwerkReports
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// lblRestlicheStunden
//
this.lblRestlicheStunden.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F);
this.lblRestlicheStunden.Multiline = true;
this.lblRestlicheStunden.Name = "lblRestlicheStunden";
this.lblRestlicheStunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblRestlicheStunden.SizeF = new System.Drawing.SizeF(559.9592F, 17.79166F);
this.lblRestlicheStunden.StylePriority.UseFont = false;
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -603,14 +603,14 @@ namespace BeWo.TagwerkReports
this.DataSource = this.bindingSource1;
this.DisplayName = "Rechnung";
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.Font = new System.Drawing.Font("Verdana", 10F);
this.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(97, 50, 115, 50);
this.Margins = new DevExpress.Drawing.DXMargins(97F, 50F, 115F, 50F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
@@ -630,7 +630,7 @@ namespace BeWo.TagwerkReports
private DevExpress.XtraReports.UI.GroupHeaderBand Page1;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel lblAnrede;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel lblAbrechnungszeitraum;
private DevExpress.XtraReports.UI.XRLabel xrLabel15;

7
ReportImp/TagwerkReports/ServiceInvoiceReport.cs
View File

@@ -4,6 +4,7 @@ using BeWo.Report;
using BeWo.Report.ReportObjects;
using BeWo.Service.Plugins;
using BS.Shared.Core;
using BS.Shared.Extensions;
using DevExpress.XtraReports.UI;
namespace BeWo.TagwerkReports
@@ -93,6 +94,12 @@ namespace BeWo.TagwerkReports
if (String.IsNullOrEmpty(pRO.Notice))
lblNotice.Visible = false;
if (pRO.CustomerSalutation.IsNullOrEmpty())
{
lblAnrede.Text = "Guten Tag " + pRO.CustomerFirstName + " " + pRO.CustomerLastName + ",";
}
this.bindingSource1.DataSource = pRO;
}

3
ReportImp/TagwerkReports/ServiceInvoiceReport.resx
View File

@@ -117,7 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

61
ReportImp/TagwerkReports/SettlementReport.Designer.cs generated
View File

@@ -31,6 +31,7 @@ namespace BeWo.TagwerkReports
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
@@ -39,7 +40,6 @@ namespace BeWo.TagwerkReports
this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.rowErbrachteLeistung = new DevExpress.XtraReports.UI.XRTableRow();
@@ -71,8 +71,9 @@ namespace BeWo.TagwerkReports
this.xrTableRow17 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
@@ -115,7 +116,7 @@ namespace BeWo.TagwerkReports
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel9});
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 130F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
@@ -190,7 +191,7 @@ namespace BeWo.TagwerkReports
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("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 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;
@@ -201,12 +202,6 @@ namespace BeWo.TagwerkReports
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell6.Weight = 0.21685899000901443D;
//
// ruleRateFactorNull
//
this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.ruleRateFactorNull.Name = "ruleRateFactorNull";
//
// xrTableRow11
//
this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
@@ -545,7 +540,7 @@ namespace BeWo.TagwerkReports
this.xrTableCell17.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell17.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell17.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell17.StylePriority.UseBorderColor = false;
@@ -556,6 +551,12 @@ namespace BeWo.TagwerkReports
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell17.Weight = 0.21685899000901443D;
//
// ruleRateFactorNull
//
this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.ruleRateFactorNull.Name = "ruleRateFactorNull";
//
// xrLabel6
//
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 300.3333F);
@@ -566,20 +567,20 @@ namespace BeWo.TagwerkReports
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.Text = resources.GetString("xrLabel6.Text");
//
// xrLabel5
// lblAnrede
//
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 267.3333F);
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);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "Sehr geehrte Damen und Herren,";
this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 267.3333F);
this.lblAnrede.Name = "lblAnrede";
this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F);
this.lblAnrede.StylePriority.UseFont = false;
this.lblAnrede.Text = "Sehr geehrte Damen und Herren,";
//
// xrLabel4
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 225F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
@@ -594,7 +595,7 @@ namespace BeWo.TagwerkReports
//
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 209F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -608,7 +609,7 @@ namespace BeWo.TagwerkReports
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -671,7 +672,7 @@ namespace BeWo.TagwerkReports
this.xrLabel12,
this.xrLabel11,
this.lblNotice});
this.ReportFooter.Font = new System.Drawing.Font("Arial", 10F);
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.ReportFooter.HeightF = 195.1249F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
@@ -791,7 +792,7 @@ namespace BeWo.TagwerkReports
//
// lblNotice
//
this.lblNotice.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Italic);
this.lblNotice.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Italic);
this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40.29166F);
this.lblNotice.Name = "lblNotice";
this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -819,11 +820,11 @@ namespace BeWo.TagwerkReports
this.xrLabel2,
this.xrLabel3,
this.xrLabel4,
this.xrLabel5,
this.lblAnrede,
this.xrLabel6,
this.xrTable1,
this.xrLabel8});
this.GroupHeader1.Font = new System.Drawing.Font("Arial", 10F);
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.GroupHeader1.HeightF = 609.3333F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
@@ -841,15 +842,19 @@ namespace BeWo.TagwerkReports
this.topMarginBand1,
this.bottomMarginBand1,
this.GroupHeader1});
this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] {
this.bindingSource1});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(97, 50, 115, 50);
this.Margins = new DevExpress.Drawing.DXMargins(97F, 50F, 115F, 50F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -863,7 +868,7 @@ namespace BeWo.TagwerkReports
private System.Windows.Forms.BindingSource bindingSource1;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel lblAnrede;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;

6
ReportImp/TagwerkReports/SettlementReport.cs
View File

@@ -5,6 +5,7 @@ using System.ComponentModel;
using DevExpress.XtraReports.UI;
using BeWo.Report.ReportObjects;
using BeWo.Report;
using BS.Shared.Extensions;
namespace BeWo.TagwerkReports
{
@@ -83,6 +84,11 @@ namespace BeWo.TagwerkReports
pRO.AbsenceTimes = "Keine Krankenhausaufenthalte bekannt oder abrechnungsrelevant im Abrechnungszeitraum";
}
if (pRO.Salutation1.IsNullOrEmpty() && pRO.Salutation2.IsNullOrEmpty())
{
lblAnrede.Text = "Guten Tag " + pRO.CustomerFirstName + " " + pRO.CustomerLastName + ",";
}
this.bindingSource1.DataSource = pRO;
}
}

3
ReportImp/TagwerkReports/SettlementReport.resx
View File

@@ -122,7 +122,4 @@
sich für den Betreuungszeitraum [AccountingPeriod] hieraus:
</value>
</data>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

6
ReportImp/TagwerkReports/SettlementReport2.cs
View File

@@ -5,6 +5,7 @@ using System.ComponentModel;
using DevExpress.XtraReports.UI;
using BeWo.Report.ReportObjects;
using BeWo.Report;
using BS.Shared.Extensions;
namespace BeWo.TagwerkReports.Neu
{
@@ -48,6 +49,11 @@ namespace BeWo.TagwerkReports.Neu
pRO.AbsenceTimes = "Keine Krankenhausaufenthalte bekannt oder abrechnungsrelevant im Abrechnungszeitraum";
}
if (pRO.Salutation1.IsNullOrEmpty() && pRO.Salutation2.IsNullOrEmpty())
{
lblAnrede.Text = "Guten Tag " + pRO.CustomerFirstName + " " + pRO.CustomerLastName + ",";
}
this.bindingSource1.DataSource = pRO;
}
}

65
ReportImp/TagwerkReports/SettlementReport2.designer.cs generated
View File

@@ -31,13 +31,14 @@ namespace BeWo.TagwerkReports.Neu
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
@@ -63,7 +64,6 @@ namespace BeWo.TagwerkReports.Neu
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
@@ -99,11 +99,12 @@ namespace BeWo.TagwerkReports.Neu
this.xrTableRow46 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell72 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell73 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -117,7 +118,7 @@ namespace BeWo.TagwerkReports.Neu
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel9});
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 130F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
@@ -159,20 +160,20 @@ namespace BeWo.TagwerkReports.Neu
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.Text = resources.GetString("xrLabel6.Text");
//
// xrLabel5
// lblAnrede
//
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 267.3333F);
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);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "Sehr geehrte Damen und Herren,";
this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 267.3333F);
this.lblAnrede.Name = "lblAnrede";
this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F);
this.lblAnrede.StylePriority.UseFont = false;
this.lblAnrede.Text = "Sehr geehrte Damen und Herren,";
//
// xrLabel4
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 225F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
@@ -187,7 +188,7 @@ namespace BeWo.TagwerkReports.Neu
//
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 209F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -202,7 +203,7 @@ namespace BeWo.TagwerkReports.Neu
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -265,7 +266,7 @@ namespace BeWo.TagwerkReports.Neu
this.xrLabel12,
this.xrLabel11,
this.lblNotice});
this.ReportFooter.Font = new System.Drawing.Font("Arial", 10F);
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.ReportFooter.HeightF = 195.1249F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
@@ -385,7 +386,7 @@ namespace BeWo.TagwerkReports.Neu
//
// lblNotice
//
this.lblNotice.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Italic);
this.lblNotice.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Italic);
this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40.29166F);
this.lblNotice.Name = "lblNotice";
this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -413,18 +414,14 @@ namespace BeWo.TagwerkReports.Neu
this.xrLabel2,
this.xrLabel3,
this.xrLabel4,
this.xrLabel5,
this.lblAnrede,
this.xrLabel6,
this.xrLabel8});
this.GroupHeader1.Font = new System.Drawing.Font("Arial", 10F);
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.GroupHeader1.HeightF = 375F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -440,7 +437,7 @@ namespace BeWo.TagwerkReports.Neu
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.Detail1.Font = new System.Drawing.Font("Arial", 10F);
this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.Detail1.HeightF = 17F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
@@ -500,7 +497,7 @@ namespace BeWo.TagwerkReports.Neu
//
this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable2});
this.GroupHeader2.Font = new System.Drawing.Font("Arial", 10F);
this.GroupHeader2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.GroupHeader2.HeightF = 51F;
this.GroupHeader2.Name = "GroupHeader2";
this.GroupHeader2.StylePriority.UseFont = false;
@@ -543,7 +540,7 @@ namespace BeWo.TagwerkReports.Neu
this.xrTableCell2.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell2.StylePriority.UseBorderColor = false;
@@ -596,7 +593,7 @@ namespace BeWo.TagwerkReports.Neu
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable4});
this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F);
this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.GroupFooter1.HeightF = 132F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
@@ -797,7 +794,7 @@ namespace BeWo.TagwerkReports.Neu
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell73.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")});
this.xrTableCell73.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell73.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell73.Name = "xrTableCell73";
this.xrTableCell73.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell73.StylePriority.UseBorderColor = false;
@@ -807,6 +804,10 @@ namespace BeWo.TagwerkReports.Neu
this.xrTableCell73.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell73.Weight = 0.21685899000901443D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -821,16 +822,18 @@ namespace BeWo.TagwerkReports.Neu
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(97, 50, 115, 50);
this.Margins = new DevExpress.Drawing.DXMargins(97F, 50F, 115F, 50F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -841,7 +844,7 @@ namespace BeWo.TagwerkReports.Neu
private System.Windows.Forms.BindingSource bindingSource1;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel lblAnrede;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;

3
ReportImp/TagwerkReports/SettlementReport2.resx
View File

@@ -122,7 +122,4 @@
sich für den Betreuungszeitraum [AccountingPeriod] hieraus:
</value>
</data>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

53
Service/ServiceContracts/IAccountingService.cs
View File

@@ -3,11 +3,8 @@ using System.Collections.Generic;
using System.ServiceModel;
using BS.Shared;
using BS.Shared.Attributes;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.GkvAbrechnung;
using BS.Shared.DataContracts.Reports;
namespace BeWo.Service.ServiceContracts
{
@@ -141,53 +138,5 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void StorniereInvoiceBases(List<InvoiceBaseDC> invoices);
// -------------------------------------------------------------------------------------------------------------------------------------
// -------------------------------------------------------------------------------------------------------------------------------------
// -------------------------------------------------------------------------------------------------------------------------------------
[FaultContract(typeof(BeWoFault))]
[OperationContract]
[RequirePermission(UserRightType.Finance_Gkv_View)]
GkvAbrechnungDC GetGkvAbrechnung(long oid);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
[RequirePermission(UserRightType.Finance_Gkv_View)]
List<GkvAbrechnungDC> GetAllGkvAbrechnungen();
[FaultContract(typeof(BeWoFault))]
[OperationContract]
[RequirePermission(UserRightType.Finance_Gkv_View)]
List<GkvAbrechnungDC> GetFilteredGkvAbrechnungen(GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
[RequirePermission(UserRightType.Finance_Gkv_View)]
string GetProtokollRawDataString(long oid, GkvRawDataType gkvRawData);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
[RequirePermission(UserRightType.Finance_Gkv_Create)]
GkvAbrechnungCreateResponseDC CreateNewGkvAbrechnung(GkvAbrechnungCreateRequestDC request);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
[RequirePermission(UserRightType.Finance_Gkv_Create)]
GkvAbrechnungDC UpdateGkvAbrechnung(GkvAbrechnungDC abrechnung);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
[RequirePermission(UserRightType.Finance_Gkv_Delete)]
void DeleteGkvAbrechnung(GkvAbrechnungDC abrechnung);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
[RequirePermission(UserRightType.Finance_Gkv_Send)]
GkvAbrechnungSendResponseDC SendNewGkvAbrechnung(GkvAbrechnungSendRequestDC req);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
GkvAbrechnungGetIKResponseDC SendGetIKRequest(GkvAbrechnungGetIKRequestDC req);
}
}
}

27
Service/ServiceImplementations/AccountingServiceImp.cs
View File

@@ -28,7 +28,6 @@ using BS.Shared.Extensions;
using BS.Shared.Exceptions;
using BS.Shared.AppSender;
using BeWo.Data.Security;
using System.Security.Cryptography;
namespace BeWo.Service.ServiceImplementations
{
@@ -746,31 +745,5 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(e);
}
}
// -------------------------------------------------------------------------------------------------------------------------------------
// -------------------------------------------------------------------------------------------------------------------------------------
// -------------------------------------------------------------------------------------------------------------------------------------
public GkvAbrechnungDC GetGkvAbrechnung(long oid) => new GkvAccountingServiceImp().GetGkvAbrechnung(oid);
public List<GkvAbrechnungDC> GetFilteredGkvAbrechnungen(GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter) => new GkvAccountingServiceImp().GetFilteredGkvAbrechnungen(gkvAbrechnungViewFilter);
public List<GkvAbrechnungDC> GetAllGkvAbrechnungen() => new GkvAccountingServiceImp().GetAllGkvAbrechnungen();
public string GetProtokollRawDataString(long oid, GkvRawDataType gkvRawData) => new GkvAccountingServiceImp().GetProtokollRawDataString(oid, gkvRawData);
public GkvAbrechnungCreateResponseDC CreateNewGkvAbrechnung(GkvAbrechnungCreateRequestDC request) => new GkvAccountingServiceImp().CreateNewGkvAbrechnung(request);
public GkvAbrechnungDC UpdateGkvAbrechnung(GkvAbrechnungDC abrechnung) => new GkvAccountingServiceImp().UpdateGkvAbrechnung(abrechnung);
public void DeleteGkvAbrechnung(GkvAbrechnungDC abrechnung) => new GkvAccountingServiceImp().DeleteGkvAbrechnung(abrechnung);
/// <summary>
/// Erstellt GkvTransferProtokoll
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
public GkvAbrechnungSendResponseDC SendNewGkvAbrechnung(GkvAbrechnungSendRequestDC req) => new GkvAccountingServiceImp().SendNewGkvAbrechnung(req);
public GkvAbrechnungGetIKResponseDC SendGetIKRequest(GkvAbrechnungGetIKRequestDC req) => new GkvAccountingServiceImp().SendGetIKRequest(req);
public void HandleGkvServerResults(IEnumerable<GkvServerResultDC> results) => new GkvAccountingServiceImp().HandleGkvServerResults(results);
}
}