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

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

Browse Source 
# Conflicts:
#	ReportImp/CaritasFrankfurt2Reports/ServicesOverviewReport.Designer.cs
#	ReportImp/CaritasFrankfurtReports/ServicesOverviewReport.Designer.cs
This commit is contained in:
Christian
2021-11-30 13:33:46 +01:00
parent 0775c566e5 dbdff096e5
commit edde5e1a31
17 changed files with 614 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ReportImp/BewegtSystemischeBeratung/Leistungsnachweis.cs
View File

@@ -62,6 +62,8 @@ namespace BewegtSystemischeBeratung
s.Notice4 = "";
s.Notice5 = "";
s.Minutes = CheckPause(s.Minutes);
if (s.ServiceCategory.Contains("Overhead") || s.ServiceDescription.Contains("Overhead"))
{
summeFls += s.Minutes;
@@ -197,6 +199,22 @@ namespace BewegtSystemischeBeratung
this.bindingSource1.DataSource = pRO;
}
private double CheckPause(double minutes)
{
var minuten = minutes;
var stunden = minutes /= 60;
if (stunden >= 9)
{
minuten -= 45;
}
else if (stunden >= 6)
{
minuten -= 30;
}
return minuten;
}
private void BerechneBewilligung(ServicesOverviewRO pRo)
{
bool showKontingent = false;

15
ReportImp/BewegtSystemischeBeratung/LeistungsnachweisMitUhrzeit.Designer.cs generated
View File

@@ -84,7 +84,6 @@ namespace BewegtSystemischeBeratung
this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -124,8 +123,7 @@ namespace BewegtSystemischeBeratung
this.xrTableCell10,
this.xrTableCell6,
this.xrTableCell8,
this.xrTableCell4,
this.xrTableCell2});
this.xrTableCell4});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow2.StylePriority.UseTextAlignment = false;
@@ -171,7 +169,7 @@ namespace BewegtSystemischeBeratung
this.xrTableCell4.StylePriority.UsePadding = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Leistung";
this.xrTableCell4.Weight = 0.780349376142226D;
this.xrTableCell4.Weight = 1.0242085572534365D;
//
// DetailReport
//
@@ -684,14 +682,6 @@ namespace BewegtSystemischeBeratung
this.fieldGruppe.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.fieldGruppe.Name = "fieldGruppe";
//
// xrTableCell2
//
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.Text = "xrTableCell2";
this.xrTableCell2.Weight = 0.24385918111121055D;
//
// LeistungsnachweisMitUhrzeit
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -781,6 +771,5 @@ namespace BewegtSystemischeBeratung
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRLabel lblBewilligtEinheit;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
}
}

16
ReportImp/BewegtSystemischeBeratung/LeistungsnachweisMitUhrzeit.cs
View File

