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

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

Browse Source
This commit is contained in:
Lyndon
2019-09-02 19:13:42 +02:00
parent cd7928b40e d7ec5ecb60
commit 31d8b96e13
11 changed files with 718 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ReportImp/BeWoFuerDich/LeistungsnachweisJugendamt.Designer.cs generated
View File

@@ -57,7 +57,7 @@ namespace BeWoFuerDich
this.cellSummeFls = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSummeAusfall = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSummeWegezeit = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSummeGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
@@ -418,7 +418,7 @@ namespace BeWoFuerDich
this.cellSummeFls,
this.cellSummeAusfall,
this.cellSummeWegezeit,
this.xrTableCell25});
this.cellSummeGesamt});
this.xrTableRow4.Name = "xrTableRow4";
this.xrTableRow4.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow4.StylePriority.UseFont = false;
@@ -451,13 +451,13 @@ namespace BeWoFuerDich
this.cellSummeWegezeit.StylePriority.UsePadding = false;
this.cellSummeWegezeit.Weight = 0.14631552357973437D;
//
// xrTableCell25
// cellSummeGesamt
//
this.xrTableCell25.Name = "xrTableCell25";
this.xrTableCell25.StylePriority.UseFont = false;
this.xrTableCell25.StylePriority.UsePadding = false;
this.xrTableCell25.StylePriority.UseTextAlignment = false;
this.xrTableCell25.Weight = 1.1217523211507885D;
this.cellSummeGesamt.Name = "cellSummeGesamt";
this.cellSummeGesamt.StylePriority.UseFont = false;
this.cellSummeGesamt.StylePriority.UsePadding = false;
this.cellSummeGesamt.StylePriority.UseTextAlignment = false;
this.cellSummeGesamt.Weight = 1.1217523211507885D;
//
// bindingSource1
//
@@ -870,6 +870,8 @@ namespace BeWoFuerDich
//
// cellAsdBezirk
//
this.cellAsdBezirk.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Costbearer")});
this.cellAsdBezirk.Name = "cellAsdBezirk";
this.cellAsdBezirk.Weight = 0.43894654911611386D;
//
@@ -1268,6 +1270,6 @@ namespace BeWoFuerDich
private DevExpress.XtraReports.UI.XRTableCell cellSummeFls;
private DevExpress.XtraReports.UI.XRTableCell cellSummeAusfall;
private DevExpress.XtraReports.UI.XRTableCell cellSummeWegezeit;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
private DevExpress.XtraReports.UI.XRTableCell cellSummeGesamt;
}
}

23
ReportImp/BeWoFuerDich/LeistungsnachweisJugendamt.cs
View File

@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared;
namespace BeWoFuerDich
{
@@ -58,12 +59,34 @@ namespace BeWoFuerDich
cellSummeFls.Text = String.Format("{0:0.00}", summeFls / 60);
cellSummeAusfall.Text = String.Format("{0:0.00}", summeAusfall / 60);
cellSummeWegezeit.Text = String.Format("{0:0.00}", summeWege / 60);
cellSummeGesamt.Text = String.Format("Gesamt: {0:0.00}", (summeWege + summeAusfall + summeWege) / 60);
pRO.ApprovedFLSPerMonth = pRO.ApprovedFLSPerWeek * 4.33m;
//cellAsdBezirk.Text = pRO.o
cellAsdSachb.Text = "";
if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0)
{
if (pRO.CostBearer2SupportConceptList[0].CostBearerContactPerson != null)
{
String name = "";
if (pRO.CostBearer2SupportConceptList[0].CostBearerContactPerson.Sex.HasValue)
{
if (pRO.CostBearer2SupportConceptList[0].CostBearerContactPerson.Sex.Value == Sex.Male)
{
name = "Herr ";
}
else
{
name = "Frau ";
}
}
cellAsdSachb.Text = name + pRO.CostBearer2SupportConceptList[0].CostBearerContactPerson.LastName;
}
}
this.bindingSource1.DataSource = pRO;

43
ReportImp/BeWoFuerDich/ServiceInvoiceReport.Designer.cs generated
View File

