cb reports

This commit is contained in:
Christian
2019-11-24 15:33:32 +01:00
parent 64164c5ffa
commit 69b08da55b
26 changed files with 11685 additions and 422 deletions

View File

@@ -82,6 +82,12 @@
<DependentUpon>BetreuteKlienten.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServiceInvoiceReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ServiceInvoiceReport.Designer.cs">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
</Compile>
<Compile Include="ServicesOverviewReport.cs">
<SubType>Component</SubType>
</Compile>
@@ -113,6 +119,10 @@
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="ServiceInvoiceReport.resx">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ServicesOverviewReport.resx">
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
<SubType>Designer</SubType>

View File

@@ -26,7 +26,12 @@ namespace AlphaEv
var report = new MitarbeiterstundenkontoJahr();
var jahrStart = new DateTime(startDate.Year, 1, 1);
var ds = new MitarbeiterstundenkontoMonateRO(employeeOid, teamOids, jahrStart, endDate, null);
report.SetReportDataSource(ds);
//var msb = new CustomMitarbeiterstundenkontoBerechnungMonate();
//msb.CreateReport(ds);
report.SetReportDataSource(ds);
return report;
}

View File

@@ -34,26 +34,28 @@ namespace AlphaEv
{
ed.EmployeeDetail.StundenGesamtIst = (Math.Round(ed.EmployeeDetail.FlsIst, 2, MidpointRounding.AwayFromZero) / Math.Round(ed.EmployeeDetail.StundenSollOhneUrlaubKrankheit, 2, MidpointRounding.AwayFromZero)) * 100;
ed.EmployeeDetail.Custom10 = (Math.Round(ed.EmployeeDetail.FlsIst, 2, MidpointRounding.AwayFromZero) / Math.Round(ed.EmployeeDetail.StundenSollOhneUrlaubKrankheit, 2, MidpointRounding.AwayFromZero)) * 100;
}
else
{
ed.EmployeeDetail.StundenGesamtIst = 100;
ed.EmployeeDetail.Custom10 = 100;
}
decimal gesamtProzent = 100;
if (sollGesamt != 0)
{
gesamtProzent = (Math.Round(istGesamt, 2, MidpointRounding.AwayFromZero) / Math.Round(sollGesamt, 2, MidpointRounding.AwayFromZero)) * 100;
}
//cellGesamt.Text = String.Format("{0:0.0}%", gesamtProzent);
}
}
decimal gesamtProzent = 100;
if (sollGesamt != 0)
{
gesamtProzent = (Math.Round(istGesamt, 2, MidpointRounding.AwayFromZero) / Math.Round(sollGesamt, 2, MidpointRounding.AwayFromZero)) * 100;
}
cellGesamtProzent.Text = String.Format("{0:0.0}%", gesamtProzent);
//if (pRO. SollGesamt != 0)
//{
// pRO.StundenGesamt = (Math.Round(pRO.FlsIstGesamt, 2, MidpointRounding.AwayFromZero) / Math.Round(pRO.SollGesamt, 2, MidpointRounding.AwayFromZero)) * 100;

View File