@@ -62,6 +62,8 @@ namespace BewegtSystemischeBeratung
s.Notice4 = "";
s.Notice5 = "";
s.Minutes = CheckPause(s.Minutes);
if (s.ServiceCategory.Contains("Overhead") || s.ServiceDescription.Contains("Overhead"))
{
summeFls += s.Minutes;
@@ -160,7 +162,21 @@ namespace BewegtSystemischeBeratung
//lblRestStunden.Text = String.Format("{0:0.00}", rest);
this.bindingSource1.DataSource = pRO;
}
private double CheckPause(double minutes)
{
var minuten = minutes;
var stunden = minutes /= 60;
if (stunden >= 9)
{
minuten -= 45;
}
else if (stunden >= 6)
{
minuten -= 30;
}
return minuten;
}
private void BerechneBewilligung(ServicesOverviewRO pRo)
{
bool showKontingent = false;

28
ReportImp/BewegtSystemischeBeratung/LeistungsnachweisMitUhrzeitMitUnterschrift.Designer.cs generated
View File

@@ -60,7 +60,7 @@ namespace BewegtSystemischeBeratung
this.lblVerblStundenVormontHeader = new DevExpress.XtraReports.UI.XRLabel();
this.lblStundenVormonat = new DevExpress.XtraReports.UI.XRLabel();
this.lblGesamt = new DevExpress.XtraReports.UI.XRLabel();
this.lblOverhead = new DevExpress.XtraReports.UI.XRLabel();
this.lblFahrzeit = new DevExpress.XtraReports.UI.XRLabel();
this.lblFls = new DevExpress.XtraReports.UI.XRLabel();
this.lblBewilligtFls = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
@@ -163,7 +163,7 @@ namespace BewegtSystemischeBeratung
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell8.StylePriority.UsePadding = false;
this.xrTableCell8.Text = "Overhead";
this.xrTableCell8.Text = "Fahrzeit";
this.xrTableCell8.Weight = 0.14631551118326713D;
//
// xrTableCell4
@@ -343,7 +343,7 @@ namespace BewegtSystemischeBeratung
this.lblVerblStundenVormontHeader,
this.lblStundenVormonat,
this.lblGesamt,
this.lblOverhead,
this.lblFahrzeit,
this.lblFls,
this.lblBewilligtFls,
this.xrLabel10,
@@ -440,16 +440,16 @@ namespace BewegtSystemischeBeratung
this.lblGesamt.StylePriority.UseTextAlignment = false;
this.lblGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// lblOverhead
// lblFahrzeit
//
this.lblOverhead.LocationFloat = new DevExpress.Utils.PointFloat(201.2499F, 310F);
this.lblOverhead.Multiline = true;
this.lblOverhead.Name = "lblOverhead";
this.lblOverhead.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblOverhead.SizeF = new System.Drawing.SizeF(72.91661F, 25F);
this.lblOverhead.StylePriority.UseFont = false;
this.lblOverhead.StylePriority.UseTextAlignment = false;
this.lblOverhead.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.lblFahrzeit.LocationFloat = new DevExpress.Utils.PointFloat(201.2499F, 310F);
this.lblFahrzeit.Multiline = true;
this.lblFahrzeit.Name = "lblFahrzeit";
this.lblFahrzeit.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblFahrzeit.SizeF = new System.Drawing.SizeF(72.91661F, 25F);
this.lblFahrzeit.StylePriority.UseFont = false;
this.lblFahrzeit.StylePriority.UseTextAlignment = false;
this.lblFahrzeit.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// lblFls
//
@@ -509,7 +509,7 @@ namespace BewegtSystemischeBeratung
this.xrLabel14.SizeF = new System.Drawing.SizeF(201.25F, 25F);
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.StylePriority.UseTextAlignment = false;
this.xrLabel14.Text = "Overhead:";
this.xrLabel14.Text = "Fahrzeiten:";
this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel13
@@ -795,7 +795,7 @@ namespace BewegtSystemischeBeratung
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel lblGesamt;
private DevExpress.XtraReports.UI.XRLabel lblOverhead;
private DevExpress.XtraReports.UI.XRLabel lblFahrzeit;
private DevExpress.XtraReports.UI.XRLabel lblFls;
private DevExpress.XtraReports.UI.XRLabel lblBewilligtFls;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;

269
ReportImp/BewegtSystemischeBeratung/LeistungsnachweisMitUhrzeitMitUnterschrift.cs
View File

@@ -9,6 +9,7 @@ using BeWo.Report.ReportObjects;
using BeWo.Report;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using BewegtSystemischeBeratung.Invoicing;
using BeWo.Service.DCEntityMapper;
@@ -29,15 +30,16 @@ namespace BewegtSystemischeBeratung
public void SetReportDataSource(ServicesOverviewRO pRO)
{
//ErmittleHauptbetreuer(pRO);
double summeFls = 0;
double summeOverhead = 0;
double summeWege = 0;
ErmittleHauptbetreuer(pRO);
pRO.MainAttendant = "";
bool hatGruppen = false;
double summeFls = 0;
//double summeOverhead = 0;
double summeWege = 0;
if (pRO.Services != null)
{
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
@@ -60,14 +62,16 @@ namespace BewegtSystemischeBeratung
s.Notice4 = "";
s.Notice5 = "";
s.Minutes = CheckPause(s.Minutes);
if (s.ServiceCategory.Contains("Overhead") || s.ServiceDescription.Contains("Overhead"))
{
summeOverhead += s.Minutes;
s.Notice5 = String.Format("{0:0.00}", s.Minutes / 60);
summeFls += s.Minutes;
s.Notice4 = String.Format("{0:0.00}", s.Minutes / 60);
}
else if (s.ServiceDescription.Contains("Fahr"))
{
summeOverhead += s.Minutes;
summeWege += s.Minutes;
s.Notice5 = String.Format("{0:0.00}", s.Minutes / 60);
}
else
@@ -80,47 +84,83 @@ namespace BewegtSystemischeBeratung
}
}
//Dictionary<int, ServicesOverviewRO.ServiceDetail> tag2Detail = new Dictionary<int, ServicesOverviewRO.ServiceDetail>();
List<ServicesOverviewRO.ServiceDetail> alleFahrzeiten = new List<ServicesOverviewRO.ServiceDetail>();
List<ServicesOverviewRO.ServiceDetail> fahrzeitenOhneFls = new List<ServicesOverviewRO.ServiceDetail>();
List<ServicesOverviewRO.ServiceDetail> alleNichtFahrzeiten = new List<ServicesOverviewRO.ServiceDetail>();
//List<ServicesOverviewRO.ServiceDetail> services = new List<ServicesOverviewRO.ServiceDetail>();
//foreach (ServicesOverviewRO.ServiceDetail s in servicesBillable)
//{
// if (!s.ServiceDescription.Contains("Fahr"))
// {
// services.Add(s);
List<ServicesOverviewRO.ServiceDetail> services = new List<ServicesOverviewRO.ServiceDetail>();
// if (!tag2Detail.ContainsKey(s.StartDate.Day))
// {
// tag2Detail.Add(s.StartDate.Day, s);
// }
// }
//}
foreach (ServicesOverviewRO.ServiceDetail s in servicesBillable)
{
if (s.ServiceDescription.Contains("Fahr"))
{
alleFahrzeiten.Add(s);
}
else
{
alleNichtFahrzeiten.Add(s);
}
}
//foreach (ServicesOverviewRO.ServiceDetail s in servicesBillable)
//{
// if (s.ServiceDescription.Contains("Fahr"))
// {
// if (tag2Detail.ContainsKey(s.StartDate.Day))
// {
// tag2Detail[s.StartDate.Day].Notice5 = s.Notice5;
// }
// else
// {
// services.Add(s);
// }
// }
//}
foreach (var sdFahr in alleFahrzeiten)
{
List<ServicesOverviewRO.ServiceDetail> alleFahrzeitenAmTag = new List<ServicesOverviewRO.ServiceDetail>();
pRO.Services = servicesBillable;
foreach (var sdFls in alleNichtFahrzeiten)
{
if (sdFls.StartDate.Date == sdFahr.StartDate.Date && String.IsNullOrEmpty(sdFls.Notice5))
{
alleFahrzeitenAmTag.Add(sdFls);
}
}
if (alleFahrzeitenAmTag.Count > 0)
{
ServicesOverviewRO.ServiceDetail sdFlsAmTag = null;
foreach (var sd in alleFahrzeitenAmTag)
{
if (sd.StartDate > sdFahr.StartDate && sdFlsAmTag == null)
{
sdFlsAmTag = sd;
}
}
if (sdFlsAmTag == null)
{
sdFlsAmTag = alleFahrzeitenAmTag[0];
}
if (sdFlsAmTag != null)
{
sdFlsAmTag.Notice5 = String.Format("{0:0.00}", sdFahr.Minutes / 60);
}
}
else
{
fahrzeitenOhneFls.Add(sdFahr);
}
}
foreach (var sd in fahrzeitenOhneFls)
{
services.Add(sd);
}
foreach (var sd in alleNichtFahrzeiten)
{
services.Add(sd);
}
pRO.Services = services.OrderBy(s => s.StartDate).ToList();
}
lblFls.Text = String.Format("{0:0.00}", summeFls / 60);
lblOverhead.Text = String.Format("{0:0.00}", summeOverhead / 60);
//lblFahrzeit.Text = String.Format("{0:0.00}", summeWege / 60);
lblGesamt.Text = String.Format("{0:0.00}", (summeFls + summeOverhead + summeWege) / 60);
//lblOverhead.Text = String.Format("{0:0.00}", summeOverhead / 60);
lblFahrzeit.Text = String.Format("{0:0.00}", summeWege / 60);
lblGesamt.Text = String.Format("{0:0.00}", (summeFls + summeWege) / 60);
//pRO.ApprovedFLSPerMonth = pRO.ApprovedFLSPerWeek * 4.33m;
@@ -159,6 +199,22 @@ namespace BewegtSystemischeBeratung
this.bindingSource1.DataSource = pRO;
}
private double CheckPause(double minutes)
{
var minuten = minutes;
var stunden = minutes /= 60;
if (stunden >= 9)
{
minuten -= 45;
}
else if (stunden >= 6)
{
minuten -= 30;
}
return minuten;
}
private void BerechneBewilligung(ServicesOverviewRO pRo)
{
bool showKontingent = false;
@@ -172,23 +228,6 @@ namespace BewegtSystemischeBeratung
var dc = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(c2s);
var oldlist = dc.ApprovalPeriodList;
var newlist = new List<SupportConceptApprovalPeriodDC>();
if (oldlist != null)
{
foreach (var scap in oldlist)
{
if (scap.ServiceCategory == null || !scap.ServiceCategory.Name.Contains("Fahrt"))
{
newlist.Add(scap);
}
}
}
dc.ApprovalPeriodList = newlist;
bool showMonat = false;
decimal gesamtKontingent = 0;
foreach (var scap in dc.ApprovalPeriodList)
@@ -201,13 +240,14 @@ namespace BewegtSystemischeBeratung
else if (scap.ApprovedBEPerInterval.HasValue && scap.ApprovedBEInterval.HasValue && scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Monthly)
{
showMonat = true;
}
}
if (showKontingent)
{
var geleistetVormonat = (pRo.MinutenGeleistetGesamt - (decimal)pRo.TotalFLMBillable) / 60;
@@ -247,11 +287,6 @@ namespace BewegtSystemischeBeratung
lblBewilligtEinheit.Text = "pro Woche";
}
}
if (!showKontingent)
@@ -261,8 +296,114 @@ namespace BewegtSystemischeBeratung
lblRestStunden.Text = "";
lblRestStundenHeader.Text = "";
}
}
//private void BerechneBewilligung(ServicesOverviewRO pRo)
//{
// bool showKontingent = false;
// pRo.CalculateFLSSollIst();
// if (pRo.CostBearer2SupportConceptList != null && pRo.CostBearer2SupportConceptList.Count > 0)
// {
// var calc = new CustomCalculations();
// var c2s = pRo.CostBearer2SupportConceptList[0];
// var dc = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(c2s);
// var oldlist = dc.ApprovalPeriodList;
// var newlist = new List<SupportConceptApprovalPeriodDC>();
// if (oldlist != null)
// {
// foreach (var scap in oldlist)
// {
// if (scap.ServiceCategory == null || !scap.ServiceCategory.Name.Contains("Fahrt"))
// {
// newlist.Add(scap);
// }
// }
// }
// dc.ApprovalPeriodList = newlist;
// bool showMonat = false;
// decimal gesamtKontingent = 0;
// foreach (var scap in dc.ApprovalPeriodList)
// {
// if (scap.ApprovedBETotal.HasValue && scap.ApprovedBETotal.Value > 0)
// {
// gesamtKontingent = scap.ApprovedBETotal.Value;
// showKontingent = true;
// }
// else if (scap.ApprovedBEPerInterval.HasValue && scap.ApprovedBEInterval.HasValue && scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Monthly)
// {
// showMonat = true;
// }
// }
// if (showKontingent)
// {
// var geleistetVormonat = (pRo.MinutenGeleistetGesamt - (decimal)pRo.TotalFLMBillable) / 60;
// lblBewilligtFls.Text = String.Format("{0:0.00}", gesamtKontingent);
// lblStundenVormonat.Text = String.Format("{0:0.00}", gesamtKontingent - geleistetVormonat);
// lblRestStunden.Text = String.Format("{0:0.00}", gesamtKontingent - (pRo.MinutenGeleistetGesamt / 60));
// lblBewilligtEinheit.Text = "";
// }
// else if (showMonat)
// {
// var bewilligtProMonat = calc.GetApprovedHoursPerMonth(dc);
// var geleistetVormonat = (pRo.MinutenGeleistetGesamt - (decimal)pRo.TotalFLMBillable) / 60;
// decimal sollVormonat = 0;
// if (pRo.StartDate > c2s.StartDate.Value)
// {
// var tm = DateTimeUtils.GetTotalMonths(c2s.StartDate.Value, pRo.StartDate.AddDays(-1));
// sollVormonat = bewilligtProMonat * tm.GanzeMonate;
// }
// lblBewilligtFls.Text = String.Format("{0:0.00}", bewilligtProMonat);
// lblBewilligtEinheit.Text = "pro Monat";
// lblStundenVormonat.Text = String.Format("{0:0.00}", sollVormonat - geleistetVormonat);
// decimal plusMinusVormonat = (sollVormonat - geleistetVormonat) + bewilligtProMonat - ((decimal)pRo.TotalFLMBillable / 60);
// lblRestStunden.Text = String.Format("{0:0.00}", plusMinusVormonat);
// }
// else
// {
// lblBewilligtFls.Text = String.Format("{0:0.00}", pRo.ApprovedFLSPerWeek);
// lblBewilligtEinheit.Text = "pro Woche";
// }
// }
// if (!showKontingent)
// {
// lblStundenVormonat.Text = "";
// lblVerblStundenVormontHeader.Text = "";
// lblRestStunden.Text = "";
// lblRestStundenHeader.Text = "";
// }
//}
private void ErmittleHauptbetreuer(ServicesOverviewRO pRO)
{
if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0)

