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:
HirschleM
2025-05-09 11:38:21 +02:00
parent f0b2059616 6f0c5c7eed
commit 8213e77d88
8 changed files with 247 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

244
ReportImp/AsSozialeDienstleistungenEV/ServiceInvoiceReportJA.Designer.cs generated
View File

@@ -52,19 +52,19 @@ namespace AsSozialeDienstleistungenEV
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.lbl27 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.lbl29 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.lbl30 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.lbl31 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.lbl35a = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.lbl41 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
@@ -123,6 +123,12 @@ namespace AsSozialeDienstleistungenEV
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.lbl18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -396,26 +402,32 @@ namespace AsSozialeDienstleistungenEV
this.xrTableRow5,
this.xrTableRow6,
this.xrTableRow7});
this.xrTable2.SizeF = new System.Drawing.SizeF(700.42F, 60F);
this.xrTable2.SizeF = new System.Drawing.SizeF(700.4193F, 60F);
//
// xrTableRow5
//
this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell6,
this.lbl27,
this.xrTableCell7,
this.xrTableCell8,
this.xrTableCell9});
this.lbl29,
this.xrTableCell9,
this.lbl18,
this.xrTableCell10});
this.xrTableRow5.Name = "xrTableRow5";
this.xrTableRow5.Weight = 0.8D;
//
// xrTableCell6
// lbl27
//
this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
this.lbl27.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell6.Multiline = true;
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.StylePriority.UseBorders = false;
this.xrTableCell6.Weight = 0.15325471936121493D;
this.lbl27.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lbl27.Multiline = true;
this.lbl27.Name = "lbl27";
this.lbl27.StylePriority.UseBorders = false;
this.lbl27.StylePriority.UseFont = false;
this.lbl27.StylePriority.UseTextAlignment = false;
this.lbl27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.lbl27.Weight = 0.15325471936121493D;
//
// xrTableCell7
//
@@ -424,18 +436,20 @@ namespace AsSozialeDienstleistungenEV
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.StylePriority.UseFont = false;
this.xrTableCell7.Text = "§ 27 Abs. 2 SGB VIII";
this.xrTableCell7.Weight = 1.7779303510830444D;
this.xrTableCell7.Weight = 1.1375032649290242D;
//
// xrTableCell8
// lbl29
//
this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
this.lbl29.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell8.Multiline = true;
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.StylePriority.UseBorders = false;
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell8.Weight = 0.15294758519134033D;
this.lbl29.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lbl29.Multiline = true;
this.lbl29.Name = "lbl29";
this.lbl29.StylePriority.UseBorders = false;
this.lbl29.StylePriority.UseFont = false;
this.lbl29.StylePriority.UseTextAlignment = false;
this.lbl29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.lbl29.Weight = 0.15322978581658797D;
//
// xrTableCell9
//
@@ -444,26 +458,32 @@ namespace AsSozialeDienstleistungenEV
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.StylePriority.UseFont = false;
this.xrTableCell9.Text = "§ 29 SGB VIII";
this.xrTableCell9.Weight = 1.7890254885922436D;
this.xrTableCell9.Weight = 1.137528113626088D;
//
// xrTableRow6
//
this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell10,
this.lbl30,
this.xrTableCell11,
this.xrTableCell12,
this.xrTableCell13});
this.lbl31,
this.xrTableCell13,
this.xrTableCell6,
this.xrTableCell12});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Weight = 0.79999999999999993D;
//
// xrTableCell10
// lbl30
//
this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
this.lbl30.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell10.Multiline = true;
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.StylePriority.UseBorders = false;
this.xrTableCell10.Weight = 0.15325471936121493D;
this.lbl30.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lbl30.Multiline = true;
this.lbl30.Name = "lbl30";
this.lbl30.StylePriority.UseBorders = false;
this.lbl30.StylePriority.UseFont = false;
this.lbl30.StylePriority.UseTextAlignment = false;
this.lbl30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.lbl30.Weight = 0.15325471936121493D;
//
// xrTableCell11
//
@@ -472,21 +492,20 @@ namespace AsSozialeDienstleistungenEV
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UseFont = false;
this.xrTableCell11.Text = "§ 30 SGB VIII";
this.xrTableCell11.Weight = 1.7779303510830444D;
this.xrTableCell11.Weight = 1.1375032649290242D;
//
// xrTableCell12
// lbl31
//
this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
this.lbl31.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell12.Multiline = true;
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.StylePriority.UseBorders = false;
this.xrTableCell12.StylePriority.UseFont = false;
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.Text = "x";
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell12.Weight = 0.15294758519134033D;
this.lbl31.Font = new DevExpress.Drawing.DXFont("arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lbl31.Multiline = true;
this.lbl31.Name = "lbl31";
this.lbl31.StylePriority.UseBorders = false;
this.lbl31.StylePriority.UseFont = false;
this.lbl31.StylePriority.UseTextAlignment = false;
this.lbl31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.lbl31.Weight = 0.15322978581658797D;
//
// xrTableCell13
//
@@ -495,27 +514,33 @@ namespace AsSozialeDienstleistungenEV
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.StylePriority.UseFont = false;
this.xrTableCell13.Text = "§ 31 SGB VIII";
this.xrTableCell13.Weight = 1.7890254885922436D;
this.xrTableCell13.Weight = 1.137528113626088D;
//
// xrTableRow7
//
this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell14,
this.lbl35a,
this.xrTableCell15,
this.xrTableCell16,
this.xrTableCell17});
this.lbl41,
this.xrTableCell17,
this.xrTableCell8,
this.xrTableCell14});
this.xrTableRow7.Name = "xrTableRow7";
this.xrTableRow7.Weight = 0.79999999999999993D;
//
// xrTableCell14
// lbl35a
//
this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
this.lbl35a.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell14.Multiline = true;
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseBorders = false;
this.xrTableCell14.Weight = 0.15325471936121493D;
this.lbl35a.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lbl35a.Multiline = true;
this.lbl35a.Name = "lbl35a";
this.lbl35a.StylePriority.UseBorders = false;
this.lbl35a.StylePriority.UseFont = false;
this.lbl35a.StylePriority.UseTextAlignment = false;
this.lbl35a.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.lbl35a.Weight = 0.15325471936121493D;
//
// xrTableCell15
//
@@ -524,19 +549,21 @@ namespace AsSozialeDienstleistungenEV
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.StylePriority.UseFont = false;
this.xrTableCell15.Text = "§ 35a SGB VIII";
this.xrTableCell15.Weight = 1.7779303510830444D;
this.xrTableCell15.Weight = 1.1375032649290242D;
//
// xrTableCell16
// lbl41
//
this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
this.lbl41.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell16.Multiline = true;
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.StylePriority.UseBorders = false;
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell16.Weight = 0.15294758519134033D;
this.lbl41.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lbl41.Multiline = true;
this.lbl41.Name = "lbl41";
this.lbl41.StylePriority.UseBorders = false;
this.lbl41.StylePriority.UseFont = false;
this.lbl41.StylePriority.UseTextAlignment = false;
this.lbl41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.lbl41.Weight = 0.15322978581658797D;
//
// xrTableCell17
//
@@ -545,7 +572,7 @@ namespace AsSozialeDienstleistungenEV
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.StylePriority.UseFont = false;
this.xrTableCell17.Text = "§ 41 SGB VIII";
this.xrTableCell17.Weight = 1.7890254885922436D;
this.xrTableCell17.Weight = 1.137528113626088D;
//
// xrLabel23
//
@@ -1341,6 +1368,71 @@ namespace AsSozialeDienstleistungenEV
this.xrLabel7.StylePriority.UseTextAlignment = false;
this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// lbl18
//
this.lbl18.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.lbl18.Font = new DevExpress.Drawing.DXFont("verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lbl18.Multiline = true;
this.lbl18.Name = "lbl18";
this.lbl18.StylePriority.UseBorders = false;
this.lbl18.StylePriority.UseFont = false;
this.lbl18.StylePriority.UseTextAlignment = false;
this.lbl18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.lbl18.Weight = 0.15322982823092726D;
//
// xrTableCell6
//
this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell6.Multiline = true;
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.StylePriority.UseBorders = false;
this.xrTableCell6.StylePriority.UseFont = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell6.Weight = 0.15322982823092726D;
//
// xrTableCell8
//
this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell8.Multiline = true;
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.StylePriority.UseBorders = false;
this.xrTableCell8.StylePriority.UseFont = false;
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell8.Weight = 0.15322982823092726D;
//
// xrTableCell14
//
this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell14.Multiline = true;
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseFont = false;
this.xrTableCell14.Weight = 1.1384091262258571D;
//
// xrTableCell12
//
this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell12.Multiline = true;
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.StylePriority.UseFont = false;
this.xrTableCell12.Weight = 1.1384091262258571D;
//
// xrTableCell10
//
this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell10.Multiline = true;
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.StylePriority.UseFont = false;
this.xrTableCell10.Text = "§ 18 SGB VIII";
this.xrTableCell10.Weight = 1.1384091262258571D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
@@ -1397,19 +1489,19 @@ namespace AsSozialeDienstleistungenEV
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTable xrTable2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell lbl27;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell lbl29;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell lbl30;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell lbl31;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell lbl35a;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell lbl41;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRLabel xrLabel23;
private DevExpress.XtraReports.UI.XRLabel xrLabel21;
@@ -1470,5 +1562,11 @@ namespace AsSozialeDienstleistungenEV
private DevExpress.XtraReports.UI.XRLabel xrLabel30;
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
private DevExpress.XtraReports.UI.XRLabel xrLabel31;
private DevExpress.XtraReports.UI.XRTableCell lbl18;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
}
}