@@ -31,11 +31,15 @@ namespace AlphaEv
{
this.components = new System.ComponentModel.Container();
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary8 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary9 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary10 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
@@ -72,15 +76,14 @@ namespace AlphaEv
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellGesamtProzent = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFlsQuote = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
@@ -95,6 +98,22 @@ namespace AlphaEv
this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
this.fieldFortbildung = new DevExpress.XtraReports.UI.CalculatedField();
this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -110,7 +129,6 @@ namespace AlphaEv
//
// Detail1
//
this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Detail1.HeightF = 0F;
this.Detail1.Name = "Detail1";
this.Detail1.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBandExceptFirstEntry;
@@ -137,8 +155,12 @@ namespace AlphaEv
//
this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell31,
this.xrTableCell19,
this.xrTableCell32,
this.xrTableCell33,
this.xrTableCell20,
this.xrTableCell34,
this.xrTableCell28,
this.xrTableCell16,
this.xrTableCell27,
@@ -146,6 +168,7 @@ namespace AlphaEv
this.xrTableCell21,
this.xrTableCell23,
this.xrTableCell22,
this.xrTableCell36,
this.xrTableCell6});
this.xrTableRowDetail.Name = "xrTableRowDetail";
this.xrTableRowDetail.Weight = 1D;
@@ -160,7 +183,7 @@ namespace AlphaEv
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell3.Weight = 0.15329125338142471D;
this.xrTableCell3.Weight = 0.0631199278629396D;
//
// xrTableCell19
//
@@ -168,15 +191,16 @@ namespace AlphaEv
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollMax", "{0:0.00}")});
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Text = "xrTableCell19";
this.xrTableCell19.Weight = 0.081154192966636618D;
this.xrTableCell19.Weight = 0.063119927862939587D;
//
// xrTableCell20
//
this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UrlaubUndKrankheit", "{0:0.00}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.TageKrankheit", "{0:0.##}")});
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Text = "xrTableCell20";
this.xrTableCell20.Weight = 0.099188458070333621D;
this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell20.StylePriority.UsePadding = false;
this.xrTableCell20.Weight = 0.036068530207394062D;
//
// xrTableCell28
//
@@ -184,7 +208,7 @@ namespace AlphaEv
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Text = "xrTableCell28";
this.xrTableCell28.Weight = 0.0811541929666366D;
this.xrTableCell28.Weight = 0.063119927862939573D;
//
// xrTableCell16
//
@@ -192,7 +216,7 @@ namespace AlphaEv
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsSoll", "{0:0.00}")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Text = "xrTableCell16";
this.xrTableCell16.Weight = 0.072137060414788082D;
this.xrTableCell16.Weight = 0.063119927862939587D;
//
// xrTableCell27
//
@@ -200,43 +224,42 @@ namespace AlphaEv
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst", "{0:0.00}")});
this.xrTableCell27.Name = "xrTableCell27";
this.xrTableCell27.Text = "xrTableCell27";
this.xrTableCell27.Weight = 0.0721370604147881D;
this.xrTableCell27.Weight = 0.063119927862939587D;
//
// xrTableCell18
//
this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Custom2", "{0:0.00}")});
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.Weight = 0.072137060414788068D;
this.xrTableCell18.Weight = 0.094679891794409332D;
//
// xrTableCell21
//
this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Custom1", "{0:0.00}")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Weight = 0.072137060414788082D;
this.xrTableCell21.Weight = 0.076645626690712343D;
//
// xrTableCell23
//
this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenGesamtIst", "{0:0.0}%")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenGesamtIst", "{0:0.00}")});
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Weight = 0.0721370604147881D;
this.xrTableCell23.Weight = 0.054102795311091079D;
//
// xrTableCell22
//
this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsDiff", "{0:0.00}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsDiff", "{0:0.0}%")});
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.Text = "xrTableCell22";
this.xrTableCell22.Weight = 0.081154192966636618D;
this.xrTableCell22.Weight = 0.054102795311091086D;
//
// xrTableCell6
//
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.LaufendeGesamtsumme", "{0:0.00}")});
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Weight = 0.081154192966636632D;
this.xrTableCell6.Weight = 0.063119927862939587D;
//
// DetailReport
//
@@ -279,7 +302,6 @@ namespace AlphaEv
this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableHeader.Name = "xrTableHeader";
this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -296,13 +318,18 @@ namespace AlphaEv
//
this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell5,
this.xrTableCell24,
this.xrTableCell4,
this.xrTableCell25,
this.xrTableCell26,
this.xrTableCell2,
this.xrTableCell29,
this.xrTableCell9,
this.xrTableCell8,
this.xrTableCell10,
this.xrTableCell14,
this.xrTableCell13,
this.xrTableCell30,
this.xrTableCell11,
this.xrTableCell7,
this.xrTableCell1});
@@ -311,49 +338,53 @@ namespace AlphaEv
//
// xrTableCell5
//
this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "{0:yyyy}")});
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Monat";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell5.Weight = 0.15329125016467182D;
this.xrTableCell5.Weight = 0.063119922825959657D;
//
// xrTableCell4
//
this.xrTableCell4.Multiline = true;
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Text = "Reguläre SOLL Stunden";
this.xrTableCell4.Weight = 0.08115419219201736D;
this.xrTableCell4.Text = "Reguläre\r\nArbeitszeit";
this.xrTableCell4.Weight = 0.063119927930686728D;
//
// xrTableCell2
//
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Text = "Urlaub, Krankheit, Fortbildung (Tage)";
this.xrTableCell2.Weight = 0.099188455935049366D;
this.xrTableCell2.Text = "K";
this.xrTableCell2.Weight = 0.036068529901101362D;
//
// xrTableCell9
//
this.xrTableCell9.Multiline = true;
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Text = "Tatsächliche SOLL Stunden";
this.xrTableCell9.Weight = 0.0811541927415032D;
this.xrTableCell9.Text = "Soll\r\nArbeitszeit";
this.xrTableCell9.Weight = 0.063119928205429651D;
//
// xrTableCell8
//
this.xrTableCell8.Multiline = true;
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell8.StylePriority.UsePadding = false;
this.xrTableCell8.Text = "FLS Stunden SOLL";
this.xrTableCell8.Weight = 0.072137063496797729D;
this.xrTableCell8.Text = "FLS\r\nSoll";
this.xrTableCell8.Weight = 0.0631199307629265D;
//
// xrTableCell10
//
this.xrTableCell10.Multiline = true;
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell10.StylePriority.UseBackColor = false;
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.Text = "FLS IST lfd. Monat";
this.xrTableCell10.Weight = 0.072137060057034491D;
this.xrTableCell10.Text = "Indirekte\r\nZeiten";
this.xrTableCell10.Weight = 0.063119930762926435D;
//
// xrTableCell14
//
@@ -361,8 +392,8 @@ namespace AlphaEv
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell14.StylePriority.UsePadding = false;
this.xrTableCell14.Text = "FLS IST in\r\nBezugsbetr.";
this.xrTableCell14.Weight = 0.072137061417485937D;
this.xrTableCell14.Text = "FLS\r\nFallverantwortliche";
this.xrTableCell14.Weight = 0.094679886372637662D;
//
// xrTableCell13
//
@@ -370,24 +401,25 @@ namespace AlphaEv
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell13.StylePriority.UsePadding = false;
this.xrTableCell13.Text = "FLS IST in\r\nVertretung";
this.xrTableCell13.Weight = 0.072137061417485937D;
this.xrTableCell13.Text = "FLS\r\nin Vertretung";
this.xrTableCell13.Weight = 0.076645627784421549D;
//
// xrTableCell11
//
this.xrTableCell11.Multiline = true;
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UseBackColor = false;
this.xrTableCell11.Text = "FLS/SOLL\r\ntatsächl.";
this.xrTableCell11.Weight = 0.072137067843528427D;
this.xrTableCell11.Text = "FLS\r\nQuote";
this.xrTableCell11.Weight = 0.054102795949743487D;
//
// xrTableCell7
//
this.xrTableCell7.Multiline = true;
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.Text = "FLS Plus/Minus lfd. Monat";
this.xrTableCell7.Weight = 0.081154196088753072D;
this.xrTableCell7.Text = "Differenz\r\nArbeitszeit";
this.xrTableCell7.Weight = 0.063119930621010636D;
//
// xrTableCell1
//
@@ -395,8 +427,8 @@ namespace AlphaEv
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.Text = "FLS Plus/Minus\r\ngesamt";
this.xrTableCell1.Weight = 0.081154202968279354D;
this.xrTableCell1.Text = "Arbeits-\r\nzeitkonto";
this.xrTableCell1.Weight = 0.063119944380063242D;
//
// GroupFooter2
//
@@ -424,14 +456,18 @@ namespace AlphaEv
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell35,
this.xrTableCell37,
this.xrTableCell39,
this.xrTableCell40,
this.xrTableCell38,
this.xrTableCell37,
this.xrTableCell41,
this.cellSollGesamt,
this.cellFLSSollGesamt,
this.cellFLSIstGesamt,
this.xrTableCell15,
this.xrTableCell17,
this.cellGesamtProzent,
this.cellGesamt,
this.cellFlsQuote,
this.cellFLSPlusMinusGesamt,
this.xrTableCell12});
this.xrTableRow1.Name = "xrTableRow1";
@@ -446,12 +482,7 @@ namespace AlphaEv
this.xrTableCell35.StylePriority.UseTextAlignment = false;
this.xrTableCell35.Text = "Gesamt";
this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell35.Weight = 0.15329126714047708D;
//
// xrTableCell37
//
this.xrTableCell37.Name = "xrTableCell37";
this.xrTableCell37.Weight = 0.081154193105616945D;
this.xrTableCell35.Weight = 0.10820559131708402D;
//
// xrTableCell39
//
@@ -461,72 +492,77 @@ namespace AlphaEv
xrSummary1.FormatString = "{0:0.00}";
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell39.Summary = xrSummary1;
this.xrTableCell39.Weight = 0.099188458209313948D;
this.xrTableCell39.Weight = 0.063119929947644454D;
//
// cellSollGesamt
//
this.cellSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollOhneUrlaubKrankheit")});
this.cellSollGesamt.Name = "cellSollGesamt";
xrSummary2.FormatString = "{0:0.00}";
xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.cellSollGesamt.Summary = xrSummary2;
this.cellSollGesamt.Weight = 0.081154193105616945D;
xrSummary5.FormatString = "{0:0.00}";
xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.cellSollGesamt.Summary = xrSummary5;
this.cellSollGesamt.Weight = 0.063119927237528115D;
//
// cellFLSSollGesamt
//
this.cellFLSSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsSoll")});
this.cellFLSSollGesamt.Name = "cellFLSSollGesamt";
xrSummary3.FormatString = "{0:0.00}";
xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.cellFLSSollGesamt.Summary = xrSummary3;
this.cellFLSSollGesamt.Weight = 0.072137060692748722D;
xrSummary6.FormatString = "{0:0.00}";
xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.cellFLSSollGesamt.Summary = xrSummary6;
this.cellFLSSollGesamt.Weight = 0.063119928279880541D;
//
// cellFLSIstGesamt
//
this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst")});
this.cellFLSIstGesamt.Name = "cellFLSIstGesamt";
xrSummary4.FormatString = "{0:0.00}";
xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.cellFLSIstGesamt.Summary = xrSummary4;
this.cellFLSIstGesamt.Weight = 0.072137060692748764D;
xrSummary7.FormatString = "{0:0.00}";
xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.cellFLSIstGesamt.Summary = xrSummary7;
this.cellFLSIstGesamt.Weight = 0.063119928279880569D;
//
// xrTableCell15
//
this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Custom2")});
this.xrTableCell15.Name = "xrTableCell15";
xrSummary5.FormatString = "{0:0.00}";
xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell15.Summary = xrSummary5;
this.xrTableCell15.Weight = 0.072137059997847128D;
xrSummary8.FormatString = "{0:0.00}";
xrSummary8.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell15.Summary = xrSummary8;
this.xrTableCell15.Weight = 0.094679887590254558D;
//
// xrTableCell17
//
this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Custom1")});
this.xrTableCell17.Name = "xrTableCell17";
xrSummary6.FormatString = "{0:0.00}";
xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell17.Summary = xrSummary6;
this.xrTableCell17.Weight = 0.07213705965039631D;
xrSummary9.FormatString = "{0:0.00}";
xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell17.Summary = xrSummary9;
this.xrTableCell17.Weight = 0.076645649935171659D;
//
// cellGesamtProzent
// cellGesamt
//
this.cellGesamtProzent.Name = "cellGesamtProzent";
this.cellGesamtProzent.Weight = 0.07213705965039631D;
this.cellGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenGesamtIst")});
this.cellGesamt.Name = "cellGesamt";
xrSummary10.FormatString = "{0:0.00}";
xrSummary10.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.cellGesamt.Summary = xrSummary10;
this.cellGesamt.Weight = 0.054102794824659933D;
//
// cellFLSPlusMinusGesamt
// cellFlsQuote
//
this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt";
this.cellFLSPlusMinusGesamt.Weight = 0.081154193105616737D;
this.cellFlsQuote.Name = "cellFlsQuote";
this.cellFlsQuote.Weight = 0.054102795867012186D;
//
// xrTableCell12
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Weight = 0.081154165587512456D;
this.xrTableCell12.Weight = 0.063119913825926688D;
//
// GroupHeader3
//
@@ -538,15 +574,14 @@ namespace AlphaEv
//
// lblMonat
//
this.lblMonat.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.lblMonat.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblMonat.Multiline = true;
this.lblMonat.Name = "lblMonat";
this.lblMonat.SizeF = new System.Drawing.SizeF(1007F, 25F);
this.lblMonat.StyleName = "Title";
this.lblMonat.StylePriority.UseFont = false;
this.lblMonat.Text = "Stundenkonto [EmployeeInfoList.LastName], [EmployeeInfoList.FirstName] [ReportSta" +
"rtDate!yyyy]";
this.lblMonat.Text = "Arbeitszeitkonto [EmployeeInfoList.LastName], [EmployeeInfoList.FirstName]";
//
// bindingSource1
//
@@ -638,6 +673,132 @@ namespace AlphaEv
this.bottomMarginBand1.HeightF = 30.9583F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrTableCell24
//
this.xrTableCell24.Multiline = true;
this.xrTableCell24.Name = "xrTableCell24";
this.xrTableCell24.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell24.StylePriority.UsePadding = false;
this.xrTableCell24.Text = "Arbeits-\r\ntage";
this.xrTableCell24.Weight = 0.045085662462944293D;
//
// xrTableCell25
//
this.xrTableCell25.Name = "xrTableCell25";
this.xrTableCell25.Text = "U";
this.xrTableCell25.Weight = 0.036068530586599437D;
//
// xrTableCell26
//
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.Text = "F";
this.xrTableCell26.Weight = 0.036068531620982933D;
//
// xrTableCell29
//
this.xrTableCell29.Multiline = true;
this.xrTableCell29.Name = "xrTableCell29";
this.xrTableCell29.Text = "Zusätzliche\r\nZeiten";
this.xrTableCell29.Weight = 0.063119928205429665D;
//
// xrTableCell30
//
this.xrTableCell30.Multiline = true;
this.xrTableCell30.Name = "xrTableCell30";
this.xrTableCell30.Text = "FLS\r\ngesamt";
this.xrTableCell30.Weight = 0.054102795949743494D;
//
// xrTableCell31
//
this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.ArbeitstageImBerichtszeitraum", "{0:0}")});
this.xrTableCell31.Name = "xrTableCell31";
this.xrTableCell31.Weight = 0.045085662759242563D;
//
// xrTableCell32
//
this.xrTableCell32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.TageUrlaub", "{0:0.##}")});
this.xrTableCell32.Name = "xrTableCell32";
this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell32.StylePriority.UsePadding = false;
this.xrTableCell32.Weight = 0.036068530207394048D;
//
// xrTableCell33
//
this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.fieldFortbildung")});
this.xrTableCell33.Name = "xrTableCell33";
this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell33.StylePriority.UsePadding = false;
this.xrTableCell33.Text = "xrTableCell33";
this.xrTableCell33.Weight = 0.036068530207394062D;
//
// fieldFortbildung
//
this.fieldFortbildung.DataMember = "EmployeeInfoList.EmployeeDetails";
this.fieldFortbildung.Expression = "Iif([EmployeeDetail.Custom3] == 0, ?, [EmployeeDetail.Custom3])";
this.fieldFortbildung.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldFortbildung.Name = "fieldFortbildung";
//
// xrTableCell34
//
this.xrTableCell34.Name = "xrTableCell34";
this.xrTableCell34.Weight = 0.063119927862939573D;
//
// xrTableCell36
//
this.xrTableCell36.Name = "xrTableCell36";
this.xrTableCell36.Text = "xrTableCell36";
this.xrTableCell36.Weight = 0.063119927862939587D;
//
// xrTableCell37
//
this.xrTableCell37.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.TageKrankheit")});
this.xrTableCell37.Name = "xrTableCell37";
this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell37.StylePriority.UsePadding = false;
xrSummary4.FormatString = "{0:0.##}";
xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell37.Summary = xrSummary4;
this.xrTableCell37.Weight = 0.0360685231193975D;
//
// xrTableCell38
//
this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.fieldFortbildung")});
this.xrTableCell38.Name = "xrTableCell38";
this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell38.StylePriority.UsePadding = false;
xrSummary3.FormatString = "{0:0.##}";
xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell38.Summary = xrSummary3;
this.xrTableCell38.Weight = 0.036068529825198155D;
//
// xrTableCell40
//
this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.TageUrlaub")});
this.xrTableCell40.Name = "xrTableCell40";
this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell40.StylePriority.UsePadding = false;
xrSummary2.FormatString = "{0:0.##}";
xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell40.Summary = xrSummary2;
this.xrTableCell40.Weight = 0.036068529825198148D;
//
// xrTableCell41
//
this.xrTableCell41.Name = "xrTableCell41";
this.xrTableCell41.Text = "xrTableCell41";
this.xrTableCell41.Weight = 0.063119927237528115D;
//
// cellFLSPlusMinusGesamt
//
this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt";
this.cellFLSPlusMinusGesamt.Weight = 0.063119913825926688D;
//
// MitarbeiterstundenkontoJahr
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -647,8 +808,10 @@ namespace AlphaEv
this.topMarginBand1,
this.bottomMarginBand1});
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldFLS});
this.fieldFLS,
this.fieldFortbildung});
this.DataSource = this.bindingSource1;
this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Landscape = true;
this.Margins = new System.Drawing.Printing.Margins(60, 50, 50, 31);
this.PageHeight = 827;
@@ -708,13 +871,12 @@ namespace AlphaEv
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
private DevExpress.XtraReports.UI.XRTableCell cellSollGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSSollGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSIstGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellGesamtProzent;
private DevExpress.XtraReports.UI.XRTableCell cellFlsQuote;
private DevExpress.XtraReports.UI.XRTableCell cellGesamt;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
@@ -729,5 +891,21 @@ namespace AlphaEv
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
private DevExpress.XtraReports.UI.CalculatedField fieldFortbildung;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell40;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell41;
private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt;
}
}