189
ReportImp/CaritasFrankfurt2Reports/ServicesOverviewReport.Designer.cs generated
View File

@@ -100,8 +100,8 @@ namespace BeWo.CaritasFrankfurt2Reports
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.FLSinStunden = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -656,6 +656,187 @@ namespace BeWo.CaritasFrankfurt2Reports
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell12.Weight = 0.19681822172070262D;
//
// xrTable2
//
this.xrTable2.BorderColor = System.Drawing.Color.Black;
this.xrTable2.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double;
this.xrTable2.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable2.SizeF = new System.Drawing.SizeF(1000.88F, 30F);
this.xrTable2.StylePriority.UseBorderDashStyle = false;
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTableRow1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell5,
this.xrTableCell6,
this.xrTableCell7,
this.xrTableCell8,
this.xrTableCell9,
this.xrTableCell10,
this.xrTableCell11,
this.xrTableCell12});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableRow1.Weight = 1.5D;
//
// xrTableCell5
//
this.xrTableCell5.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid;
this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell5.BorderWidth = 1F;
this.xrTableCell5.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F);
this.xrTableCell5.StylePriority.UseBorderDashStyle = false;
this.xrTableCell5.StylePriority.UseBorders = false;
this.xrTableCell5.StylePriority.UseBorderWidth = false;
this.xrTableCell5.StylePriority.UseFont = false;
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Summe in FLS";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell5.Weight = 0.13888891227400624D;
//
// xrTableCell6
//
this.xrTableCell6.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid;
this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell6.BorderWidth = 1F;
this.xrTableCell6.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F);
this.xrTableCell6.StylePriority.UseBorderDashStyle = false;
this.xrTableCell6.StylePriority.UseBorders = false;
this.xrTableCell6.StylePriority.UseBorderWidth = false;
this.xrTableCell6.StylePriority.UseFont = false;
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell6.Weight = 0.19050506073629323D;
//
// xrTableCell7
//
this.xrTableCell7.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid;
this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell7.BorderWidth = 1F;
this.xrTableCell7.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F);
this.xrTableCell7.StylePriority.UseBorderDashStyle = false;
this.xrTableCell7.StylePriority.UseBorders = false;
this.xrTableCell7.StylePriority.UseBorderWidth = false;
this.xrTableCell7.StylePriority.UseFont = false;
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell7.Weight = 0.18828290327157191D;
//
// xrTableCell8
//
this.xrTableCell8.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid;
this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell8.BorderWidth = 1F;
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSQualifiedString")});
this.xrTableCell8.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrTableCell8.StylePriority.UseBorderDashStyle = false;
this.xrTableCell8.StylePriority.UseBorders = false;
this.xrTableCell8.StylePriority.UseBorderWidth = false;
this.xrTableCell8.StylePriority.UseFont = false;
this.xrTableCell8.StylePriority.UsePadding = false;
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.Text = "xrTableCell22";
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell8.Weight = 0.1136362503940269D;
//
// xrTableCell9
//
this.xrTableCell9.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid;
this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell9.BorderWidth = 1F;
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSUnqualifiedString")});
this.xrTableCell9.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell9.StylePriority.UseBorderDashStyle = false;
this.xrTableCell9.StylePriority.UseBorders = false;
this.xrTableCell9.StylePriority.UseBorderWidth = false;
this.xrTableCell9.StylePriority.UseFont = false;
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "xrTableCell23";
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell9.Weight = 0.11363647956542425D;
//
// xrTableCell10
//
this.xrTableCell10.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid;
this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell10.BorderWidth = 1F;
this.xrTableCell10.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrTableCell10.StylePriority.UseBorderDashStyle = false;
this.xrTableCell10.StylePriority.UseBorders = false;
this.xrTableCell10.StylePriority.UseBorderWidth = false;
this.xrTableCell10.StylePriority.UseFont = false;
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell10.Weight = 0.18939394005828933D;
//
// xrTableCell11
//
this.xrTableCell11.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid;
this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell11.BorderWidth = 1F;
this.xrTableCell11.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrTableCell11.StylePriority.UseBorderDashStyle = false;
this.xrTableCell11.StylePriority.UseBorders = false;
this.xrTableCell11.StylePriority.UseBorderWidth = false;
this.xrTableCell11.StylePriority.UseFont = false;
this.xrTableCell11.StylePriority.UsePadding = false;
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell11.Weight = 0.13257544453407574D;
//
// xrTableCell12
//
this.xrTableCell12.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid;
this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell12.BorderWidth = 1F;
this.xrTableCell12.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell12.StylePriority.UseBorderDashStyle = false;
this.xrTableCell12.StylePriority.UseBorders = false;
this.xrTableCell12.StylePriority.UseBorderWidth = false;
this.xrTableCell12.StylePriority.UseFont = false;
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell12.Weight = 0.19681822172070262D;
//
// xrTable1
//
this.xrTable1.BorderColor = System.Drawing.Color.Black;
@@ -815,14 +996,14 @@ namespace BeWo.CaritasFrankfurt2Reports
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel23,
this.xrLabel21});
this.ReportFooter.HeightF = 79.58334F;
this.ReportFooter.HeightF = 89.5833F;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.PrintAtBottom = true;
//
// xrLabel23
//
this.xrLabel23.Font = new System.Drawing.Font("Arial", 7.5F);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00001F);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 29.99999F);
this.xrLabel23.Multiline = true;
this.xrLabel23.Name = "xrLabel23";
this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -835,7 +1016,7 @@ namespace BeWo.CaritasFrankfurt2Reports
// xrLabel21
//
this.xrLabel21.Font = new System.Drawing.Font("Arial", 8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F);
this.xrLabel21.Multiline = true;
this.xrLabel21.Name = "xrLabel21";
this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);