35
ReportImp/AsSozialeDienstleistungenEV/ServiceInvoiceReportJA.cs
View File

@@ -58,6 +58,41 @@ namespace AsSozialeDienstleistungenEV
{
begin = customer.AssistanceBegin.Value;
}
//Angaben zur Betreuungsart / Hilfeart
var betreuungsarten = customer.ValueList.Where(v2o => v2o.Entry.Type == ValueListEntryType.CustomerCareType).ToList();
if (betreuungsarten != null && betreuungsarten.Count > 0)
{
if (betreuungsarten.Any(b => b.Entry.Value.Contains("§18")))
{
lbl18.Text = "x";
}
if (betreuungsarten.Any(b => b.Entry.Value.Contains("§27")))
{
lbl27.Text = "x";
}
if (betreuungsarten.Any(b => b.Entry.Value.Contains("§29")))
{
lbl29.Text = "x";
}
if (betreuungsarten.Any(b => b.Entry.Value.Contains("§30")))
{
lbl30.Text = "x";
}
if (betreuungsarten.Any(b => b.Entry.Value.Contains("§31")))
{
lbl31.Text = "x";
}
if (betreuungsarten.Any(b => b.Entry.Value.Contains("§35a")))
{
lbl35a.Text = "x";
}
if (betreuungsarten.Any(b => b.Entry.Value.Contains("§41")))
{
lbl41.Text = "x";
}
}
var duration = pRO.AccountingPeriodEnd - begin;
lblDauer.Text = duration.Days.ToString();