View File

@@ -5,6 +5,7 @@ using System.IO;
using System.Text;
using System.Text.RegularExpressions;
using BeWo.Data.Access;
using BeWo.Report.ReportObjects;
using BS.Shared.DataContracts;
namespace AwoWesel.Export
@@ -241,7 +242,8 @@ namespace AwoWesel.Export
ErstelleSatz21(sb, row, date, rowIndex);
sb.AppendLine();
ErstelleSatz22(sb, row, date, rowIndex);
rowIndex++;
}
//F,0,050,,BEWO,DA,01012016,012016,iBelegNr1,Belegnr1,220001,,,,999.99, "Name AZ Abrechnung 01/2016 LVR",,,EUR,,,,,,,,,,,R,,,
@@ -470,8 +472,8 @@ order by p.`LastName`, p.FirstName
inner join invoicebase ib on ib.costbearer2supportconceptoid = c2s.oid
inner join serviceinvoice si on si.invoicebaseoid = ib.oid
inner join serviceinvoiceperiod sip on sip.serviceinvoiceoid = si.oid
where ib.AccountingPeriodEnd >= ':Monat_Start' and ib.AccountingPeriodStart < ':Monat_End' and ib.IsActive = 1
order by p.Lastname, p.Firstname
WHERE ib.`AccountingPeriodEnd` >= ':Monat_Start' AND ib.`AccountingPeriodEnd` < ':Monat_End' and ib.IsActive = 1
order by ib.invoicenumber
";
return sql;

View File