70
ReportImp/CaritasFrankfurtReports/ServicesOverviewReport.Designer.cs generated
View File

@@ -55,6 +55,8 @@ namespace BeWo.CaritasFrankfurt2Reports
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -79,6 +81,7 @@ namespace BeWo.CaritasFrankfurt2Reports
this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
@@ -98,9 +101,6 @@ namespace BeWo.CaritasFrankfurt2Reports
this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -474,6 +474,31 @@ namespace BeWo.CaritasFrankfurt2Reports
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// xrLabel14
//
this.xrLabel14.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(144.2133F, 102.5F);
this.xrLabel14.Multiline = true;
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(202.5F, 20F);
this.xrLabel14.StylePriority.UseBorders = false;
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.StylePriority.UseTextAlignment = false;
this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel13
//
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0.8799235F, 102.5F);
this.xrLabel13.Multiline = true;
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(143.3333F, 20F);
this.xrLabel13.StylePriority.UseFont = false;
this.xrLabel13.StylePriority.UseTextAlignment = false;
this.xrLabel13.Text = "Unterschrift Klient*in:";
this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTable2
//
this.xrTable2.BorderColor = System.Drawing.Color.Black;
@@ -814,14 +839,14 @@ namespace BeWo.CaritasFrankfurt2Reports
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel23,
this.xrLabel21});
this.ReportFooter.HeightF = 79.58338F;
this.ReportFooter.HeightF = 89.58336F;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.PrintAtBottom = true;
//
// xrLabel23
//
this.xrLabel23.Font = new System.Drawing.Font("Arial", 7.5F);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00008F);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 30.00005F);
this.xrLabel23.Multiline = true;
this.xrLabel23.Name = "xrLabel23";
this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -834,7 +859,7 @@ namespace BeWo.CaritasFrankfurt2Reports
// xrLabel21
//
this.xrLabel21.Font = new System.Drawing.Font("Arial", 8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F);
this.xrLabel21.Multiline = true;
this.xrLabel21.Name = "xrLabel21";
this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -861,6 +886,10 @@ namespace BeWo.CaritasFrankfurt2Reports
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.RepeatEveryPage = true;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -1098,35 +1127,6 @@ namespace BeWo.CaritasFrankfurt2Reports
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// xrLabel13
//
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0.8799235F, 102.5F);
this.xrLabel13.Multiline = true;
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(143.3333F, 20F);
this.xrLabel13.StylePriority.UseFont = false;
this.xrLabel13.StylePriority.UseTextAlignment = false;
this.xrLabel13.Text = "Unterschrift Klient*in:";
this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel14
//
this.xrLabel14.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(144.2133F, 102.5F);
this.xrLabel14.Multiline = true;
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(202.5F, 20F);
this.xrLabel14.StylePriority.UseBorders = false;
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.StylePriority.UseTextAlignment = false;
this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// Stundenzettel
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