@@ -35,9 +35,9 @@ namespace BeWoFuerDich
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
@@ -74,7 +74,6 @@ namespace BeWoFuerDich
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
@@ -117,7 +116,6 @@ namespace BeWoFuerDich
this.lblAdresse,
this.xrLabel4,
this.xrLabel3,
this.xrLabel2,
this.xrLabel5,
this.xrLabel8,
this.lblAbrechnungszeitraum});
@@ -126,6 +124,18 @@ namespace BeWoFuerDich
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
// lblAdresse
//
this.lblAdresse.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.lblAdresse.CanGrow = false;
this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblAdresse.Multiline = true;
this.lblAdresse.Name = "lblAdresse";
this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAdresse.SizeF = new System.Drawing.SizeF(413.125F, 163.0208F);
this.lblAdresse.StylePriority.UseBorders = false;
this.lblAdresse.StylePriority.UseFont = false;
//
// xrLabel4
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
@@ -155,20 +165,6 @@ namespace BeWoFuerDich
this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [CustomerSalutation] [CustomerName]";
this.xrLabel3.WordWrap = false;
//
// xrLabel2
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 163.0208F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrLabel2.StylePriority.UseBackColor = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]";
this.xrLabel2.WordWrap = false;
//
// xrLabel5
//
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 265.5208F);
@@ -622,18 +618,6 @@ namespace BeWoFuerDich
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// lblAdresse
//
this.lblAdresse.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.lblAdresse.CanGrow = false;
this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblAdresse.Multiline = true;
this.lblAdresse.Name = "lblAdresse";
this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAdresse.SizeF = new System.Drawing.SizeF(413.125F, 163.0208F);
this.lblAdresse.StylePriority.UseBorders = false;
this.lblAdresse.StylePriority.UseFont = false;
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -671,7 +655,6 @@ namespace BeWoFuerDich
private DevExpress.XtraReports.UI.GroupHeaderBand Page1;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel lblAbrechnungszeitraum;

2
ReportImp/BeWoFuerDich/SettlementReport.Designer.cs generated
View File

@@ -338,7 +338,6 @@ namespace BeWoFuerDich.Alt
this.Detail1});
this.DetailReport.DataMember = "InvoiceItems";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Expanded = false;
this.DetailReport.Level = 0;
this.DetailReport.Name = "DetailReport";
//
@@ -455,7 +454,6 @@ namespace BeWoFuerDich.Alt
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable4});
this.GroupFooter1.Expanded = false;
this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 10F);
this.GroupFooter1.HeightF = 120F;
this.GroupFooter1.Name = "GroupFooter1";

5
ReportImp/BeWoFuerDich/SettlementReport2.cs
View File

@@ -49,6 +49,7 @@ namespace BeWoFuerDich
lblNotice.Visible = false;
}
decimal gesamtStunden = 0;
decimal rateFactor = 1;
@@ -61,9 +62,13 @@ namespace BeWoFuerDich
rateFactor = (100 + ii.RateFactor.Value) / 100;
ii.RateFactor = rateFactor;
}
gesamtStunden += ii.UnitCount ?? 0;
}
pRO.RateFactor = (double)rateFactor;
lblGesamtStunden.Text = String.Format("{0:0.00}", gesamtStunden);
this.bindingSource1.DataSource = pRO;
}

1
ReportImp/SynpraxReports/Properties/licenses.licx
View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

1197
ReportImp/SynpraxReports/ServicesOverviewReport.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

9
ReportImp/SynpraxReports/ServicesOverviewReport.cs
View File

@@ -1,3 +1,4 @@
using System;
using BeWo.Report;
using BeWo.Report.ReportObjects;
@@ -12,6 +13,14 @@ namespace SynpraxReports
public void SetReportDataSource(ServicesOverviewRO pRO)
{
if (String.IsNullOrEmpty(pRO.AbsenceTimes))
{
lblAbwesenheiten.Text = "Keine Krankenhausaufenthalte bekannt oder abrechnungsrelevant im Abrechnungszeitraum";
}
else
{
lblAbwesenheiten.Text = pRO.AbsenceTimes;
}
bindingSource1.DataSource = pRO;
}
}

54
ReportImp/TrialogReports/ServicesOverviewReport.Designer.cs generated
View File

