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

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

Browse Source
This commit is contained in:
Alexandra
2024-08-13 15:48:19 +02:00
parent fbd41cbc90 eca8924574
commit d09c47ec13
14 changed files with 186 additions and 1535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -188,7 +188,7 @@ namespace BeWoPlanerMobil.Controllers
if(Model.EmployeesForGroupAndMultiBooking is null)
{
Model.EmployeesForGroupAndMultiBooking = EmployeeService.GetAllCompactEmployees().OrderBy(e => e.LastName).ToList();
Model.EmployeesForGroupAndMultiBooking = EmployeeService.GetAllCompactEmployees().Where(e => e.ActivationType == ActivationTypeId.Active).OrderBy(e => e.LastName).ToList();
}
if (MobileSessionFacade.CheckForUserRight(UserRightType.ServiceRecord_AllowCreationForOtherEmployees))
@@ -197,7 +197,7 @@ namespace BeWoPlanerMobil.Controllers
}
else if(MobileSessionFacade.CheckForUserRight(UserRightType.ServiceRecord_AllowCreationForOtherTeamMember) && Model.Employee?.EmployeeOid != null)
{
Model.Employees = EmployeeService.GetAllTeamMember(MobileSessionFacade.LoggedInCompactEmployee);
Model.Employees = EmployeeService.GetAllTeamMember(MobileSessionFacade.LoggedInCompactEmployee).Where(e => e.ActivationType == ActivationTypeId.Active).ToList();
}
else
{

8
BeWoPlanerMobil/Controllers/ReportViewerController.cs
View File

@@ -99,6 +99,14 @@ namespace BeWoPlanerMobil.Controllers
Model.Queries = QueryService.GetAllQueriesOfType(QueryType.Public);
foreach(var query in Model.Queries.Where(q => q.Parameter?.Any() ?? false))
{
foreach(var parameter in query.Parameter.Where(p => p.ParamType == QueryParameterType.ValueListEntryType))
{
// ToDo: Hier am 05.08.2024 weitermachen!
}
}
if(Model.Employee?.EmployeeOid.HasValue ?? false)
{
Model.SupportConcepts = EmployeeService.GetActiveSupportConceptsForEmployee(Model.Employee.EmployeeOid, CustomerFilterEnum.All);

2
BeWoPlanerMobil/Models/ReportViewerModel.cs
View File

@@ -195,7 +195,7 @@ namespace BeWoPlanerMobil.Models
public Dictionary<long, SelectedValue> SelectedValues { get; set; } = new Dictionary<long, SelectedValue>();
public Dictionary<ValueListEntryType, List<ValueListEntryDC>> ValueListEntryTypes2ValueListEntries { get; set; } = new Dictionary<ValueListEntryType, List<ValueListEntryDC>>();
public List<SupportConceptCostBearerRelDC> CostBearer2SupportConceptRels { get; set; } = new List<SupportConceptCostBearerRelDC>();
}

8
BeWoPlanerMobil/Views/Main/GoalTreePartial.cshtml
View File

@@ -165,10 +165,10 @@
<div class="custom-control custom-checkbox goal-card-header float-left" onclick="stopToggle(event)" >
<input type="checkbox" class="custom-control-input goal-input" value="@goalTreeItem.ValueListEntryOid" @isCheckedValue id="goal-cb-@goalTreeItem.ValueListEntryOid" onchange="updateSelectedGoals()" />
<label class="custom-control-label goal-name-label @textClass" for="goal-cb-@goalTreeItem.ValueListEntryOid">@goalTreeItem.Header</label>
@if(AbstractModel.HasRightToRateGoals && ratingType != null)
@if(AbstractModel.HasRightToRateGoals)
{
<span style="cursor: pointer;" id="goal-rating-@goalTreeItem.ValueListEntryOid" class="badge badge-bewo-goal-rating goal-rating-badge ml-1" onclick="showGoalRatingPopup(@goalTreeItem.ValueListEntryOid)">
@(ratingType.DisplayName ?? goalTreeItem.RatingName)
@(ratingType?.DisplayName ?? goalTreeItem.RatingName)
</span>
}
</div>
@@ -194,10 +194,10 @@
<div class="custom-control custom-checkbox goal-text @marginBottom">
<input type="checkbox" class="custom-control-input goal-input" id="goal-cb-@goalTreeItem.ValueListEntryOid" @isCheckedValue onchange="updateSelectedGoals()">
<label for="goal-cb-@goalTreeItem.ValueListEntryOid" class="custom-control-label goal-name-label @textClass">@goalTreeItem.Header</label>
@if(AbstractModel.HasRightToRateGoals && ratingType != null)
@if(AbstractModel.HasRightToRateGoals)
{
<span id="goal-rating-@goalTreeItem.ValueListEntryOid" style="cursor: pointer;" class="badge badge-bewo-goal-rating goal-rating-badge ml-1" onclick="showGoalRatingPopup(@goalTreeItem.ValueListEntryOid)">
@(ratingType.DisplayName ?? goalTreeItem.RatingName)
@(ratingType?.DisplayName ?? goalTreeItem.RatingName)
</span>
}
</div>

187
ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.Designer.cs generated
View File

@@ -71,7 +71,6 @@ namespace BeWo.ASBBergischGladbachReports
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel();
this.lblFehlkontakt = new DevExpress.XtraReports.UI.XRLabel();
@@ -79,15 +78,17 @@ namespace BeWo.ASBBergischGladbachReports
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.lblOhneFK = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.lblOhneFKMitFaktor = new DevExpress.XtraReports.UI.XRLabel();
this.lblFehlkontakte = new DevExpress.XtraReports.UI.XRLabel();
this.lblFehlkontakteInfo = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -166,7 +167,7 @@ namespace BeWo.ASBBergischGladbachReports
this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell11.StylePriority.UseFont = false;
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.Text = "Stunden";
this.xrTableCell11.Text = "Minuten";
this.xrTableCell11.Weight = 0.59078228166487934D;
//
// DetailReport
@@ -529,7 +530,10 @@ namespace BeWo.ASBBergischGladbachReports
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel28,
this.lblFehlkontakte,
this.lblFehlkontakteInfo,
this.xrLabel4,
this.lblOhneFKMitFaktor,
this.xrLabel19,
this.xrLabel27,
this.lblFehlkontakt,
@@ -537,33 +541,15 @@ namespace BeWo.ASBBergischGladbachReports
this.xrLabel5,
this.xrPictureBox1,
this.xrLabel17,
this.xrLabel11,
this.xrLabel8,
this.xrLabel7,
this.xrLabel6,
this.xrLabel4,
this.lblOhneFK,
this.xrLabel3});
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.ReportFooter.HeightF = 149.6795F;
this.ReportFooter.HeightF = 215.8046F;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// xrLabel28
//
this.xrLabel28.BackColor = System.Drawing.Color.Transparent;
this.xrLabel28.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel28.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(360.9582F, 21.9792F);
this.xrLabel28.Name = "xrLabel28";
this.xrLabel28.SizeF = new System.Drawing.SizeF(320.0001F, 18.02081F);
this.xrLabel28.StylePriority.UseBackColor = false;
this.xrLabel28.StylePriority.UseBorders = false;
this.xrLabel28.StylePriority.UseFont = false;
this.xrLabel28.StylePriority.UsePadding = false;
this.xrLabel28.StylePriority.UseTextAlignment = false;
this.xrLabel28.Text = "ohne Faktor 1,2 (wird erst bei Abrechnung eingerechnet)";
this.xrLabel28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel19
//
this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
@@ -613,7 +599,7 @@ namespace BeWo.ASBBergischGladbachReports
//
this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")});
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(479.9581F, 95.1794F);
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(479.9581F, 161.3045F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
@@ -622,7 +608,7 @@ namespace BeWo.ASBBergischGladbachReports
//
this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")});
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(359.9583F, 95.1794F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(359.9583F, 161.3045F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(120F, 35.5F);
@@ -633,7 +619,7 @@ namespace BeWo.ASBBergischGladbachReports
//
this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")});
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(119.9999F, 95.17927F);
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(119.9999F, 161.3044F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F);
@@ -644,7 +630,7 @@ namespace BeWo.ASBBergischGladbachReports
this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")});
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 95.1794F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 161.3045F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(120F, 35.5F);
@@ -652,41 +638,10 @@ namespace BeWo.ASBBergischGladbachReports
this.xrLabel17.StylePriority.UseTextAlignment = false;
this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// xrLabel11
//
this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel11.BorderWidth = 1F;
this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSFehlkontakte")});
this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(438.6945F, 39.99996F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(242.2637F, 20.00002F);
this.xrLabel11.StylePriority.UseBorders = false;
this.xrLabel11.StylePriority.UseBorderWidth = false;
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UsePadding = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel8
//
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(266.9168F, 40.00001F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(171.1388F, 19.99998F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.Text = "Fehlkontakte in Stunden";
//
// xrLabel7
//
this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(359.9583F, 131.6795F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(359.9583F, 197.8046F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(319.3611F, 17.99997F);
@@ -697,7 +652,7 @@ namespace BeWo.ASBBergischGladbachReports
// xrLabel6
//
this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 131.6794F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 197.8045F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(319.3611F, 17.99997F);
@@ -705,37 +660,35 @@ namespace BeWo.ASBBergischGladbachReports
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.Text = "Datum, Unterschrift Mitarbeiter/in";
//
// xrLabel4
// lblOhneFK
//
this.xrLabel4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
this.lblOhneFK.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel4.BorderWidth = 2F;
this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSoFehlkontakte")});
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(438.0557F, 0F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(242.2637F, 21.9792F);
this.xrLabel4.StylePriority.UseBorders = false;
this.xrLabel4.StylePriority.UseBorderWidth = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UsePadding = false;
this.xrLabel4.StylePriority.UseTextAlignment = false;
this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrLabel4.TextFormatString = "{0:0.00}";
this.lblOhneFK.BorderWidth = 2F;
this.lblOhneFK.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.lblOhneFK.LocationFloat = new DevExpress.Utils.PointFloat(438.0555F, 0F);
this.lblOhneFK.Name = "lblOhneFK";
this.lblOhneFK.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.lblOhneFK.SizeF = new System.Drawing.SizeF(242.2638F, 50F);
this.lblOhneFK.StylePriority.UseBorders = false;
this.lblOhneFK.StylePriority.UseBorderWidth = false;
this.lblOhneFK.StylePriority.UseFont = false;
this.lblOhneFK.StylePriority.UsePadding = false;
this.lblOhneFK.StylePriority.UseTextAlignment = false;
this.lblOhneFK.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel3
//
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(266.9168F, 0F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(194.9168F, 0F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(171.1388F, 21.9792F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(243.1387F, 50F);
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Fachleistungen in Stunden";
this.xrLabel3.Text = "1. Summe der unmittelbaren Betreuungsleistungen (\"face-to-face\" beziehungsweise \"" +
"ear-to-ear\"):";
//
// fieldAbrechenbareMinuten
//
@@ -756,6 +709,65 @@ namespace BeWo.ASBBergischGladbachReports
this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS";
//
// xrLabel4
//
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(194.9168F, 49.99998F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(243.1388F, 50F);
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "2. Summe der mit dem Landschaftsverband Rheinland abzu-rechnenden Leistungen (=1 " +
"x 1,2)";
//
// lblOhneFKMitFaktor
//
this.lblOhneFKMitFaktor.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblOhneFKMitFaktor.BorderWidth = 2F;
this.lblOhneFKMitFaktor.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.lblOhneFKMitFaktor.LocationFloat = new DevExpress.Utils.PointFloat(438.6945F, 49.99998F);
this.lblOhneFKMitFaktor.Name = "lblOhneFKMitFaktor";
this.lblOhneFKMitFaktor.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.lblOhneFKMitFaktor.SizeF = new System.Drawing.SizeF(242.2638F, 50F);
this.lblOhneFKMitFaktor.StylePriority.UseBorders = false;
this.lblOhneFKMitFaktor.StylePriority.UseBorderWidth = false;
this.lblOhneFKMitFaktor.StylePriority.UseFont = false;
this.lblOhneFKMitFaktor.StylePriority.UsePadding = false;
this.lblOhneFKMitFaktor.StylePriority.UseTextAlignment = false;
this.lblOhneFKMitFaktor.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// lblFehlkontakte
//
this.lblFehlkontakte.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblFehlkontakte.BorderWidth = 2F;
this.lblFehlkontakte.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.lblFehlkontakte.LocationFloat = new DevExpress.Utils.PointFloat(438.0555F, 99.99995F);
this.lblFehlkontakte.Name = "lblFehlkontakte";
this.lblFehlkontakte.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.lblFehlkontakte.SizeF = new System.Drawing.SizeF(242.2638F, 49.99998F);
this.lblFehlkontakte.StylePriority.UseBorders = false;
this.lblFehlkontakte.StylePriority.UseBorderWidth = false;
this.lblFehlkontakte.StylePriority.UseFont = false;
this.lblFehlkontakte.StylePriority.UsePadding = false;
this.lblFehlkontakte.StylePriority.UseTextAlignment = false;
this.lblFehlkontakte.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// lblFehlkontakteInfo
//
this.lblFehlkontakteInfo.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.lblFehlkontakteInfo.LocationFloat = new DevExpress.Utils.PointFloat(194.9167F, 99.99995F);
this.lblFehlkontakteInfo.Multiline = true;
this.lblFehlkontakteInfo.Name = "lblFehlkontakteInfo";
this.lblFehlkontakteInfo.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblFehlkontakteInfo.SizeF = new System.Drawing.SizeF(243.1388F, 50F);
this.lblFehlkontakteInfo.StylePriority.UseFont = false;
this.lblFehlkontakteInfo.Text = "3. Summe der Fehlkontakte";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
@@ -835,13 +847,11 @@ namespace BeWo.ASBBergischGladbachReports
private DevExpress.XtraReports.UI.XRLabel xrLabel22;
private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareMinuten;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel lblOhneFK;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.CalculatedField fieldBillableFLS;
private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareFLS;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
@@ -853,6 +863,9 @@ namespace BeWo.ASBBergischGladbachReports
private DevExpress.XtraReports.UI.XRLabel lblFehlkontakt;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRLabel xrLabel28;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel lblOhneFKMitFaktor;
private DevExpress.XtraReports.UI.XRLabel lblFehlkontakte;
private DevExpress.XtraReports.UI.XRLabel lblFehlkontakteInfo;
}
}

14
ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.cs
View File

@@ -22,12 +22,12 @@ namespace BeWo.ASBBergischGladbachReports
{
if (s.IsBillable || s.ServiceDescription.ToLower().Contains("fehlkontakt") || s.ServiceCategory.ToLower().Contains("fehlkontakt"))
{
s.Notice = String.Format("{0:0.00}", s.Minutes / 60);
s.Notice = String.Format("{0:0.##}", s.Minutes);
s.Notice5 = "E";
if (s.IsGroup)
{
s.TimeRangeString += " Gruppe";
s.Notice = String.Format("{0} Teiln. = {1:0.00} Minuten", s.CustomerCount, s.Minutes);
s.Notice = String.Format("{0} Teiln. = {1:0.##} Minuten", s.CustomerCount, s.Minutes);
s.Notice5 = "GR";
}
if (s.ServiceDescription.ToLower().Contains("fehlkontakt") || s.ServiceCategory.ToLower().Contains("fehlkontakt"))
@@ -39,6 +39,16 @@ namespace BeWo.ASBBergischGladbachReports
}
pRO.Services = servicesBillable;
lblOhneFK.Text = string.Format("{0} = {1:0.00} Stunden", pRO.TotalFLMoFehlkontakte, pRO.TotalFLSoFehlkontakte);
lblOhneFKMitFaktor.Text = string.Format("{0:0.00} h x 1,2 = {1:0.00} h", pRO.TotalFLSoFehlkontakte, pRO.TotalFLSoFehlkontakte * 1.2);
if (pRO.TotalFLMFehlkontakte != 0 && pRO.TotalFLSFehlkontakte != 0)
lblFehlkontakte.Text = string.Format("{0} = {1:0.00} Stunden", pRO.TotalFLMFehlkontakte, pRO.TotalFLSFehlkontakte);
else
{
lblFehlkontakteInfo.Visible = false;
lblFehlkontakte.Visible = false;
}
}
bindingSource1.DataSource = pRO;

32
ReportImp/KetteReports/InvoiceCustomerReport.Designer.cs generated
View File

@@ -55,7 +55,7 @@ namespace BeWo.KetteReports
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.lblDebitor = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAbrechnungFuer = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
@@ -210,7 +210,7 @@ namespace BeWo.KetteReports
this.xrLabel6,
this.xrLabel5,
this.lblDebitor,
this.xrLabel3,
this.lblAbrechnungFuer,
this.xrLabel2});
this.ReportHeader.HeightF = 432.243F;
this.ReportHeader.Name = "ReportHeader";
@@ -339,7 +339,7 @@ namespace BeWo.KetteReports
this.xrTableCell19.StylePriority.UseBorders = false;
this.xrTableCell19.StylePriority.UsePadding = false;
this.xrTableCell19.StylePriority.UseTextAlignment = false;
this.xrTableCell19.Text = "anz";
this.xrTableCell19.Text = "Anz";
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell19.Weight = 0.56661576319449147D;
//
@@ -393,20 +393,20 @@ namespace BeWo.KetteReports
this.lblDebitor.StylePriority.UseFont = false;
this.lblDebitor.WordWrap = false;
//
// xrLabel3
// lblAbrechnungFuer
//
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
this.lblAbrechnungFuer.BackColor = System.Drawing.Color.Transparent;
this.lblAbrechnungFuer.CanShrink = true;
this.lblAbrechnungFuer.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 260.243F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F);
this.xrLabel3.StylePriority.UseBackColor = false;
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Abrechnung für [RecipientFirstName] [RecipientLastName]";
this.xrLabel3.WordWrap = false;
this.lblAbrechnungFuer.LocationFloat = new DevExpress.Utils.PointFloat(0F, 260.243F);
this.lblAbrechnungFuer.Name = "lblAbrechnungFuer";
this.lblAbrechnungFuer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAbrechnungFuer.SizeF = new System.Drawing.SizeF(650F, 16F);
this.lblAbrechnungFuer.StylePriority.UseBackColor = false;
this.lblAbrechnungFuer.StylePriority.UseFont = false;
this.lblAbrechnungFuer.Text = "Abrechnung für [RecipientFirstName] [RecipientLastName]";
this.lblAbrechnungFuer.WordWrap = false;
//
// xrLabel2
//
@@ -618,7 +618,7 @@ namespace BeWo.KetteReports
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel lblDebitor;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel lblAbrechnungFuer;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;

5
ReportImp/KetteReports/InvoiceCustomerReport.cs
View File

@@ -6,6 +6,7 @@ using System.Text;
using DevExpress.XtraReports.UI;
using BeWo.Report.ReportObjects;
using BeWo.Report;
using BS.Shared.Extensions;
namespace BeWo.KetteReports
{
@@ -64,8 +65,8 @@ namespace BeWo.KetteReports
"\nSollten Sie dem Lastschriftverfahren zugestimmt haben, wird der Rechnungsbetrag in den nächsten Tagen von ihrem Konto eingezogen.\nUm Ihre Überweisung besser zuordnen zu können bitten wir sie um die Angabe des Leistungsmonats, der GP-Nr. und der Rechnungsnummer.";
lblDebitor.Text = "";
if (!pRO.CustomerFirstName.IsNullOrEmpty() && !pRO.CustomerLastName.IsNullOrEmpty())
lblAbrechnungFuer.Text = string.Format("Abrechnung für {0} {1} {2}", pRO.CustomerSalutation, pRO.CustomerFirstName, pRO.CustomerLastName);
if (!String.IsNullOrEmpty(pRO.CustomerReferenceNumber) && pRO.CustomerReferenceNumber.Trim().Length > 0)
{

36
ReportImp/KetteReports/ServiceInvoiceReport.Designer.cs generated
View File

@@ -102,7 +102,7 @@ namespace KetteReports
//
// ReportHeader
//
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 0F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
@@ -122,7 +122,7 @@ namespace KetteReports
//
// xrPictureBox2
//
this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image")));
this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource"));
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(518.2781F, 54.8958F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(183.7219F, 145.1042F);
@@ -138,7 +138,7 @@ namespace KetteReports
//
// xrRichText1
//
this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
@@ -176,7 +176,8 @@ namespace KetteReports
// lblAdresszeileJA
//
this.lblAdresszeileJA.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.lblAdresszeileJA.Font = new System.Drawing.Font("Arial", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblAdresszeileJA.Font = new DevExpress.Drawing.DXFont("Arial", 7.5F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.lblAdresszeileJA.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblAdresszeileJA.Name = "lblAdresszeileJA";
this.lblAdresszeileJA.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -190,7 +191,7 @@ namespace KetteReports
//
// lblAbsenderJA
//
this.lblAbsenderJA.Font = new System.Drawing.Font("Arial", 8F);
this.lblAbsenderJA.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.lblAbsenderJA.LocationFloat = new DevExpress.Utils.PointFloat(518.278F, 0F);
this.lblAbsenderJA.Name = "lblAbsenderJA";
this.lblAbsenderJA.SerializableRtfString = resources.GetString("lblAbsenderJA.SerializableRtfString");
@@ -202,7 +203,7 @@ namespace KetteReports
//
this.lblKundennr.BackColor = System.Drawing.Color.Transparent;
this.lblKundennr.CanShrink = true;
this.lblKundennr.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.lblKundennr.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblKundennr.LocationFloat = new DevExpress.Utils.PointFloat(0F, 301.3541F);
this.lblKundennr.Multiline = true;
this.lblKundennr.Name = "lblKundennr";
@@ -216,7 +217,8 @@ namespace KetteReports
// lblAdresszeile
//
this.lblAdresszeile.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.lblAdresszeile.Font = new System.Drawing.Font("Arial", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblAdresszeile.Font = new DevExpress.Drawing.DXFont("Arial", 7.5F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.lblAdresszeile.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblAdresszeile.Name = "lblAdresszeile";
this.lblAdresszeile.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -229,7 +231,7 @@ namespace KetteReports
//
// lblAbsender
//
this.lblAbsender.Font = new System.Drawing.Font("Arial", 8F);
this.lblAbsender.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.lblAbsender.LocationFloat = new DevExpress.Utils.PointFloat(518.278F, 0F);
this.lblAbsender.Name = "lblAbsender";
this.lblAbsender.SerializableRtfString = resources.GetString("lblAbsender.SerializableRtfString");
@@ -251,7 +253,7 @@ namespace KetteReports
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 281.3541F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
@@ -266,7 +268,7 @@ namespace KetteReports
//
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 261.3542F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -280,7 +282,7 @@ namespace KetteReports
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 241.3542F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -371,7 +373,7 @@ namespace KetteReports
//
// xrLabel9
//
this.xrLabel9.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Italic);
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Italic);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.75F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -605,7 +607,7 @@ namespace KetteReports
this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitDescription")});
this.xrTableCell42.Name = "xrTableCell42";
this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell42.StylePriority.UseBorderColor = false;
@@ -725,7 +727,7 @@ namespace KetteReports
//
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")});
this.xrLabel1.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(436.1666F, 0F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -751,14 +753,14 @@ namespace KetteReports
this.DetailReport});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.Font = new System.Drawing.Font("Arial", 11F);
this.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(75, 50, 210, 70);
this.Margins = new DevExpress.Drawing.DXMargins(75F, 50F, 210F, 70F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.lblAbsenderJA)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.lblAbsender)).EndInit();

1386
ReportImp/KetteReports/ServiceInvoiceReport.resx
View File

File diff suppressed because one or more lines are too long

6
ReportImp/LandshuterNetzwerk/InvoiceCustomerReport.cs
View File

@@ -109,10 +109,10 @@ namespace LandshuterNetzwerk
pRO.Notice = "Therapeutische Wohngemeinschaft";
lblNameStandort.Text = "Ambulant Begleitetes Wohnen\nLandshut";
lblAnschriftKurz.Text = "Landshuter Netzwerk e.V., Postfach 1118, 84004 Landshut";
lblAnschriftKurz.Text = "Landshuter Netzwerk e.V., Postfach 2369, 84007 Landshut";
lblKontaktdaten.Text = @"
Bahnhofplatz 1a
84032 Landshut
Neustadt 464-465
84028 Landshut
Tel: 0871/96367- 0
Fax: 0871/96367-118
twg@landshuter-netzwerk.de

15
ReportImp/LandshuterNetzwerk/ServiceInvoiceReport.Designer.cs generated
View File

@@ -28,7 +28,6 @@ namespace LandshuterNetzwerk
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport));
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
@@ -88,7 +87,6 @@ namespace LandshuterNetzwerk
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel();
@@ -101,6 +99,7 @@ namespace LandshuterNetzwerk
this.xrLabel33 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel34 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.bindingSource1 = new System.Windows.Forms.BindingSource();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -220,8 +219,8 @@ namespace LandshuterNetzwerk
this.lblKontaktdaten.StylePriority.UseFont = false;
this.lblKontaktdaten.StylePriority.UseForeColor = false;
this.lblKontaktdaten.StylePriority.UseTextAlignment = false;
this.lblKontaktdaten.Text = "Bahnhofplatz 1a\r\n84032 Landshut\r\nTel: 0871/96367- 0\r\nFax: 0871/96367-118\r\nbew@lan" +
"dshuter-netzwerk.de\r\nwww.landshuter-netzwerk.de";
this.lblKontaktdaten.Text = "Neustadt 464-465\r\n84028 Landshut\r\nTel: 0871/96367- 0\r\nFax: 0871/96367-118\r\nbew@la" +
"ndshuter-netzwerk.de\r\nwww.landshuter-netzwerk.de";
this.lblKontaktdaten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel16
@@ -795,10 +794,6 @@ namespace LandshuterNetzwerk
this.xrTableCell4.TextFormatString = "{0:c}";
this.xrTableCell4.Weight = 0.68685377225213773D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -928,6 +923,10 @@ namespace LandshuterNetzwerk
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(125.5462F, 38.625F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.Squeeze;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

6
ReportImp/LandshuterNetzwerk/ServiceInvoiceReport.cs
View File

@@ -121,10 +121,10 @@ www.landshuter-netzwerk.de";
pRO.Notice = "Therapeutische Wohngemeinschaft";
lblNameStandort.Text = "Ambulant Begleitetes Wohnen\nLandshut";
lblAnschriftKurz.Text = "Landshuter Netzwerk e.V., Postfach 1118, 84004 Landshut";
lblAnschriftKurz.Text = "Landshuter Netzwerk e.V., Postfach 2369, 84007 Landshut";
lblKontaktdaten.Text = @"
Bahnhofplatz 1a
84032 Landshut
Neustadt 464-465
84028 Landshut
Tel: 0871/96367- 0
Fax: 0871/96367-118
twg@landshuter-netzwerk.de

12
ReportImp/LandshuterNetzwerk/SettlementReport.cs
View File

@@ -150,10 +150,10 @@ www.landshuter-netzwerk.de";
else if (team == "Therapeutische Wohngemeinschaft")
{
lblNameStandort.Text = "Therapeutische Wohngemeinschaften";
lblAnschriftKurz.Text = "Landshuter Netzwerk e.V., Postfach 1118, 84004 Landshut";
lblAnschriftKurz.Text = "Landshuter Netzwerk e.V., Postfach 2369, 84007 Landshut";
lblKontaktdaten.Text = @"
Bahnhofplatz 1a
84032 Landshut
Neustadt 464-465
84028 Landshut
Tel: 0871/96367- 0
Fax: 0871/96367-118
twg@landshuter-netzwerk.de
@@ -162,10 +162,10 @@ www.landshuter-netzwerk.de";
else
{
lblNameStandort.Text = team;
lblAnschriftKurz.Text = "Landshuter Netzwerk e.V., Postfach 1118, 84004 Landshut";
lblAnschriftKurz.Text = "Landshuter Netzwerk e.V., Postfach 2369, 84007 Landshut";
lblKontaktdaten.Text = @"
Bahnhofplatz 1a
84032 Landshut
Neustadt 464-465
84028 Landshut
Tel: 0871/96367- 0
Fax: 0871/96367-118
twg@landshuter-netzwerk.de