40
ReportImp/CarlSonnenscheinHaus/CarlSonnenscheinHaus.csproj
View File

@@ -48,6 +48,24 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Finanzauswertung.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Finanzauswertung.designer.cs">
<DependentUpon>Finanzauswertung.cs</DependentUpon>
</Compile>
<Compile Include="InvoiceCustomerReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="InvoiceCustomerReport.Designer.cs">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
</Compile>
<Compile Include="KassenbuchReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="KassenbuchReport.Designer.cs">
<DependentUpon>KassenbuchReport.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Quittierungsbeleg.cs">
<SubType>Component</SubType>
@@ -55,6 +73,12 @@
<Compile Include="Quittierungsbeleg.Designer.cs">
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
</Compile>
<Compile Include="ServiceInvoiceReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ServiceInvoiceReport.Designer.cs">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
</Compile>
<Compile Include="SettlementReport.cs">
<SubType>Component</SubType>
</Compile>
@@ -81,11 +105,27 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Finanzauswertung.resx">
<DependentUpon>Finanzauswertung.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="InvoiceCustomerReport.resx">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="KassenbuchReport.resx">
<DependentUpon>KassenbuchReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Quittierungsbeleg.resx">
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ServiceInvoiceReport.resx">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SettlementReport.resx">
<DependentUpon>SettlementReport.cs</DependentUpon>
<SubType>Designer</SubType>