@@ -1,8 +1,12 @@
using System;
using System.Text;
using BeWo.Data.Access;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BeWo.Service.DCEntityMapper;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using DevExpress.XtraReports.UI;
namespace AwoWesel
@@ -60,6 +64,9 @@ namespace AwoWesel
{
foreach (var ii in sip.ServiceInvoiceItems)
{
ii.ServiceDescription = "Fachleistungsstunden";
SetzeZeitraum(pRO, sip);
if (!String.IsNullOrEmpty(ii.RateFactor))
{
var rfStr = ii.RateFactor.Replace("%", "").Replace(",00", "").Trim();
@@ -77,6 +84,58 @@ namespace AwoWesel
}
this.bindingSource1.DataSource = pRO;
}
private void SetzeZeitraum(ServiceInvoiceRO pRo, ServiceInvoicePeriodRO sip)
{
var periods = sip.CostBearer2SupportConcept.CostBearer.CostRatePeriods;
var crDcList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(periods);
DateTime start = pRo.AccountingPeriodStart;
DateTime end = pRo.AccountingPeriodEnd;
var ratesInSpan = crDcList.GetRatesInSpan(CostRatePeriodType.HourlyRate, start, end);
DateTime nextCrStart = start;
foreach (var cr in ratesInSpan)
{
cr.StartDate = nextCrStart;
if (cr.EndDate.HasValue)
{
nextCrStart = cr.EndDate.Value.AddDays(1);
}
}
foreach (var ii in sip.ServiceInvoiceItems)
{
start = ii.AccountingPeriodStart ?? pRo.AccountingPeriodStart;
end = ii.AccountingPeriodEnd ?? pRo.AccountingPeriodEnd;
CostRatePeriodDC foundDc = null;
foreach (var cr in ratesInSpan)
{
if (cr.CostRateType == CostRatePeriodType.HourlyRate && cr.CostRateValue == ii.HourlyRate)
{
foundDc = cr;
}
}
if (foundDc != null)
{
if (foundDc.EndDate.HasValue && foundDc.EndDate < end && foundDc.EndDate.Value >= start)
{
end = foundDc.EndDate.Value;
}
if (foundDc.StartDate.HasValue && foundDc.StartDate > start && foundDc.StartDate.Value <= end)
{
start = foundDc.StartDate.Value;
}
ii.Duration = String.Format("{0:dd.MM.yy} - {1:dd.MM.yy}", start, end);
}
}
}
}
}

View File

@@ -555,7 +555,7 @@
<data name="xrLabel10.Text" xml:space="preserve">
<value>Bank für Sozialwirtschaft IBAN DE56 3702 0500 0006 1788 00 · BIC: BFSWDE33XXX · Sparkasse am Niederrhein IBAN DE02 3545 0000 1101 0027 05 · BIC: WELADED1MOR
Gläubiger-ID: DE81AWO00000337235 · Amtsgericht Kleve VR 40909 · Steuer - Nr. 119/5740/0216
Vorsitzender: Jochen Gottke · Geschäftsführer: Dr. Bernd Kwiatkowski</value>
Vorstand: Jochen Gottke (Vorsitzender) | Christa Kirchhoff | Dr. Bernd Riekemann</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>

View File

@@ -30,6 +30,7 @@ namespace BeWo.BeWoAuxilio
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
@@ -42,6 +43,7 @@ namespace BeWo.BeWoAuxilio
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -58,6 +60,7 @@ namespace BeWo.BeWoAuxilio
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -73,6 +76,7 @@ namespace BeWo.BeWoAuxilio
this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -90,9 +94,6 @@ namespace BeWo.BeWoAuxilio
this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.fieldRelationAZFls = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldGesamtRelAZFls = new DevExpress.XtraReports.UI.CalculatedField();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
@@ -222,6 +223,13 @@ namespace BeWo.BeWoAuxilio
this.xrTableCell23.Text = "xrTableCell23";
this.xrTableCell23.Weight = 0.0676284941388638D;
//
// xrTableCell18
//
this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.fieldRelationAZFls", "{0:0.00}")});
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.Weight = 0.04508566275924257D;
//
// xrTableCell1
//
this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -377,6 +385,15 @@ namespace BeWo.BeWoAuxilio
this.xrTableCell11.Text = "Arbeitszeit lfd. Monat";
this.xrTableCell11.Weight = 0.067628493996948258D;
//
// xrTableCell12
//
this.xrTableCell12.Multiline = true;
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell12.StylePriority.UsePadding = false;
this.xrTableCell12.Text = "%\r\nFLS/AZ";
this.xrTableCell12.Weight = 0.045085663789819923D;
//
// xrTableCell6
//
this.xrTableCell6.Multiline = true;
@@ -488,9 +505,11 @@ namespace BeWo.BeWoAuxilio
// cellFLSIstGesamt
//
this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt", "{0:0.00}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom1")});
this.cellFLSIstGesamt.Name = "cellFLSIstGesamt";
this.cellFLSIstGesamt.Text = "cellFLSIstGesamt";
xrSummary1.FormatString = "{0:0.00}";
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.cellFLSIstGesamt.Summary = xrSummary1;
this.cellFLSIstGesamt.Weight = 0.067628494138863876D;
//
// cellFLSPlusMinusGesamt
@@ -509,6 +528,13 @@ namespace BeWo.BeWoAuxilio
this.cellGesamtGesamt.Text = "cellGesamtGesamt";
this.cellGesamtGesamt.Weight = 0.067628494138863821D;
//
// xrTableCell21
//
this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldGesamtRelAZFls", "{0:0.00}")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Weight = 0.045085662759242563D;
//
// xrTableCell17
//
this.xrTableCell17.Name = "xrTableCell17";
@@ -639,29 +665,6 @@ namespace BeWo.BeWoAuxilio
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrTableCell12
//
this.xrTableCell12.Multiline = true;
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell12.StylePriority.UsePadding = false;
this.xrTableCell12.Text = "%\r\nFLS/AZ";
this.xrTableCell12.Weight = 0.045085663789819923D;
//
// xrTableCell18
//
this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.fieldRelationAZFls", "{0:0.00}")});
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.Weight = 0.04508566275924257D;
//
// xrTableCell21
//
this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldGesamtRelAZFls", "{0:0.00}")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Weight = 0.045085662759242563D;
//
// fieldRelationAZFls
//
this.fieldRelationAZFls.DataMember = "EmployeeDetailList";

View File

@@ -48,10 +48,17 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="CustomMitarbeiterstundenkontoBerechnung.cs" />
<Compile Include="CustomReportCreator.cs" />
<Compile Include="Invoicing\AssistenzInvoiceCreation.cs" />
<Compile Include="Invoicing\CustomInvoiceFactory.cs" />
<Compile Include="Invoicing\CustomSettlementInvoiceCreation.cs" />
<Compile Include="Mitarbeiterstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Mitarbeiterstundenkonto.designer.cs">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Quittierungsbeleg.cs">
<SubType>Component</SubType>
@@ -65,8 +72,18 @@
<Compile Include="SettlementReport.Designer.cs">
<DependentUpon>SettlementReport.cs</DependentUpon>
</Compile>
<Compile Include="Teamstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Teamstundenkonto.designer.cs">
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Mitarbeiterstundenkonto.resx">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Quittierungsbeleg.resx">
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
@@ -76,6 +93,9 @@
<DependentUpon>SettlementReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Teamstundenkonto.resx">
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Data\Data.csproj">

View File

