Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo into master
This commit is contained in:
@@ -55,6 +55,24 @@
|
||||
<Compile Include="Quittierungsbeleg.Designer.cs">
|
||||
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="RechungAssistenz.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="RechungAssistenz.Designer.cs">
|
||||
<DependentUpon>RechungAssistenz.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="RechungTeilhabe.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="RechungTeilhabe.Designer.cs">
|
||||
<DependentUpon>RechungTeilhabe.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Rechung.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Rechung.Designer.cs">
|
||||
<DependentUpon>Rechung.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ServiceInvoiceReport.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
@@ -86,6 +104,18 @@
|
||||
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="RechungAssistenz.resx">
|
||||
<DependentUpon>RechungAssistenz.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="RechungTeilhabe.resx">
|
||||
<DependentUpon>RechungTeilhabe.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Rechung.resx">
|
||||
<DependentUpon>Rechung.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="ServiceInvoiceReport.resx">
|
||||
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
|
||||
@@ -690,7 +690,7 @@ namespace AwoKreisverbandPloen
|
||||
//
|
||||
this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Right;
|
||||
this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F);
|
||||
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(276.25F, 0F);
|
||||
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(170F, 0F);
|
||||
this.xrLabel9.Name = "xrLabel9";
|
||||
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
|
||||
this.xrLabel9.SizeF = new System.Drawing.SizeF(75F, 20F);
|
||||
@@ -711,7 +711,7 @@ namespace AwoKreisverbandPloen
|
||||
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(95.00002F, 0F);
|
||||
this.xrLabel1.Name = "xrLabel1";
|
||||
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
|
||||
this.xrLabel1.SizeF = new System.Drawing.SizeF(85F, 20F);
|
||||
this.xrLabel1.SizeF = new System.Drawing.SizeF(75F, 20F);
|
||||
this.xrLabel1.StylePriority.UseBackColor = false;
|
||||
this.xrLabel1.StylePriority.UseBorders = false;
|
||||
this.xrLabel1.StylePriority.UseFont = false;
|
||||
|
||||
@@ -49,67 +49,11 @@ namespace AwoKreisverbandPloen
|
||||
|
||||
pRO.Services = servicesBillable;
|
||||
}
|
||||
|
||||
if (String.IsNullOrWhiteSpace(pRO.AbsenceTimes))
|
||||
{
|
||||
lblHatAbwesenheiten.Text = "X";
|
||||
}
|
||||
|
||||
if (!hatGruppen)
|
||||
{
|
||||
lblHatGruppen.Text = "X";
|
||||
}
|
||||
|
||||
ErstelleAbwesenheitenTabelle(pRO);
|
||||
|
||||
bindingSource1.DataSource = pRO;
|
||||
}
|
||||
|
||||
private void ErstelleAbwesenheitenTabelle(ServicesOverviewRO pRo)
|
||||
{
|
||||
if (pRo.Abwesenheiten != null)
|
||||
{
|
||||
int newRows = 0;
|
||||
int index = 1;
|
||||
foreach (var at in pRo.Abwesenheiten)
|
||||
{
|
||||
DevExpress.XtraReports.UI.XRTableRow row = null;
|
||||
if (index < xrTableAbwesenheiten.Rows.Count)
|
||||
{
|
||||
row = xrTableAbwesenheiten.Rows[index];
|
||||
}
|
||||
else
|
||||
{
|
||||
row = xrTableAbwesenheiten.InsertRowBelow(xrTableAbwesenheiten.Rows[xrTableAbwesenheiten.Rows.Count - 1]);
|
||||
newRows++;
|
||||
}
|
||||
|
||||
row.Cells[0].Text = String.Format("{0:dd.MM.yyyy}", at.Start);
|
||||
int? days = null;
|
||||
|
||||
if (at.End.HasValue)
|
||||
{
|
||||
row.Cells[1].Text = String.Format("{0:dd.MM.yyyy}", at.End);
|
||||
days = (int)at.End.Value.Subtract(at.Start.Value).TotalDays + 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
row.Cells[1].Text = "unbekannt";
|
||||
}
|
||||
|
||||
row.Cells[2].Text = String.Format("{0:0}", days);
|
||||
|
||||
index++;
|
||||
}
|
||||
|
||||
if (newRows > 0)
|
||||
{
|
||||
lblUnterschriftKlient.Top += newRows * 20;
|
||||
lblUnterschriftMitarbeiter.Top += newRows * 20;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// TODO: Wie anzeigen? Alle?
|
||||
private void EmployeeSignature_BeforePrint(object sender, System.Drawing.Printing.PrintEventArgs e)
|
||||
{
|
||||
|
||||
@@ -8,7 +8,6 @@ namespace BehindertenhilfeMenden
|
||||
{
|
||||
public class CustomMitarbeiterstundenkontoBerechnung : MitarbeiterstundenkontoBerechnung
|
||||
{
|
||||
|
||||
public override bool ShouldCreateDayDetails()
|
||||
{
|
||||
return true;
|
||||
@@ -103,13 +102,13 @@ namespace BehindertenhilfeMenden
|
||||
return sum;
|
||||
}
|
||||
|
||||
//public override List<DateTime> GetFeiertage(int year)
|
||||
//{
|
||||
// var list = base.GetFeiertage(year);
|
||||
public override List<DateTime> GetFeiertage(int year)
|
||||
{
|
||||
var list = base.GetFeiertage(year);
|
||||
|
||||
// list.Add(new DateTime(year, 12, 31));
|
||||
list.Add(new DateTime(year, 12, 31)); //, "Sylvester"));
|
||||
|
||||
// return list;
|
||||
//}
|
||||
return list;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +1,18 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using BeWo.Data.Access;
|
||||
using BeWo.Data.Entities;
|
||||
using BeWo.Report;
|
||||
using BeWo.Report.ReportObjects;
|
||||
using BeWo.Service.DCEntityMapper;
|
||||
using BeWo.Service.Plugins;
|
||||
using BeWo.Service.ServiceContracts;
|
||||
using BeWo.Service.ServiceImplementations;
|
||||
using BS.Shared;
|
||||
using BS.Shared.Core;
|
||||
|
||||
using BS.Shared.Extensions;
|
||||
using BS.Shared.Services;
|
||||
|
||||
namespace BetreuungsbueroBaak
|
||||
{
|
||||
@@ -23,21 +31,76 @@ namespace BetreuungsbueroBaak
|
||||
AuslastungBerechnung b = new AuslastungBerechnung();
|
||||
b.CreateReport(pRO);
|
||||
|
||||
decimal flsSollGesamt = 0;
|
||||
decimal flsPlusMinusGesamt = 0;
|
||||
decimal flsIst = 0;
|
||||
decimal weeksTotal;
|
||||
decimal weeksToReport;
|
||||
|
||||
AnalysisServiceImp analysisService = new AnalysisServiceImp();
|
||||
|
||||
foreach (var ed in pRO.EmployeeDetailList)
|
||||
{
|
||||
foreach (var sc in ed.SupportConceptDetailList)
|
||||
{
|
||||
decimal timeSum = 0;
|
||||
foreach (var sr in sc.CostBearer2SupportConcept.ServiceRecords)
|
||||
if (ed.SupportConceptDetailList != null)
|
||||
{
|
||||
foreach (var sc in ed.SupportConceptDetailList)
|
||||
{
|
||||
if (sr.EmployeeOid == ed.Employee.Oid && sr.Start >= pRO.ReportStartDate && sr.End <= pRO.ReportEndDate)
|
||||
//if (sr.ServiceDescription.Name.ToLower().Contains("face"))
|
||||
timeSum += sr.RoundedDuration / 60;
|
||||
if (sc.CostBearer2SupportConcept != null)
|
||||
{
|
||||
var rel = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(sc.CostBearer2SupportConcept);
|
||||
Calculations calc = PluginLoader.FindClass<Calculations>(sc.CostBearer2SupportConcept.CostBearer.ID) ?? Calculations.GetInstance(sc.CostBearer2SupportConcept.CostBearer.ID);
|
||||
flsSollGesamt = calc.GetApprovedHoursTotal(rel, false) ?? 0;
|
||||
weeksTotal = calc.GetDurationInWeeks(rel) ?? 0;
|
||||
weeksToReport = Math.Round(calc.GetDurationInWeeksTillNow(rel, pRO.ReportEndDate.AddDays(-1)) ?? 0, 2, MidpointRounding.AwayFromZero);
|
||||
|
||||
flsIst = CreateIst(sc, pRO.ReportEndDate) / 60;
|
||||
flsPlusMinusGesamt = flsSollGesamt - flsIst;
|
||||
if (weeksTotal - weeksToReport > 0)
|
||||
sc.DirectIst = flsPlusMinusGesamt / (weeksTotal - weeksToReport);
|
||||
else
|
||||
sc.DirectIst = flsPlusMinusGesamt;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
this.bindingSource1.DataSource = pRO;
|
||||
}
|
||||
private decimal CreateIst(MitarbeiterauslastungRO.SupportConceptDetail sd, DateTime reportEndDate)
|
||||
{
|
||||
|
||||
if (sd.CostBearer2SupportConcept == null || !sd.CostBearer2SupportConcept.Oid.HasValue)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
decimal minutes = 0;
|
||||
|
||||
IList<ServiceRecord> records = DAOFactory.SearchDAO.FindServiceRecordsDetailsForLastDays(sd.CostBearer2SupportConcept.Oid.Value, null); ;
|
||||
Dictionary<long, bool> groupOids = new Dictionary<long, bool>();
|
||||
|
||||
Dictionary<long, bool> srOids = new Dictionary<long, bool>();
|
||||
foreach (ServiceRecord sr in records)
|
||||
{
|
||||
if (!srOids.ContainsKey(sr.Oid.Value))
|
||||
{
|
||||
srOids.Add(sr.Oid.Value, true);
|
||||
|
||||
if (sr.Start.Value < reportEndDate)
|
||||
{
|
||||
if (!sr.GroupOid.HasValue || !groupOids.ContainsKey(sr.GroupOid.Value))
|
||||
{
|
||||
if (sr.GroupOid.HasValue)
|
||||
groupOids.Add(sr.GroupOid.Value, true);
|
||||
|
||||
if (sr.ServiceDescription != null && sr.ServiceDescription.ServiceCategory.Name.ToLower().Contains("fachleistung") &&
|
||||
sr.ServiceDescription.ServiceCategory.IsBillable)
|
||||
minutes += sr.RoundedDuration;
|
||||
}
|
||||
}
|
||||
sc.DirectIst = Math.Round(timeSum / 4.33m, 2);
|
||||
}
|
||||
}
|
||||
this.bindingSource1.DataSource = pRO;
|
||||
|
||||
return minutes;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,6 +41,7 @@ namespace BetreuungsbueroBaak
|
||||
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
|
||||
this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
|
||||
this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
|
||||
@@ -51,6 +52,7 @@ namespace BetreuungsbueroBaak
|
||||
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
|
||||
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
|
||||
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
|
||||
@@ -58,7 +60,7 @@ namespace BetreuungsbueroBaak
|
||||
this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
|
||||
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
|
||||
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
|
||||
@@ -73,9 +75,7 @@ namespace BetreuungsbueroBaak
|
||||
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
|
||||
this.fieldTotalSC = new DevExpress.XtraReports.UI.CalculatedField();
|
||||
this.fieldTotalEmp = new DevExpress.XtraReports.UI.CalculatedField();
|
||||
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell8 = 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.xrTableDetail)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
|
||||
@@ -192,6 +192,13 @@ namespace BetreuungsbueroBaak
|
||||
this.xrTableCell28.Text = "xrTableCell28";
|
||||
this.xrTableCell28.Weight = 0.064810585180201719D;
|
||||
//
|
||||
// xrTableCell8
|
||||
//
|
||||
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.DirectIst", "{0:0.00}")});
|
||||
this.xrTableCell8.Name = "xrTableCell8";
|
||||
this.xrTableCell8.Weight = 0.064810585180201719D;
|
||||
//
|
||||
// DetailReport
|
||||
//
|
||||
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
|
||||
@@ -286,6 +293,12 @@ namespace BetreuungsbueroBaak
|
||||
this.xrTableCell9.Text = "Bewilligt/ Woche";
|
||||
this.xrTableCell9.Weight = 0.0648106406194755D;
|
||||
//
|
||||
// xrTableCell7
|
||||
//
|
||||
this.xrTableCell7.Name = "xrTableCell7";
|
||||
this.xrTableCell7.Text = "restl. FLS /Woche";
|
||||
this.xrTableCell7.Weight = 0.064810530547056586D;
|
||||
//
|
||||
// GroupFooter1
|
||||
//
|
||||
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
@@ -349,9 +362,15 @@ namespace BetreuungsbueroBaak
|
||||
this.cellSollGesamt.Text = "cellSollGesamt";
|
||||
this.cellSollGesamt.Weight = 0.064810766208211384D;
|
||||
//
|
||||
// bindingSource1
|
||||
// xrTableCell10
|
||||
//
|
||||
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterauslastungRO);
|
||||
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.DirectIst")});
|
||||
this.xrTableCell10.Name = "xrTableCell10";
|
||||
xrSummary1.FormatString = "{0:0.00}";
|
||||
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
|
||||
this.xrTableCell10.Summary = xrSummary1;
|
||||
this.xrTableCell10.Weight = 0.064810766208211384D;
|
||||
//
|
||||
// ReportHeader
|
||||
//
|
||||
@@ -473,29 +492,9 @@ namespace BetreuungsbueroBaak
|
||||
this.fieldTotalEmp.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
|
||||
this.fieldTotalEmp.Name = "fieldTotalEmp";
|
||||
//
|
||||
// xrTableCell7
|
||||
// bindingSource1
|
||||
//
|
||||
this.xrTableCell7.Name = "xrTableCell7";
|
||||
this.xrTableCell7.Text = "Ist / Woche";
|
||||
this.xrTableCell7.Weight = 0.064810530547056586D;
|
||||
//
|
||||
// xrTableCell8
|
||||
//
|
||||
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.DirectIst")});
|
||||
this.xrTableCell8.Name = "xrTableCell8";
|
||||
this.xrTableCell8.Text = "xrTableCell8";
|
||||
this.xrTableCell8.Weight = 0.064810585180201719D;
|
||||
//
|
||||
// xrTableCell10
|
||||
//
|
||||
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.DirectIst")});
|
||||
this.xrTableCell10.Name = "xrTableCell10";
|
||||
xrSummary1.FormatString = "{0:0.00}";
|
||||
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
|
||||
this.xrTableCell10.Summary = xrSummary1;
|
||||
this.xrTableCell10.Weight = 0.064810766208211384D;
|
||||
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterauslastungRO);
|
||||
//
|
||||
// Mitarbeiterauslastung
|
||||
//
|
||||
|
||||
@@ -89,10 +89,9 @@ namespace LebenshilfeDorsten
|
||||
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLine3 = new DevExpress.XtraReports.UI.XRLine();
|
||||
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
|
||||
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLine2 = new DevExpress.XtraReports.UI.XRLine();
|
||||
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
|
||||
((System.ComponentModel.ISupportInitialize)(this.tableRechnungspositionen)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
|
||||
@@ -185,7 +184,7 @@ namespace LebenshilfeDorsten
|
||||
//
|
||||
// xrLine1
|
||||
//
|
||||
this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 288.755F);
|
||||
this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 262.7134F);
|
||||
this.xrLine1.Name = "xrLine1";
|
||||
this.xrLine1.SizeF = new System.Drawing.SizeF(292.2076F, 9.749969F);
|
||||
//
|
||||
@@ -586,7 +585,6 @@ namespace LebenshilfeDorsten
|
||||
// GroupFooter2
|
||||
//
|
||||
this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrLabel4,
|
||||
this.xrLabel3,
|
||||
this.xrLine3,
|
||||
this.xrLabel2,
|
||||
@@ -597,7 +595,7 @@ namespace LebenshilfeDorsten
|
||||
this.xrLabel17,
|
||||
this.xrCheckBox1});
|
||||
this.GroupFooter2.Font = new System.Drawing.Font("Arial", 11F);
|
||||
this.GroupFooter2.HeightF = 388.8175F;
|
||||
this.GroupFooter2.HeightF = 388.8176F;
|
||||
this.GroupFooter2.Level = 1;
|
||||
this.GroupFooter2.Name = "GroupFooter2";
|
||||
this.GroupFooter2.StylePriority.UseFont = false;
|
||||
@@ -605,7 +603,7 @@ namespace LebenshilfeDorsten
|
||||
// xrLabel3
|
||||
//
|
||||
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(404.7925F, 298.505F);
|
||||
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(409.7925F, 272.4633F);
|
||||
this.xrLabel3.Multiline = true;
|
||||
this.xrLabel3.Name = "xrLabel3";
|
||||
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
@@ -616,14 +614,14 @@ namespace LebenshilfeDorsten
|
||||
//
|
||||
// xrLine3
|
||||
//
|
||||
this.xrLine3.LocationFloat = new DevExpress.Utils.PointFloat(404.7925F, 288.7551F);
|
||||
this.xrLine3.LocationFloat = new DevExpress.Utils.PointFloat(409.7925F, 262.7134F);
|
||||
this.xrLine3.Name = "xrLine3";
|
||||
this.xrLine3.SizeF = new System.Drawing.SizeF(292.2076F, 9.749969F);
|
||||
//
|
||||
// xrLabel2
|
||||
//
|
||||
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 298.505F);
|
||||
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 272.4633F);
|
||||
this.xrLabel2.Multiline = true;
|
||||
this.xrLabel2.Name = "xrLabel2";
|
||||
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
@@ -632,25 +630,9 @@ namespace LebenshilfeDorsten
|
||||
this.xrLabel2.StylePriority.UseFont = false;
|
||||
this.xrLabel2.Text = "Antonius von Hebel\r\nGeschäftsführer";
|
||||
//
|
||||
// bindingSource1
|
||||
//
|
||||
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
|
||||
//
|
||||
// xrLabel4
|
||||
//
|
||||
this.xrLabel4.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
|
||||
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 170.7134F);
|
||||
this.xrLabel4.Multiline = true;
|
||||
this.xrLabel4.Name = "xrLabel4";
|
||||
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
|
||||
this.xrLabel4.SizeF = new System.Drawing.SizeF(663.5623F, 81.58331F);
|
||||
this.xrLabel4.StylePriority.UseFont = false;
|
||||
this.xrLabel4.Text = resources.GetString("xrLabel4.Text");
|
||||
//
|
||||
// xrLine2
|
||||
//
|
||||
this.xrLine2.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 351.9843F);
|
||||
this.xrLine2.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 325.9426F);
|
||||
this.xrLine2.Name = "xrLine2";
|
||||
this.xrLine2.SizeF = new System.Drawing.SizeF(270F, 9.75F);
|
||||
//
|
||||
@@ -658,7 +640,7 @@ namespace LebenshilfeDorsten
|
||||
//
|
||||
this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
|
||||
this.xrLabel17.Font = new System.Drawing.Font("Arial", 10F);
|
||||
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 361.7343F);
|
||||
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 335.6926F);
|
||||
this.xrLabel17.Multiline = true;
|
||||
this.xrLabel17.Name = "xrLabel17";
|
||||
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
@@ -667,6 +649,10 @@ namespace LebenshilfeDorsten
|
||||
this.xrLabel17.StylePriority.UseFont = false;
|
||||
this.xrLabel17.Text = "¹vom LWL gesondert bewilligte Leistungen zur Deckung eines einmaligen Bedarfs";
|
||||
//
|
||||
// bindingSource1
|
||||
//
|
||||
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
|
||||
//
|
||||
// Budgetnachweis
|
||||
//
|
||||
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
|
||||
@@ -754,7 +740,6 @@ namespace LebenshilfeDorsten
|
||||
private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
|
||||
private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
|
||||
private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
|
||||
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
|
||||
private DevExpress.XtraReports.UI.XRLine xrLine2;
|
||||
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
|
||||
}
|
||||
|
||||
@@ -120,11 +120,6 @@
|
||||
<data name="xrLabel12.Text" xml:space="preserve">
|
||||
<value>Hiermit wird erklärt, dass die Verpflichtungen aus den Vereinbarungen nach §§75 ff. SGB XII bzw. §§125 ff. SGB IX eingehalten wurden und alle hier gemachten Angaben je Betreuungskontakt anhand der Quittierungsbelege sowie der Betreuungsdokumentation jederzeit nachgewiesen werden können. Diese Unterlagen sind 5 Jahre aufzubewahren und auf Verlangen des Sozialhilfeträgers bzw. des Trägers der Eingliederungshilfe vorzulegen (§2 Abs.1 der Vergütungsvereinbarung).</value>
|
||||
</data>
|
||||
<data name="xrLabel4.Text" xml:space="preserve">
|
||||
<value>Sollte sich bei der Abrechnung der FLS ein Auszahlungsbetrag zu unseren Gunsten ergeben, bitten wir um Erstattung auf folgendes Konto:
|
||||
|
||||
Kreditinstitut: Sparkasse Münsterland Ost IBAN: DE12 8888 8888 8888 8888 25</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>
|
||||
|
||||
1398
ReportImp/LebenshilfeDorsten/BudgetnachweisAnhang.Designer.cs
generated
Normal file
1398
ReportImp/LebenshilfeDorsten/BudgetnachweisAnhang.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
26
ReportImp/LebenshilfeDorsten/BudgetnachweisAnhang.cs
Normal file
26
ReportImp/LebenshilfeDorsten/BudgetnachweisAnhang.cs
Normal file
@@ -0,0 +1,26 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
using BeWo.Report;
|
||||
using BeWo.Report.ReportObjects;
|
||||
|
||||
namespace LebenshilfeDorsten
|
||||
{
|
||||
public partial class BudgetnachweisAnhang : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<BudgetnachweisAnhangRO>
|
||||
{
|
||||
public BudgetnachweisAnhang()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
public void SetReportDataSource(BudgetnachweisAnhangRO pRO)
|
||||
{
|
||||
if (!String.IsNullOrEmpty(pRO.CustomerDC.LastName))
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
bindingSource1.DataSource = pRO;
|
||||
}
|
||||
}
|
||||
}
|
||||
126
ReportImp/LebenshilfeDorsten/BudgetnachweisAnhang.resx
Normal file
126
ReportImp/LebenshilfeDorsten/BudgetnachweisAnhang.resx
Normal file
@@ -0,0 +1,126 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<data name="xrLabel1.Text" xml:space="preserve">
|
||||
<value>Über den Budgetnachweis werden auf Grundlage der Quittierungsbelege im nachstehenden Umfang folgende, im direkten Betreuungskontakt erbrachte Minuten zur Abrechnung beantragt (direkte Fachleistungsminuten = D-FLMin). Die Summe der D-FLMin wird in direkte Fachleistungsstunden (D-FLS) umgerechnet.</value>
|
||||
</data>
|
||||
</root>
|
||||
22
ReportImp/LebenshilfeDorsten/CustomReportCreator.cs
Normal file
22
ReportImp/LebenshilfeDorsten/CustomReportCreator.cs
Normal file
@@ -0,0 +1,22 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using BeWo.Data.Access;
|
||||
using BeWo.Data.Entities;
|
||||
using BeWo.Report;
|
||||
using BeWo.Report.ReportObjects;
|
||||
using DevExpress.XtraReports.Design;
|
||||
using DevExpress.XtraReports.UI;
|
||||
|
||||
namespace LebenshilfeDorsten
|
||||
{
|
||||
public class CustomReportCreator : DefaultReportCreator
|
||||
{
|
||||
public override XtraReport CreateSettlementReport(string dcId, long? invoiceBaseOid)
|
||||
{
|
||||
return base.CreateSettlementReport(dcId, invoiceBaseOid, true);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -54,7 +54,14 @@
|
||||
<Compile Include="Budgetnachweis.Designer.cs">
|
||||
<DependentUpon>Budgetnachweis.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="BudgetnachweisAnhang.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="BudgetnachweisAnhang.Designer.cs">
|
||||
<DependentUpon>BudgetnachweisAnhang.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Calculations\GroupDurationCalculator.cs" />
|
||||
<Compile Include="CustomReportCreator.cs" />
|
||||
<Compile Include="CustomSupportConceptAnalysisCreator.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="Quittierungsbeleg.cs">
|
||||
@@ -87,6 +94,10 @@
|
||||
<DependentUpon>Budgetnachweis.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="BudgetnachweisAnhang.resx">
|
||||
<DependentUpon>BudgetnachweisAnhang.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Properties\licenses.licx" />
|
||||
<EmbeddedResource Include="Quittierungsbeleg.resx">
|
||||
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
|
||||
|
||||
Reference in New Issue
Block a user