@@ -64,6 +64,8 @@ namespace BeWo.TrialogReports
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.lblGfUnterschrift2 = new DevExpress.XtraReports.UI.XRLabel();
this.lblGfUnterschrift = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
@@ -76,8 +78,6 @@ namespace BeWo.TrialogReports
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldFLSBillable = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -442,8 +442,8 @@ namespace BeWo.TrialogReports
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel15,
this.xrLabel13,
this.lblGfUnterschrift2,
this.lblGfUnterschrift,
this.xrLabel12,
this.xrLabel11,
this.xrLabel10,
@@ -457,6 +457,27 @@ namespace BeWo.TrialogReports
this.ReportFooter.HeightF = 216.0001F;
this.ReportFooter.Name = "ReportFooter";
//
// lblGfUnterschrift2
//
this.lblGfUnterschrift2.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.lblGfUnterschrift2.Font = new System.Drawing.Font("Arial", 12F);
this.lblGfUnterschrift2.LocationFloat = new DevExpress.Utils.PointFloat(144.0002F, 198F);
this.lblGfUnterschrift2.Name = "lblGfUnterschrift2";
this.lblGfUnterschrift2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblGfUnterschrift2.SizeF = new System.Drawing.SizeF(188.9999F, 18.0001F);
this.lblGfUnterschrift2.StylePriority.UseBorders = false;
this.lblGfUnterschrift2.StylePriority.UseFont = false;
//
// lblGfUnterschrift
//
this.lblGfUnterschrift.Font = new System.Drawing.Font("Arial", 12F);
this.lblGfUnterschrift.LocationFloat = new DevExpress.Utils.PointFloat(0F, 198F);
this.lblGfUnterschrift.Name = "lblGfUnterschrift";
this.lblGfUnterschrift.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblGfUnterschrift.SizeF = new System.Drawing.SizeF(144.0002F, 18.00003F);
this.lblGfUnterschrift.StylePriority.UseFont = false;
this.lblGfUnterschrift.Text = "Geschäftsleitung";
//
// xrLabel12
//
this.xrLabel12.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
@@ -583,27 +604,6 @@ namespace BeWo.TrialogReports
this.fieldFLSBillable.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldFLSBillable.Name = "fieldFLSBillable";
//
// xrLabel13
//
this.xrLabel13.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 198F);
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(144.0002F, 18.00003F);
this.xrLabel13.StylePriority.UseFont = false;
this.xrLabel13.Text = "Geschäftsleitung";
//
// xrLabel15
//
this.xrLabel15.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel15.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(144.0002F, 198F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.SizeF = new System.Drawing.SizeF(188.9999F, 18.0001F);
this.xrLabel15.StylePriority.UseBorders = false;
this.xrLabel15.StylePriority.UseFont = false;
//
// Stundenzettel
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -684,7 +684,7 @@ namespace BeWo.TrialogReports
private DevExpress.XtraReports.UI.XRTableCell cellDokHeader;
private DevExpress.XtraReports.UI.XRTableCell cellGoal;
private DevExpress.XtraReports.UI.XRLabel lblBewilligt;
private DevExpress.XtraReports.UI.XRLabel xrLabel15;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRLabel lblGfUnterschrift2;
private DevExpress.XtraReports.UI.XRLabel lblGfUnterschrift;
}
}

22
ReportImp/TrialogReports/ServicesOverviewReport.cs
View File

@@ -18,6 +18,16 @@ namespace BeWo.TrialogReports
public void SetReportDataSource(ServicesOverviewRO pRO)
{
bool showGfUnterschrift = false;
if (!String.IsNullOrWhiteSpace(pRO.Costbearer))
{
if (pRO.Costbearer.ToLower().Contains("jugendamt düsseldorf") && pRO.Costbearer.ToLower().Contains("weh") && (pRO.Costbearer.ToLower().Contains("27") || pRO.Costbearer.ToLower().Contains("35") || pRO.Costbearer.ToLower().Contains("ass")))
{
showGfUnterschrift = true;
}
}
bool isJugendamt = !String.IsNullOrWhiteSpace(pRO.Costbearer) && pRO.Costbearer.ToLower().Contains("jugendamt");
if (pRO.Services != null)
{
@@ -57,6 +67,18 @@ namespace BeWo.TrialogReports
BerechneBewilligteStundenProMonat(pRO);
}
if (showGfUnterschrift)
{
//
}
else
{
lblGfUnterschrift.Visible = false;
lblGfUnterschrift2.Visible = false;
ReportFooter.Height = 180;
}
this.bindingSource1.DataSource = pRO;
}

2
ReportImp/VkmAachenSbd/Service/CustomTimeSheetService.cs
View File

@@ -82,7 +82,7 @@ Mit freundlichen Grüßen
{BenutzerVorname} {BenutzerNachname}
Teamleitung Schulbegleitender Dienst
Verwaltung Schulbegleitender Dienst