@@ -52,7 +52,7 @@ namespace BhsSolingen
}
lblGesamtminuten.Text = string.Format("{0:0.##}", minutes);
lblGesamtstunden.Text = string.Format("{0:0.##}", minutes / 60);
lblGesamtstunden.Text = string.Format("{0:0.00}", minutes / 60);
if (String.IsNullOrWhiteSpace(pRO.AbsenceTimes))
{

View File

@@ -14,27 +14,27 @@ namespace CaritasUnna.Invoicing
{
public class CustomInvoiceFactory : InvoiceFactory
{
public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
{
foreach (var item in supportConcepts2ServiceRecords)
{
var csc = item.Key;
var sc = DAOFactory.GenericDAO.LoadByID<SupportConcept>(csc.SupportConceptOid);
//public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
//{
// foreach (var item in supportConcepts2ServiceRecords)
// {
// var csc = item.Key;
// var sc = DAOFactory.GenericDAO.LoadByID<SupportConcept>(csc.SupportConceptOid);
if (csc.CostBearerRelOids != null && csc.CostBearerRelOids.Count > 0)
{
var c2s = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(csc.CostBearerRelOids[0]);
if (c2s.CostBearer.Organisation.Name.Contains("Wohnungslos"))
{
return new WlhInvoiceCreation();
}
// if (csc.CostBearerRelOids != null && csc.CostBearerRelOids.Count > 0)
// {
// var c2s = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(csc.CostBearerRelOids[0]);
// if (c2s.CostBearer.Organisation.Name.Contains("Wohnungslos"))
// {
// return new WlhInvoiceCreation();
// }
}
}
// }
// }
return base.CreateInvoiceCreator(specificId, tenant, supportConcepts2ServiceRecords);
// return base.CreateInvoiceCreator(specificId, tenant, supportConcepts2ServiceRecords);
}
//}
}
}

View File

@@ -92,16 +92,16 @@ namespace CaritasUnna
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.ortDatum = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
@@ -618,69 +618,6 @@ namespace CaritasUnna
this.bottomMarginBand1.HeightF = 100F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.ortDatum,
this.xrLabel19,
this.xrPictureBox1,
this.xrLabel3,
this.xrLabel9});
this.GroupHeader1.Font = new System.Drawing.Font("Arial", 10F);
this.GroupHeader1.HeightF = 353.2291F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
// xrLabel9
//
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 163.5417F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel9.SizeF = new System.Drawing.SizeF(329.9999F, 103.4583F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientStreet]\r\n[RecipientP" +
"ostCodeAndTown]";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// xrLabel19
//
this.xrLabel19.Font = new System.Drawing.Font("Arial", 9F);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(458.3333F, 136.0383F);
this.xrLabel19.Multiline = true;
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel19.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel19.SizeF = new System.Drawing.SizeF(238.914F, 185.1272F);
this.xrLabel19.StylePriority.UseFont = false;
this.xrLabel19.Text = "Tel. 0 23 03 / 23 80 67\r\nFax 0 23 03 / 23 80 10\r\nhttp://www.caritas-unna.de\r\n\r\nFa" +
"chbereich\r\nAmbulant Betreutes Wohnen\r\n\r\nTelefon: 0 23 03 / 23 80 67\r\n\r\nE-Mail: s" +
"pz@caritas-unna.de\r\n";
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(22.5001F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(617.0392F, 102.705F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel3
//
this.xrLabel3.Font = new System.Drawing.Font("Arial", 7F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 136.0383F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel3.SizeF = new System.Drawing.SizeF(433.7517F, 17F);
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Caritasverband für den Kreis Unna e.V. Hansastraße 6 - 59425 Unna";
//
// xrLabel1
//
this.xrLabel1.Font = new System.Drawing.Font("Arial", 7F);
@@ -714,12 +651,25 @@ namespace CaritasUnna
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "Caritasverband für den Kreis Unna e.V.\r\nAmtsgericht Hamm VR20340\r\nSteuer-Nr.: 316" +
"/5921/0484";
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.ortDatum,
this.xrLabel19,
this.xrPictureBox1,
this.xrLabel3,
this.xrLabel9});
this.GroupHeader1.Font = new System.Drawing.Font("Arial", 10F);
this.GroupHeader1.HeightF = 335F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
// ortDatum
//
this.ortDatum.BackColor = System.Drawing.Color.Transparent;
this.ortDatum.Font = new System.Drawing.Font("Arial", 9.75F);
this.ortDatum.LocationFloat = new DevExpress.Utils.PointFloat(458.3336F, 321.1655F);
this.ortDatum.LocationFloat = new DevExpress.Utils.PointFloat(458.3331F, 308.1447F);
this.ortDatum.Multiline = true;
this.ortDatum.Name = "ortDatum";
this.ortDatum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -727,6 +677,56 @@ namespace CaritasUnna
this.ortDatum.StylePriority.UseBackColor = false;
this.ortDatum.StylePriority.UseFont = false;
//
// xrLabel19
//
this.xrLabel19.Font = new System.Drawing.Font("Arial", 9F);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(458.3331F, 136.0383F);
this.xrLabel19.Multiline = true;
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel19.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel19.SizeF = new System.Drawing.SizeF(238.914F, 172.1064F);
this.xrLabel19.StylePriority.UseFont = false;
this.xrLabel19.Text = "Tel. 0 23 03 / 23 80 67\r\nFax 0 23 03 / 23 80 10\r\nhttp://www.caritas-unna.de\r\n\r\nFa" +
"chbereich\r\nAmbulant Betreutes Wohnen\r\n\r\nTelefon: 0 23 03 / 23 80 67\r\n\r\nE-Mail: s" +
"pz@caritas-unna.de\r\n";
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(22.5001F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(617.0392F, 102.705F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel3
//
this.xrLabel3.Font = new System.Drawing.Font("Arial", 7F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 136.0383F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel3.SizeF = new System.Drawing.SizeF(433.7517F, 17F);
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Caritasverband für den Kreis Unna e.V. Hansastraße 6 - 59425 Unna";
//
// xrLabel9
//
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 163.5417F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel9.SizeF = new System.Drawing.SizeF(329.9999F, 103.4583F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientStreet]\r\n[RecipientP" +
"ostCodeAndTown]";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// SpitzabrechnungWlh
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

View File

@@ -1,9 +1,11 @@
using System;
using BeWo.Report.ReportObjects;
using BeWo.Report;
using BS.Shared.Core;
namespace CaritasUnna
{
[IDSpecificClass(Identifier = "LWLWohnungslosenhilfe")]
public partial class SpitzabrechnungWlh : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<SettlementRO>
{
public SpitzabrechnungWlh()

View File

@@ -48,6 +48,12 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="InvoiceCustomerReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="InvoiceCustomerReport.Designer.cs">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServiceInvoiceReport.cs">
<SubType>Component</SubType>
@@ -55,19 +61,41 @@
<Compile Include="ServiceInvoiceReport.Designer.cs">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
</Compile>
<Compile Include="SettlementReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="SettlementReport.Designer.cs">
<DependentUpon>SettlementReport.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="InvoiceCustomerReport.resx">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="ServiceInvoiceReport.resx">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SettlementReport.resx">
<DependentUpon>SettlementReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Data\Data.csproj">
<Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
<Name>Data</Name>
</ProjectReference>
<ProjectReference Include="..\..\Report\Report.csproj">
<Project>{40D8B312-EA64-49E3-A31A-5E57ED4D5654}</Project>
<Name>Report</Name>
</ProjectReference>
<ProjectReference Include="..\..\Shared\Shared.csproj">
<Project>{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}</Project>
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@@ -1,5 +1,5 @@
using BeWo.Report.ReportObjects;
namespace BeWo.Report.DefaultReports
namespace ChristianLuft
{
partial class ServiceInvoiceReport
{
@@ -50,13 +50,6 @@ namespace BeWo.Report.DefaultReports
this.lblBemerkungen = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail3 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
@@ -69,11 +62,12 @@ namespace BeWo.Report.DefaultReports
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
@@ -144,6 +138,8 @@ namespace BeWo.Report.DefaultReports
// Page1
//
this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel9,
this.xrLabel4,
this.xrLabel7,
this.xrLabel6,
this.lblAdresse,
@@ -151,7 +147,7 @@ namespace BeWo.Report.DefaultReports
this.xrLabel2,
this.xrLabel5,
this.xrLabel8});
this.Page1.HeightF = 416.5833F;
this.Page1.HeightF = 447.3124F;
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
@@ -220,11 +216,11 @@ namespace BeWo.Report.DefaultReports
//
// xrLabel5
//
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 287.5F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 342.2916F);
this.xrLabel5.Multiline = true;
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(701.3746F, 105.0208F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(650F, 105.0208F);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = resources.GetString("xrLabel5.Text");
//
@@ -265,97 +261,9 @@ namespace BeWo.Report.DefaultReports
//
// Detail1
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable5});
this.Detail1.HeightF = 50F;
this.Detail1.Name = "Detail1";
//
// xrTable5
//
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable5.Name = "xrTable5";
this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow23});
this.xrTable5.SizeF = new System.Drawing.SizeF(630F, 25F);
//
// xrTableRow23
//
this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell32,
this.xrTableCell37,
this.xrTableCell35,
this.xrTableCell33,
this.xrTableCell34});
this.xrTableRow23.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableRow23.Name = "xrTableRow23";
this.xrTableRow23.StylePriority.UseFont = false;
this.xrTableRow23.Weight = 1D;
//
// xrTableCell32
//
this.xrTableCell32.Name = "xrTableCell32";
this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell32.StylePriority.UseBackColor = false;
this.xrTableCell32.StylePriority.UseBorderColor = false;
this.xrTableCell32.StylePriority.UseBorders = false;
this.xrTableCell32.StylePriority.UsePadding = false;
this.xrTableCell32.StylePriority.UseTextAlignment = false;
this.xrTableCell32.Text = "Tätigkeit";
this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell32.Weight = 0.97488922276912438D;
//
// xrTableCell37
//
this.xrTableCell37.Name = "xrTableCell37";
this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell37.StylePriority.UseBackColor = false;
this.xrTableCell37.StylePriority.UseBorderColor = false;
this.xrTableCell37.StylePriority.UseBorders = false;
this.xrTableCell37.StylePriority.UsePadding = false;
this.xrTableCell37.StylePriority.UseTextAlignment = false;
this.xrTableCell37.Text = "Monat";
this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell37.Weight = 0.35450515859764475D;
//
// xrTableCell35
//
this.xrTableCell35.Name = "xrTableCell35";
this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell35.StylePriority.UseBackColor = false;
this.xrTableCell35.StylePriority.UseBorderColor = false;
this.xrTableCell35.StylePriority.UseBorders = false;
this.xrTableCell35.StylePriority.UsePadding = false;
this.xrTableCell35.StylePriority.UseTextAlignment = false;
this.xrTableCell35.Text = "Stunden";
this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell35.Weight = 0.4431314679685337D;
//
// xrTableCell33
//
this.xrTableCell33.Name = "xrTableCell33";
this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell33.StylePriority.UseBackColor = false;
this.xrTableCell33.StylePriority.UseBorderColor = false;
this.xrTableCell33.StylePriority.UseBorders = false;
this.xrTableCell33.StylePriority.UsePadding = false;
this.xrTableCell33.StylePriority.UseTextAlignment = false;
this.xrTableCell33.Text = "Satz";
this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell33.Weight = 0.44313146796853359D;
//
// xrTableCell34
//
this.xrTableCell34.Name = "xrTableCell34";
this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell34.StylePriority.UseBackColor = false;
this.xrTableCell34.StylePriority.UseBorderColor = false;
this.xrTableCell34.StylePriority.UseBorders = false;
this.xrTableCell34.StylePriority.UsePadding = false;
this.xrTableCell34.StylePriority.UseTextAlignment = false;
this.xrTableCell34.Text = "Summe";
this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell34.Weight = 0.57607089539926537D;
//
// DetailReport2
//
this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -492,6 +400,37 @@ namespace BeWo.Report.DefaultReports
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// xrLabel4
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 247.2917F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(716.9996F, 20F);
this.xrLabel4.StylePriority.UseBackColor = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UseForeColor = false;
this.xrLabel4.Text = "Abrechnung Unterstützungsleistungen für [CustomerSalutation] [CustomerFirstName] " +
"[CustomerLastName]";
this.xrLabel4.WordWrap = false;
//
// xrLabel9
//
this.xrLabel9.BackColor = System.Drawing.Color.Transparent;
this.xrLabel9.CanShrink = true;
this.xrLabel9.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 267.2917F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrLabel9.StylePriority.UseBackColor = false;
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseForeColor = false;
this.xrLabel9.Text = "AZ.: [CustomerReferenceNumber]";
this.xrLabel9.WordWrap = false;
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -515,7 +454,6 @@ namespace BeWo.Report.DefaultReports
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
@@ -537,13 +475,6 @@ namespace BeWo.Report.DefaultReports
private DevExpress.XtraReports.UI.XRLabel lblBemerkungen;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.XRTable xrTable5;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow23;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport2;
private DevExpress.XtraReports.UI.DetailBand Detail3;
private DevExpress.XtraReports.UI.XRTable xrTable6;
@@ -562,5 +493,7 @@ namespace BeWo.Report.DefaultReports
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRRichText xrRichText2;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
}
}