33
ReportImp/RatPlusTat/Invoicing/AlltagsunterstuetzungsInvoiceCreation.cs
View File

@@ -61,6 +61,8 @@ namespace RatPlusTat.Invoicing
if (invoice != null)
{
invoice.InvoiceBase.InvoiceId = "Alltag";
if (catName.Contains("Selbstzahlung"))
invoice.InvoiceBase.InvoiceTypeText = "Selbstzahlung";
invoiceList.Add(invoice);
invoiceCounter++;
}
@@ -99,6 +101,33 @@ namespace RatPlusTat.Invoicing
base.SetInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConceptList);
}
public override void SetRecipientInformation(ServiceInvoice serviceInvoice, CostBearer costBearer)
{
if (costBearer.Organisation.InvoiceAddress != null)
{
serviceInvoice.InvoiceBase.RecipientAddress = costBearer.Organisation.InvoiceAddress.CopyToNew();
}
else if (costBearer.Organisation.Address != null)
{
serviceInvoice.InvoiceBase.RecipientAddress = costBearer.Organisation.Address.CopyToNew();
}
serviceInvoice.InvoiceBase.RecipientDivision = costBearer.Organisation.Name2;
serviceInvoice.InvoiceBase.RecipientOrganisationOid = costBearer.Organisation.Oid;
serviceInvoice.InvoiceBase.RecipientOrganisation = costBearer.Organisation.Name;
serviceInvoice.InvoiceBase.RecipientContacts = costBearer.Organisation.Contacts.Select(i => i.CopyToNew()).ToList();
serviceInvoice.InvoiceBase.RecipientCostBearerOid = costBearer.Oid;
//serviceInvoice.InvoiceBase. = c2s.CostBearer.Organisation.Contacts.FirstOrDefault(f => f.Type.Equals(ContactType.business_POBox)) != null ? c2s.CostBearer.Organisation.Contacts.FirstOrDefault(f => f.Type.Equals(ContactType.business_POBox)).Value : String.Empty;
if (serviceInvoice.InvoiceBase.CostBearer2SupportConcept != null &&
serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson != null)
{
serviceInvoice.InvoiceBase.RecipientPersonFirstName = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson.FirstName;
serviceInvoice.InvoiceBase.RecipientPersonLastName = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson.LastName;
}
}
public override void SetServiceInvoicePeriods(ServiceInvoice invoice, CostBearer2SupportConcept costBearer2SupportConcept,
DateTimeSpan invoicePeriod, List<ServiceRecordDC> serviceRecords)
{
@@ -138,8 +167,8 @@ namespace RatPlusTat.Invoicing
public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc)
{
if (!iServiceRecord.ServiceDescription.CategoryName.Contains("Betreuung") && !iServiceRecord.ServiceDescription.CategoryName.Contains("Verhinderungspflege")
&& !iServiceRecord.ServiceDescription.CategoryName.Contains("Umwandlungsanspruch"))
if (!iServiceRecord.ServiceDescription.CategoryName.Contains("Betreuung") && !iServiceRecord.ServiceDescription.CategoryName.Contains("Selbstzahlung") &&
!iServiceRecord.ServiceDescription.CategoryName.Contains("Verhinderungspflege") && !iServiceRecord.ServiceDescription.CategoryName.Contains("Umwandlungsanspruch"))
return null;
var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc);

4
ReportImp/RatPlusTat/Invoicing/CustomInvoiceFactory.cs
View File

@@ -30,8 +30,10 @@ namespace RatPlusTat.Invoicing
String cat = sd.Name.ToLower().Trim();
if (cat.IndexOf("assistenz") >= 0)
return new CustomAssistenzInvoiceCreation();
if (cat.Contains("betreuung") || cat.Contains("Umwandlungsanspruch") || cat.Contains("Verhinderungspflege"))
if (cat.Contains("betreuung") || cat.Contains("Umwandlungsanspruch") || cat.Contains("Verhinderungspflege") || cat.Contains("selbst"))
return new CustomAlltagsunterstuetzungsInvoiceCreation();
//if (cat.Contains("selbst"))
// return new CustomSelbstzahlerInvoiceCreation();
}
return null;
}