15
ReportImp/MalteserJohanniterJohanneshaus/Invoicing/CollectiveInvoiceCreation.cs
View File

@@ -71,19 +71,34 @@ namespace MalteserJohanniterJohanneshaus.Invoicing
}
invoice = CreateCollectiveBilling2(costBearer, invoicePeriod, TeamKaldauen);
if (invoice != null)
{
invoice.InvoiceBase.InvoiceTypeText = "KSt.10";
invoiceList.Add(invoice);
}
invoice = CreateCollectiveBilling2(costBearer, invoicePeriod, TeamSiegburgDWP);
if (invoice != null)
{
invoice.InvoiceBase.InvoiceTypeText = "KSt.15";
invoiceList.Add(invoice);
}
invoice = CreateCollectiveBilling2(costBearer, invoicePeriod, TeamWitter);
if (invoice != null)
{
invoice.InvoiceBase.InvoiceTypeText = "KSt.20";
invoiceList.Add(invoice);
}
invoice = CreateCollectiveBilling2(costBearer, invoicePeriod, TeamRoisdorf);
if (invoice != null)
{
invoice.InvoiceBase.InvoiceTypeText = "KSt.30";
invoiceList.Add(invoice);
}
invoice = CreateCollectiveBilling2(costBearer, invoicePeriod, TeamSiegburg);
if (invoice != null)
{
invoice.InvoiceBase.InvoiceTypeText = "KSt.40";
invoiceList.Add(invoice);
}
var result = invoiceList.Select(item => MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(item)).ToList();
return result.Count > 1 ? result.OrderBy(i => i.InvoiceBase.CustomerLastName).ToList() : result;

5
ReportImp/MalteserJohanniterJohanneshaus/Invoicing/CustomInvoiceCreation.cs
View File