View File

@@ -1,10 +1,11 @@
using System;
using System.Text;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using DevExpress.XtraReports.UI;
namespace BeWo.Report.DefaultReports
namespace ChristianLuft
{
public partial class ServiceInvoiceReport : XtraReport, IBeWoReport<ServiceInvoiceRO>
{
@@ -15,16 +16,20 @@ namespace BeWo.Report.DefaultReports
public void SetReportDataSource(ServiceInvoiceRO pRO)
{
//DateTime start = pRO.AccountingPeriodStart;
//DateTime end = pRO.AccountingPeriodEnd;
//if (start.Month == end.Month && start.Year == end.Year)
//{
// lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start);
//}
//else
//{
// lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
//}
//DateTime start = pRO.AccountingPeriodStart;
//DateTime end = pRO.AccountingPeriodEnd;
//if (start.Month == end.Month && start.Year == end.Year)
//{
// lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start);
//}
//else
//{
// lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
//}
if (!String.IsNullOrWhiteSpace(pRO.CustomerSalutation) && pRO.CustomerSalutation == "Herr")
{
pRO.CustomerSalutation = "Herrn";
}
StringBuilder sb = new StringBuilder();
@@ -64,7 +69,7 @@ namespace BeWo.Report.DefaultReports
foreach (var i in p.ServiceInvoiceItems)
{
i.ServiceDescription = "Psychosoziale Betreuung";
i.ServiceDescription = "Unterstützungsleistung";
i.Duration = String.Format("{0:MM}/{0:yy}", i.AccountingPeriodStart);
decimal rateFactor = 1;

View File

@@ -132,9 +132,7 @@
<data name="xrLabel5.Text" xml:space="preserve">
<value>Sehr geehrte Damen und Herren,
für meine gemäß Auftrag geleistete Unterstützungsleistung im Rahmen des
Persönlichen Budgets der o. g. Klient (AZ [CustomerReferenceNumber]) berechne ich wie
vereinbart:
für meine gemäß Auftrag erbrachten Unterstützungsleistungen im Rahmen des Persönlichen Budgets für [CustomerSalutation] [CustomerFirstName] [CustomerLastName] berechne ich wie vereinbart:
</value>
</data>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

View File

@@ -257,7 +257,7 @@ ORDER BY p.`LastName`, p.`FirstName`, cb2sc.`ApprovedStartDate`
String sql = @"
SELECT
c.Oid,
date_format(at.BookingDate, '%d.%m.%Y') as 'Belegdatum',
date_format(If(at.ValidityDate is null, at.Bookingdate, at.ValidityDate), '%d.%m.%Y') as 'Belegdatum',
CASE ve.Oid
WHEN 78
THEN ':Belegnr-ab'
@@ -276,7 +276,7 @@ join customer c on sc.customeroid = c.oid
join person p on c.personoid = p.oid
left join valuelistentry2object v2o on v2o.objectoid = at.oid and v2o.objecttid = 26
left join valuelistentry ve on v2o.valuelistentryoid = ve.oid
WHERE at.`BookingDate` >= ':Monat_Start' AND at.`BookingDate` < ':Monat_End' and c.`IsActive` <> 0 AND sc.`IsActive` <> 0
WHERE If (at.ValidityDate is null, at.Bookingdate, at.ValidityDate) >= ':Monat_Start' AND If (at.ValidityDate is null, at.Bookingdate, at.ValidityDate) < ':Monat_End' and c.`IsActive` <> 0 AND sc.`IsActive` <> 0
ORDER BY p.`LastName`, p.`FirstName`
";
return sql;

View File

@@ -26,6 +26,38 @@ namespace FreundeskreisSuchthilfe.Reporting
private Dictionary<long, VarFieldDef> oid2VarFieldDef = null;
int gruppe_UnbekanntAlle = 0;
int gruppe_UnbekanntM = 0;
int gruppe_UnbekanntF = 0;
int gruppe0_Bis20Alle = 0;
int gruppe0_Bis20M = 0;
int gruppe0_Bis20F = 0;
int gruppe_20_29_Alle = 0;
int gruppe_20_29_M = 0;
int gruppe_20_29_F = 0;
int gruppe_30_39_Alle = 0;
int gruppe_30_39_M = 0;
int gruppe_30_39_F = 0;
int gruppe_40_49_Alle = 0;
int gruppe_40_49_M = 0;
int gruppe_40_49_F = 0;
int gruppe_50_59_Alle = 0;
int gruppe_50_59_M = 0;
int gruppe_50_59_F = 0;
int gruppe_60_69_Alle = 0;
int gruppe_60_69_M = 0;
int gruppe_60_69_F = 0;
int gruppeAb70Alle = 0;
int gruppeAb70M = 0;
int gruppeAb70F = 0;
protected override bool StichtagsbezogenAuswerten
{
get { return false; }
@@ -52,7 +84,7 @@ namespace FreundeskreisSuchthilfe.Reporting
var reports = base.CreateAnnualReport(cb, teamOid, customerCareTypeValueListEntryOid, reportStartDate, reportEndDate);
// Nach Altersgruppen
// Nach Kinder Altersgruppen
var report = new AnnualReportDC();
report.Name = "Anzahl Kinder nach Altersgruppen";
reports.Add(report);
@@ -76,7 +108,81 @@ namespace FreundeskreisSuchthilfe.Reporting
data.Value = countWithBetreuerAll;
data.Male = countWithBetreuerMale;
data.Female = countWithBetreuerFemale;
// Nach Klientenaltersgruppen
report = new AnnualReportDC();
report.Name = "Anzahl Personen nach Alter";
reports.Add(report);
report.Data = new List<AnnualReportDataDC>();
index = 1;
var d = new AnnualReportDataDC();
report.Data.Add(d);
d.Index = index++;
d.Name = "Jünger als 20";
d.Value = gruppe0_Bis20Alle;
d.Male = gruppe0_Bis20M;
d.Female = gruppe0_Bis20F;
d = new AnnualReportDataDC();
report.Data.Add(d);
d.Index = index++;
d.Name = "20 bis 29";
d.Value = gruppe_20_29_Alle;
d.Male = gruppe_20_29_M;
d.Female = gruppe_20_29_F;
d = new AnnualReportDataDC();
report.Data.Add(d);
d.Index = index++;
d.Name = "30 bis 39";
d.Value = gruppe_30_39_Alle;
d.Male = gruppe_30_39_M;
d.Female = gruppe_30_39_F;
d = new AnnualReportDataDC();
report.Data.Add(d);
d.Index = index++;
d.Name = "40 bis 49";
d.Value = gruppe_40_49_Alle;
d.Male = gruppe_40_49_M;
d.Female = gruppe_40_49_F;
d = new AnnualReportDataDC();
report.Data.Add(d);
d.Index = index++;
d.Name = "50 bis 59";
d.Value = gruppe_50_59_Alle;
d.Male = gruppe_50_59_M;
d.Female = gruppe_50_59_F;
d = new AnnualReportDataDC();
report.Data.Add(d);
d.Index = index++;
d.Name = "60 bis 69";
d.Value = gruppe_60_69_Alle;
d.Male = gruppe_60_69_M;
d.Female = gruppe_60_69_F;
d = new AnnualReportDataDC();
report.Data.Add(d);
d.Index = index++;
d.Name = " 70 und älter";
d.Value = gruppeAb70Alle;
d.Male = gruppeAb70M;
d.Female = gruppeAb70F;
if (gruppe_UnbekanntAlle > 0)
{
d = new AnnualReportDataDC();
report.Data.Add(d);
d.Index = index++;
d.Name = "Unbekannt";
d.Value = gruppe_UnbekanntAlle;
d.Male = gruppe_UnbekanntM;
d.Female = gruppe_UnbekanntF;
}
return reports;
}
@@ -106,6 +212,111 @@ namespace FreundeskreisSuchthilfe.Reporting
{
ErmittleAltesgruppenDerKinder(customer);
ErmittleGesetzlichenBetreuer(customer);
int alter = -1;
if (customer.Person.DateOfBirth.HasValue)
{
alter = Stichtag.Year - customer.Person.DateOfBirth.Value.Year;
}
if (alter < 0)
{
gruppe_UnbekanntAlle++;
if (customer.Person.Sex.HasValue && customer.Person.Sex.Value == Sex.Male)
{
gruppe_UnbekanntM++;
}
else if (customer.Person.Sex.HasValue && customer.Person.Sex.Value == Sex.Female)
{
gruppe_UnbekanntF++;
}
}
if (alter < 20)
{
gruppe0_Bis20Alle++;
if (customer.Person.Sex.HasValue && customer.Person.Sex.Value == Sex.Male)
{
gruppe0_Bis20M++;
}
else if (customer.Person.Sex.HasValue && customer.Person.Sex.Value == Sex.Female)
{
gruppe0_Bis20F++;
}
}
if (alter >= 20 && alter <= 29)
{
gruppe_20_29_Alle++;
if (customer.Person.Sex.HasValue && customer.Person.Sex.Value == Sex.Male)
{
gruppe_20_29_M++;
}
else if (customer.Person.Sex.HasValue && customer.Person.Sex.Value == Sex.Female)
{
gruppe_20_29_F++;
}
}
if (alter >= 30 && alter <= 39)
{
gruppe_30_39_Alle++;
if (customer.Person.Sex.HasValue && customer.Person.Sex.Value == Sex.Male)
{
gruppe_30_39_M++;
}
else if (customer.Person.Sex.HasValue && customer.Person.Sex.Value == Sex.Female)
{
gruppe_30_39_F++;
}
}
if (alter >= 40 && alter <= 49)
{
gruppe_40_49_Alle++;
if (customer.Person.Sex.HasValue && customer.Person.Sex.Value == Sex.Male)
{
gruppe_40_49_M++;
}
else if (customer.Person.Sex.HasValue && customer.Person.Sex.Value == Sex.Female)
{
gruppe_40_49_F++;
}
}
if (alter >= 50 && alter <= 59)
{
gruppe_50_59_Alle++;
if (customer.Person.Sex.HasValue && customer.Person.Sex.Value == Sex.Male)
{
gruppe_50_59_M++;
}
else if (customer.Person.Sex.HasValue && customer.Person.Sex.Value == Sex.Female)
{
gruppe_50_59_F++;
}
}
if (alter >= 60 && alter <= 69)
{
gruppe_60_69_Alle++;
if (customer.Person.Sex.HasValue && customer.Person.Sex.Value == Sex.Male)
{
gruppe_60_69_M++;
}
else if (customer.Person.Sex.HasValue && customer.Person.Sex.Value == Sex.Female)
{
gruppe_60_69_F++;
}
}
if (alter >= 70)
{
gruppeAb70Alle++;
if (customer.Person.Sex.HasValue && customer.Person.Sex.Value == Sex.Male)
{
gruppeAb70M++;
}
else if (customer.Person.Sex.HasValue && customer.Person.Sex.Value == Sex.Female)
{
gruppeAb70F++;
}
}
}
}

View File

@@ -32,7 +32,6 @@ namespace KollegiumEv.Invoicing.Alt
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -117,6 +116,7 @@ namespace KollegiumEv.Invoicing.Alt
this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -135,23 +135,12 @@ namespace KollegiumEv.Invoicing.Alt
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel9});
this.xrPictureBox1});
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.HeightF = 120F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrLabel9
//
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(187.5F, 50F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel9.SizeF = new System.Drawing.SizeF(292F, 17F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.Text = "\r\n";
//
// xrLabel8
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -1019,6 +1008,14 @@ namespace KollegiumEv.Invoicing.Alt
this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell58.Weight = 0.21685899000901443D;
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(255.5F, 21.88542F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(167F, 76.22916F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1111,7 +1108,6 @@ namespace KollegiumEv.Invoicing.Alt
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.XRTable xrTable5;
@@ -1138,5 +1134,6 @@ namespace KollegiumEv.Invoicing.Alt
private DevExpress.XtraReports.UI.XRTableRow xrTableRow36;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell57;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell58;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -87,41 +87,54 @@ namespace BeWo.LebenshilfeDuisburgReports
}
}
bool useOrgaAddress = true;
StringBuilder sb = new StringBuilder();
if (c != null)
{
if (c.Person.InvoiceAddress != null && !String.IsNullOrEmpty(c.Person.InvoiceAddress.AddressLine1))
{
useOrgaAddress = false;
sb.AppendLine(c.Person.InvoiceAddress.AddressLine1);
if (c.Person.InvoiceAddress != null && !String.IsNullOrEmpty(c.Person.InvoiceAddress.Street))
{
sb.AppendLine(c.Person.InvoiceAddress.Street);
}
else if (c.Person.Address != null && !String.IsNullOrEmpty(c.Person.Address.Street))
{
sb.AppendLine(c.Person.Address.Street);
}
if (c.Person.InvoiceAddress != null)
{
sb.AppendLine(c.Person.InvoiceAddress.AddressLine1);
}
else
{
sb.AppendLine(c.Person.FirstNameLastName);
}
if (c.Person.InvoiceAddress != null && !String.IsNullOrEmpty(c.Person.InvoiceAddress.Street))
{
sb.AppendLine(c.Person.InvoiceAddress.Street);
}
else if (c.Person.Address != null && !String.IsNullOrEmpty(c.Person.Address.Street))
{
sb.AppendLine(c.Person.Address.Street);
}
if (c.Person.InvoiceAddress != null && (!String.IsNullOrEmpty(c.Person.InvoiceAddress.PostalCode) || !String.IsNullOrEmpty(c.Person.InvoiceAddress.Town)))
{
sb.AppendLine(String.Format("{0} {1}", c.Person.InvoiceAddress.PostalCode, c.Person.InvoiceAddress.Town));
}
else if (c.Person.Address != null && (!String.IsNullOrEmpty(c.Person.Address.PostalCode) || !String.IsNullOrEmpty(c.Person.Address.Town)))
{
sb.AppendLine(String.Format("{0} {1}", c.Person.Address.PostalCode, c.Person.Address.Town));
}
}
if (c.Person.InvoiceAddress != null && (!String.IsNullOrEmpty(c.Person.InvoiceAddress.PostalCode) ||
!String.IsNullOrEmpty(c.Person.InvoiceAddress.Town)))
{
sb.AppendLine(String.Format("{0} {1}", c.Person.InvoiceAddress.PostalCode,
c.Person.InvoiceAddress.Town));
}
else if (c.Person.Address != null && (!String.IsNullOrEmpty(c.Person.Address.PostalCode) ||
!String.IsNullOrEmpty(c.Person.Address.Town)))
{
sb.AppendLine(String.Format("{0} {1}", c.Person.Address.PostalCode, c.Person.Address.Town));
}
}
else
{
String name = String.Format("{0} {1}", c.Person.FirstName.Replace("(IFF)", "").Trim(), c.Person.LastName.Replace("(IFF)", "").Trim());
sb.AppendLine(name);
sb.AppendLine("über");
}
}
sb.AppendLine("über");
sb.AppendLine(pRO.RecipientOrganisation);
sb.AppendLine(pRO.RecipientStreet);
sb.Append(pRO.RecipientPostCodeAndTown);
lblAnschrift.Text = sb.ToString();
if (useOrgaAddress)
{
sb.AppendLine(pRO.RecipientOrganisation);
sb.AppendLine(pRO.RecipientStreet);
sb.Append(pRO.RecipientPostCodeAndTown);
}
lblAnschrift.Text = sb.ToString();
String leistungkategorie = "";
@@ -145,7 +158,7 @@ namespace BeWo.LebenshilfeDuisburgReports
sb = new StringBuilder();
sb.AppendLine(String.Format("{0} für", leistungkategorie));
sb.AppendLine(String.Format("{0}, geb. {1:dd.MM.yyyy}", pRO.CustomerName, pRO.CustomerBirthdate));
sb.AppendLine(String.Format("{0} {1}, geb. {2:dd.MM.yyyy}", pRO.CustomerFirstName.Replace("(IFF)", "").Trim(), pRO.CustomerLastName.Replace("(IFF)", "").Trim(), pRO.CustomerBirthdate));
sb.Append(String.Format("wohnhaft {0}, {1} {2}", pRO.CustomerStreet, pRO.CustomerPostalCode, pRO.CustomerTown));
lblCustomerInfo.Text = sb.ToString();

View File

@@ -16,26 +16,26 @@ namespace LebenshilfeDuisburgReports.Services
{
public class CustomAccountingService : AccountingService
{
//public override void DeactivateInvoiceBases(List<InvoiceBaseDC> invoices)
//{
// foreach (var idc in invoices)
// {
// var newInvoice = base.ErstelleStornoRechnung(idc);
// DAOFactory.GenericDAO.Insert(newInvoice);
// }
//}
//public override void DeactivateServiceInvoices(List<ServiceInvoiceDC> invoices)
//{
// foreach (var sidc in invoices)
// {
// var newInvoice = base.ErstelleStornoRechnung(sidc);
public override void DeactivateInvoiceBases(List<InvoiceBaseDC> invoices)
{
foreach (var idc in invoices)
{
var newInvoice = base.ErstelleStornoRechnung(idc);
// DAOFactory.GenericDAO.Insert(newInvoice);
// }
//}
DAOFactory.GenericDAO.Insert(newInvoice);
}
}
public override void DeactivateServiceInvoices(List<ServiceInvoiceDC> invoices)
{
foreach (var sidc in invoices)
{
var newInvoice = base.ErstelleStornoRechnung(sidc);
DAOFactory.GenericDAO.Insert(newInvoice);
}
}
}
}

View File

@@ -42,5 +42,39 @@ namespace PflegedienstWessel
return list;
}
}
public override void HandleServiceRecord(MitarbeiterstundenkontoRO.EmployeeDetail emp, ServiceRecord item)
{
if (item.ServiceDescription != null)
{
decimal duration = 0;
if (item.GroupRoundedDuration.HasValue)
{
duration = item.GroupRoundedDuration.Value;
}
else
{
duration = item.RoundedDuration;
}
if (item.ServiceDescription.ServiceCategory.Name.StartsWith("Assistenz"))
{
emp.Custom1 += duration / 60;
}
else if (item.ServiceDescription.ServiceCategory.Name.StartsWith("HD Tag"))
{
emp.Custom2 += duration / 60;
}
else if (item.ServiceDescription.ServiceCategory.Name.StartsWith("Pflege"))
{
emp.Custom3 += duration / 60;
}
else if (item.ServiceDescription.ServiceCategory.Name.StartsWith("Overhead"))
{
emp.Custom4 += duration / 60;
}
}
}
}
}