20
ReportImp/RatPlusTat/QuittierungsbelegPflegekasse.Designer.cs generated
View File

@@ -58,6 +58,7 @@ namespace RatPlusTat
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
@@ -88,7 +89,7 @@ namespace RatPlusTat
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.chkSelbstzahler = new DevExpress.XtraReports.UI.XRCheckBox();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -460,6 +461,10 @@ namespace RatPlusTat
this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell43.Weight = 0.55827160530189857D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -647,6 +652,7 @@ namespace RatPlusTat
// topMarginBand1
//
this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.chkSelbstzahler,
this.chkAssistenz,
this.chkEntlastung,
this.chkBeratung,
@@ -690,7 +696,7 @@ namespace RatPlusTat
this.chkUmwandlung.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.chkUmwandlung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 112.5F);
this.chkUmwandlung.Name = "chkUmwandlung";
this.chkUmwandlung.SizeF = new System.Drawing.SizeF(229.833F, 21.875F);
this.chkUmwandlung.SizeF = new System.Drawing.SizeF(229.4998F, 21.875F);
this.chkUmwandlung.StylePriority.UseFont = false;
this.chkUmwandlung.Text = "Umwandlungsanspruch";
//
@@ -843,9 +849,14 @@ namespace RatPlusTat
this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.fieldKontaktArt.Name = "fieldKontaktArt";
//
// bindingSource1
// chkSelbstzahler
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
this.chkSelbstzahler.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.chkSelbstzahler.LocationFloat = new DevExpress.Utils.PointFloat(229.4998F, 112.5F);
this.chkSelbstzahler.Name = "chkSelbstzahler";
this.chkSelbstzahler.SizeF = new System.Drawing.SizeF(115.2496F, 21.875F);
this.chkSelbstzahler.StylePriority.UseFont = false;
this.chkSelbstzahler.Text = "Selbstzahler";
//
// QuittierungsbelegPflegekasse
//
@@ -937,5 +948,6 @@ namespace RatPlusTat
private DevExpress.XtraReports.UI.XRCheckBox chkUmwandlung;
private DevExpress.XtraReports.UI.XRCheckBox chkVerhinderung;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRCheckBox chkSelbstzahler;
}
}

2
ReportImp/RatPlusTat/QuittierungsbelegPflegekasse.cs
View File

@@ -37,6 +37,8 @@ namespace RatPlusTat
chkEntlastung.Checked = true;
if (sd.ServiceCategory.Contains("Beratung"))
chkBeratung.Checked = true;
if (sd.ServiceCategory.Contains("Selbstzahlung"))
chkSelbstzahler.Checked = true;
if (sd.ServiceCategory.Contains("Umwandlung"))
chkUmwandlung.Checked = true;
if (sd.ServiceCategory.Contains("Verhinderung"))

12
ReportImp/RatPlusTat/RatPlusTatReportCreator.cs
View File

@@ -56,16 +56,19 @@ namespace RatPlusTat
ServicesOverviewRO bewoRo = ServicesOverviewRO.CopyFromRO(ro);
ServicesOverviewRO betreuungRo = ServicesOverviewRO.CopyFromRO(ro);
ServicesOverviewRO umwandlungRo = ServicesOverviewRO.CopyFromRO(ro);
ServicesOverviewRO selbstRo = ServicesOverviewRO.CopyFromRO(ro);
ServicesOverviewRO umwandlungRo = ServicesOverviewRO.CopyFromRO(ro);
ServicesOverviewRO verhinderungRo = ServicesOverviewRO.CopyFromRO(ro);
ServicesOverviewRO assistenzRo = ServicesOverviewRO.CopyFromRO(ro);
bewoRo.TotalFLMBillable = 0;
betreuungRo.TotalFLMBillable = 0;
selbstRo.TotalFLMBillable = 0;
umwandlungRo.TotalFLMBillable = 0;
verhinderungRo.TotalFLMBillable = 0;
assistenzRo.TotalFLMBillable = 0;
bewoRo.TotalFLS = 0;
betreuungRo.TotalFLS = 0;
selbstRo.TotalFLS = 0;
umwandlungRo.TotalFLS = 0;
verhinderungRo.TotalFLS = 0;
assistenzRo.TotalFLS = 0;
@@ -104,10 +107,17 @@ namespace RatPlusTat
assistenzRo.TotalFLMBillable += s.Minutes;
assistenzRo.TotalFLS += s.Minutes / 60;
}
else if (s.ServiceCategory.ToLower().Contains("selbst"))
{
selbstRo.Services.Add(s);
selbstRo.TotalFLMBillable += s.Minutes;
selbstRo.TotalFLS += s.Minutes / 60;
}
}
}
report = AddReportToReport<Quittierungsbeleg>(report, bewoRo);
report = AddReportToReport<QuittierungsbelegPflegekasse>(report, betreuungRo);
report = AddReportToReport<QuittierungsbelegPflegekasse>(report, selbstRo);
report = AddReportToReport<QuittierungsbelegPflegekasse>(report, umwandlungRo);
report = AddReportToReport<QuittierungsbelegPflegekasse>(report, verhinderungRo);
report = AddReportToReport<QuittierungsbelegPflegekasse>(report, assistenzRo);