@@ -17,6 +17,11 @@ namespace MalteserJohanniterJohanneshaus.Invoicing
{
public class CustomInvoiceCreation : InvoiceCreation
{
public override void SetInvoiceId(ServiceInvoice invoice)
{
invoice.InvoiceBase.InvoiceTypeText = "KSt.60-Rg";
}
public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, BS.Shared.Services.Calculations calc)
{
var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc);

33
ReportImp/MalteserJohanniterJohanneshaus/Invoicing/SettlementInvoiceCreation.cs
View File

@@ -15,37 +15,20 @@ namespace MalteserJohanniterJohanneshaus
return false;
}
//public override bool IsServiceRecordBillable(ServiceRecord iRecord)
//{
// if (iRecord.ServiceDescription.ServiceCategory.Name.Contains("Assistenz"))
// {
// return false;
// }
// return true;
//}
//public override void CalculateSettlementInvoiceApprovedAmounts(Settlement2DC si, SupportConceptCostBearerRelDC relDC, Calculations calc)
//public override Settlement2DC GenerateSettlementInvoice(CostBearer2SupportConcept c2s, DateTime? periodStart, DateTime? periodEnd)
//{
// si.ApprovedFLSWeekly = 0;
// si.ApprovedFLS = 0;
// foreach (var sp in relDC.ApprovalPeriodList)
// Settlement2DC settlementInvoice = new Settlement2DC();
// settlementInvoice = base.GenerateSettlementInvoice(c2s, periodStart, periodEnd);
// if (settlementInvoice.InvoiceItems == null || settlementInvoice.InvoiceItems.Count == 0)
// {
// if (sp.ServiceCategory == null || !sp.ServiceCategory.Name.Contains("Assistenz"))
// foreach (var ii in settlementInvoice.InvoiceItems)
// {
// si.ApprovedFLSWeekly += calc.GetApprovedHoursPerWeek(sp, relDC.CostBearer.CostRatePeriods) ?? 0m;
// decimal flsTotal = calc.GetApprovedHoursTotal(sp, relDC.CostBearer.CostRatePeriods) ?? 0m;
// flsTotal = Math.Round(flsTotal, 2, MidpointRounding.AwayFromZero);
// si.ApprovedFLS += flsTotal;
// ii.ItemDescription = "KSt.60-Spitzabr.";
// }
// }
//}
//public override IList<ServiceRecord> GetBillableServiceRecords(CostBearer2SupportConcept c2s)
//{
// return c2s.ServiceRecords.OrderBy(s => s.Start).Where(s => !s.ServiceDescription.ServiceCategory.Name.ToLower().Contains("assistenz")).ToList();
// return settlementInvoice;
//}
}
}

2
ReportImp/MalteserJohanniterJohanneshaus/Invoicing/SoziotherapieInvoiceCreation.cs
View File

@@ -19,7 +19,7 @@ namespace MalteserJohanniterJohanneshaus.Invoicing
public override void SetInvoiceId(ServiceInvoice invoice)
{
invoice.InvoiceBase.InvoiceId = "RechnungSoziotherapie";
invoice.InvoiceBase.InvoiceTypeText = "Soziotherapie";
invoice.InvoiceBase.InvoiceTypeText = "KSt.70";
}
public override ServiceInvoice CreateSingleInvoice(int invoiceCounter, CostBearer costBearer, DateTimeSpan invoicePeriod, CompactSupportConceptDC supportConcept, List<ServiceRecordDC> serviceRecords)
{

9
ReportImp/SKMKrefeld/Mitarbeiterstundenkonto.cs
View File

@@ -37,9 +37,12 @@ namespace SkmKrefeld
}
}
}
ed.Custom14 = anzahlBetreuungen; // IST
ed.Custom13 = Math.Round(ed.SollProWoche/39 * 15, 0, MidpointRounding.AwayFromZero); // Soll mit 15 Betreuungen bei Vollzeit
ed.Custom12 = ed.Custom14 - ed.Custom13; // Diff
if (anzahlBetreuungen != 0)
{
ed.Custom14 = anzahlBetreuungen; // IST
ed.Custom13 = Math.Round(ed.SollProWoche / 39 * 15, 0, MidpointRounding.AwayFromZero); // Soll mit 15 Betreuungen bei Vollzeit
ed.Custom12 = ed.Custom14 - ed.Custom13; // Diff
}
//ed.Ueberstunden = ed.Ueberstunden + ed.UeberstundenAusbezahlt;

9
ReportImp/SKMKrefeld/Teamstundenkonto.cs
View File

@@ -39,9 +39,12 @@ namespace SkmKrefeld
}
}
}
ed.Custom14 = anzahlBetreuungen; // IST
ed.Custom13 = Math.Round(ed.SollProWoche / 39 * 15, 0, MidpointRounding.AwayFromZero); // Soll mit 15 Betreuungen bei Vollzeit
ed.Custom12 = ed.Custom14 - ed.Custom13; // Diff
if (anzahlBetreuungen != 0)
{
ed.Custom14 = anzahlBetreuungen; // IST
ed.Custom13 = Math.Round(ed.SollProWoche / 39 * 15, 0, MidpointRounding.AwayFromZero); // Soll mit 15 Betreuungen bei Vollzeit
ed.Custom12 = ed.Custom14 - ed.Custom13; // Diff
}
//ed.Ueberstunden = ed.Ueberstunden + ed.UeberstundenAusbezahlt;