View File

@@ -64,6 +64,12 @@
<ItemGroup>
<Compile Include="Calculation\CustomGroupDurationCalculator.cs" />
<Compile Include="Calculation\CustomCalculations.cs" />
<Compile Include="Mitarbeiterauslastung.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Mitarbeiterauslastung.designer.cs">
<DependentUpon>Mitarbeiterauslastung.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Reporting\CustomSupportConceptAnalysisCreator.cs" />
<Compile Include="ServicesOverviewReport.cs">
@@ -81,6 +87,9 @@
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Mitarbeiterauslastung.resx">
<DependentUpon>Mitarbeiterauslastung.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="ServicesOverviewReport.resx">
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>

View File

@@ -27,24 +27,43 @@ namespace PraunheimerWerkstaettenGmbh
lblDatum.Text = String.Format("{0:dd.MM.yyyy}", DateTime.Now);
BerechneSollIst(pRO);
;
decimal plusMinusVormonat = ((pRO.MinutenGeleistetGesamt - (decimal) pRO.TotalFLM)/60) - ((pRO.MinutenSollGesamt / 60) - pRO.ApprovedFLSPerMonth);
decimal plusMinusVormonat = ((pRO.MinutenGeleistetGesamt - (decimal) pRO.TotalFLMBillable)/60) - ((pRO.MinutenSollGesamt / 60) - pRO.ApprovedFLSPerMonth);
cellPlusMinusVormonat.Text = String.Format("{0:0.00}", plusMinusVormonat);
var zuLeisten = pRO.ApprovedFLSPerMonth - plusMinusVormonat;
cellSollPlusVormonat.Text = String.Format("{0:0.00}", zuLeisten);
lblUbertragung.Text = String.Format("{0:0.00}", (decimal)pRO.TotalFLS - zuLeisten);
var fls = ((decimal)pRO.TotalFLMBillable) / 60;
lblUbertragung.Text = String.Format("{0:0.00}", fls - zuLeisten);
DateTime dt = DateTime.Now.Date.AddHours(pRO.TotalFLS);
lblGeleisteteStunden.Text = String.Format("(geleistete Std.: {0} Std. {1:00} Min.)", dt.TimeOfDay.Hours,dt.TimeOfDay.Minutes);
foreach (var sr in pRO.Services)
{
DateTime dt2 = DateTime.Now.Date.AddMinutes(sr.Minutes);
sr.Notice2 = String.Format("{0}:{1:00}", dt2.TimeOfDay.Hours, dt2.TimeOfDay.Minutes);
if (pRO.Services != null)
{
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
foreach (var sr in pRO.Services)
{
if (sr.IsBillable)
{
DateTime dt2 = DateTime.Now.Date.AddMinutes(sr.Minutes);
sr.Notice2 = String.Format("{0}:{1:00}", dt2.TimeOfDay.Hours, dt2.TimeOfDay.Minutes);
servicesBillable.Add(sr);
}
}
pRO.Services = servicesBillable;
}
this.bindingSource1.DataSource = pRO;
}