38
ReportImp/RatPlusTat/RechungAlltagsunterstuetzung.Designer.cs generated
View File

@@ -42,7 +42,7 @@ namespace RatPlusTat
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.lblCustomer = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -209,7 +209,7 @@ namespace RatPlusTat
// Page1
//
this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel1,
this.lblCustomer,
this.xrTable4,
this.xrRichText2,
this.xrLabel8,
@@ -218,23 +218,23 @@ namespace RatPlusTat
this.lblBetreff,
this.xrLabel2});
this.Page1.Font = new System.Drawing.Font("Arial", 10F);
this.Page1.HeightF = 341.9516F;
this.Page1.HeightF = 381.535F;
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
// xrLabel1
// lblCustomer
//
this.xrLabel1.BackColor = System.Drawing.Color.Transparent;
this.xrLabel1.CanShrink = true;
this.xrLabel1.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 245.62F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(650F, 36.62997F);
this.xrLabel1.StylePriority.UseBackColor = false;
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "[CustomerName], [CustomerStreet], [CustomerPostalCode] [CustomerTown], *[Customer" +
this.lblCustomer.BackColor = System.Drawing.Color.Transparent;
this.lblCustomer.CanShrink = true;
this.lblCustomer.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblCustomer.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 294.5783F);
this.lblCustomer.Multiline = true;
this.lblCustomer.Name = "lblCustomer";
this.lblCustomer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblCustomer.SizeF = new System.Drawing.SizeF(650F, 36.62997F);
this.lblCustomer.StylePriority.UseBackColor = false;
this.lblCustomer.StylePriority.UseFont = false;
this.lblCustomer.Text = "[CustomerName], [CustomerStreet], [CustomerPostalCode] [CustomerTown], *[Customer" +
"Birthdate!dd.MM.yyyy]";
//
// xrTable4
@@ -433,7 +433,7 @@ namespace RatPlusTat
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 282.25F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 331.2083F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -448,7 +448,7 @@ namespace RatPlusTat
this.lblBetreff.BackColor = System.Drawing.Color.Transparent;
this.lblBetreff.CanShrink = true;
this.lblBetreff.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblBetreff.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 228.62F);
this.lblBetreff.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 277.5784F);
this.lblBetreff.Multiline = true;
this.lblBetreff.Name = "lblBetreff";
this.lblBetreff.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -462,7 +462,7 @@ namespace RatPlusTat
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 240.9583F);
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);
@@ -906,6 +906,6 @@ namespace RatPlusTat
private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRLabel lblCustomer;
}
}

13
ReportImp/RatPlusTat/RechungAlltagsunterstuetzung.cs
View File

@@ -54,7 +54,18 @@ namespace RatPlusTat
lblBetreff.Text = "Umwandlungsanspruch nach § 45a Abs. 4 SGB XI";
lblLeistung.Text = "Betreuung lt. Doku";
}
}
if (i.ServiceDescription.Contains("Selbstzahlung"))
{
lblBetreff.Text = "Abrechnungen über Betreuungsleistungen";
lblLeistung.Text = "Selbstzahlung lt. Doku";
lblCustomer.Text = "";
xrTableCell3.Text = "";
xrTableCell6.Text = "";
xrTableCell4.Text = pRO.CustomerName;
xrTableCell7.Text = pRO.CustomerStreet;
xrTableCell8.Text = pRO.CustomerPostalCode + " " + pRO.CustomerTown;
}
}
}
}
}

6
ReportImp/RatPlusTat/RechungAssistenz.Designer.cs generated
View File

@@ -158,7 +158,7 @@ namespace RatPlusTat
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 100F;
this.topMarginBand1.HeightF = 99F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
@@ -464,7 +464,7 @@ namespace RatPlusTat
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 228.62F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 228.62F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -847,7 +847,7 @@ namespace RatPlusTat
this.Font = new System.Drawing.Font("Verdana", 10F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(87, 74, 100, 120);
this.Margins = new System.Drawing.Printing.Margins(87, 75, 99, 120);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;

4
Service/Plugins/PluginLoader.cs
View File

@@ -265,7 +265,7 @@ namespace BeWo.Service.Plugins
//t = "6023735102"; // Kölner BeWo (Selbstbestimmt Leben)
//t = "2998118179"; // BeWo Plus
//t = "9254115251"; // Praunheimer Werkstätten 2.DB
t = "5880845152"; // Bewegt Systemische Beratung und Begleitung (Kathrin Lilly)
//t = "5880845152"; // Bewegt Systemische Beratung und Begleitung (Kathrin Lilly)
//t = "5798370140"; // Team Pfeil
//t = "8242644560"; // Bewolonia - Fr. Sultan Schulz
//t = "4817284046"; // Verein für Sozialmedizin Stade e.V.
@@ -298,7 +298,7 @@ namespace BeWo.Service.Plugins
//t = "5537187628"; // Verband Ev. Kirchengemeinden Dorsten
//t = "8375099271"; // Neustart - Ambulant Betreutes Wohnen
//t = "5478434972"; // LebensWert - Kai Lippel
//t = "5381886394"; // PZDDuesseldorf
t = "5381886394"; // PZDDuesseldorf
//t = "3640152169"; // Claudia Charisius
//t = "3884496709"; // Wahl e.V.
//t = "3536079480"; // Behindertenhilfe Menden