diff --git a/ReportImp/AwoDortmund/AwoDortmund.csproj b/ReportImp/AwoDortmund/AwoDortmund.csproj
index 3dd551015..edb5abf7f 100644
--- a/ReportImp/AwoDortmund/AwoDortmund.csproj
+++ b/ReportImp/AwoDortmund/AwoDortmund.csproj
@@ -48,11 +48,12 @@
-
+
+
Component
-
- Finanzauswertung.cs
+
+ SonderFinanzauswertung.cs
Component
@@ -108,8 +109,8 @@
-
- Finanzauswertung.cs
+
+ SonderFinanzauswertung.cs
Designer
diff --git a/ReportImp/AwoDortmund/CustomReportCreator.cs b/ReportImp/AwoDortmund/CustomReportCreator.cs
new file mode 100644
index 000000000..74e058d45
--- /dev/null
+++ b/ReportImp/AwoDortmund/CustomReportCreator.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Report;
+using BeWo.Report.DefaultReports;
+using BeWo.Report.ReportObjects;
+using BeWo.Service.DCEntityMapper;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using DevExpress.XtraReports.UI;
+
+namespace AwoDortmund
+{
+ public class CustomReportCreator : DefaultReportCreator
+ {
+ public override XtraReport CreateQueryReport(long queryOid, string queryReportId)
+ {
+ if (queryOid == 300)
+ return CreateMonatFinanzauswertung(queryOid, queryReportId);
+
+ return base.CreateQueryReport(queryOid, queryReportId);
+ }
+
+ private XtraReport CreateMonatFinanzauswertung(long queryOid, string queryReportId)
+ {
+ var query = DAOFactory.GenericDAO.LoadByID(queryOid);
+
+ if (query == null)
+ return new XtraReport();
+
+ var path = Path.Combine(TempPath, queryReportId + ".xml");
+ var table = Utils.XMLDeserialize(path);
+ var qro = QueryRO.Create(query, table);
+
+ if (qro.Rows.Count > 0)
+ {
+ DateTime start = DateTime.Parse(qro.Rows[0].Field1.ToString());
+ DateTime end = start.AddMonths(1).AddDays(-1);
+
+ var ro = FinanceRO.Create(start, end);
+ var druck = new SonderFinanzauswertung();
+ druck.SetReportDataSource(ro);
+ return druck;
+ }
+ return new XtraReport();
+ }
+ }
+}
+
diff --git a/ReportImp/AwoDortmund/Finanzauswertung.cs b/ReportImp/AwoDortmund/Finanzauswertung.cs
deleted file mode 100644
index a8efc1209..000000000
--- a/ReportImp/AwoDortmund/Finanzauswertung.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-using System;
-using System.Collections.Generic;
-using AwoDortmund.Invoicing;
-using BeWo.Data.Access;
-using BeWo.Report.ReportObjects;
-using BS.Shared;
-using BS.Shared.Core;
-using BS.Shared.DataContracts;
-using BS.Shared.DataContracts.Compact;
-
-namespace BeWo.Report.DefaultReports
-{
- public partial class Finanzauswertung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport
- {
- public Finanzauswertung()
- {
- InitializeComponent();
- }
-
- //public void SetReportDataSource(FinanceRO pRO)
- //{
-
- // pRO.CalculateBillableAmountInReportTimeSpan();
-
- // if (pRO.ReportStartDate.HasValue && pRO.ReportEndDate.HasValue)
- // {
- // DateTime start = pRO.ReportStartDate.Value;
- // DateTime end = pRO.ReportEndDate.Value;
- // DateTimeSpan lastMonth = new DateTimeSpan();
- // lastMonth.StartDateTime = start;
- // lastMonth.EndDateTime = end.AddDays(1).AddTicks(-1);
-
- // if (start.Year == end.Year && start.Month == end.Month && start.Day == 1 &&
- // end.Day == DateTime.DaysInMonth(end.Year, end.Month))
- // {
- // lblTitel.Text = String.Format("Finanzauswertung {0:MMMM yyyy}", start);
- // cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:MMMM}", start);
- // cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:MMMM}", start);
-
- // }
- // else
- // {
- // lblTitel.Text = String.Format("Finanzauswertung {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
- // cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
- // cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
-
- // }
- // if (pRO.RateFactor.HasValue)
- // {
- // cellRateFactorHeader.Text = String.Format("geleistete Std. x {0:0.##}", pRO.RateFactor);
- // }
- // else
- // {
- // cellRateFactorHeader.Visible = false;
- // cellRateFactor.Visible = false;
- // }
-
-
- // if (pRO.SupportConceptFinanceList != null)
- // {
- // foreach (var scRo in pRO.SupportConceptFinanceList)
- // {
- // if (scRo.Costbearer2Supportconcept != null)
- // CalculateBillableAmountInReportTimeSpan(scRo, pRO.ReportStartDate.Value, pRO.ReportEndDate.Value);
-
- // var invoices = DAOFactory.SearchDAO.GetServiceInvoices(scRo.Costbearer2Supportconcept.CostBearer2SupportConceptOid.Value, lastMonth);
- // foreach (var i in invoices)
- // {
- // if (i.IsActive.Equals(ActivationTypeId.Active))
- // scRo.Custom1 = i.InvoiceBase.InvoiceNumber.ToString();
- // }
- // scRo.Custom5 = scRo.Costbearer2Supportconcept.SupportConcept.Customer.CostCenter;
-
-
- // //scRo.Custom1 = String.Format("{0} {1}", scRo.CostBearerName, scRo.Leistungskategorie);
- // String kst = GetKostenstelle(scRo);
-
- // if (String.IsNullOrEmpty(kst))
- // {
- // scRo.Custom5 = " ";
- // }
- // else
- // {
- // scRo.Custom5 = String.Format("Kostenstelle {0}", kst);
- // }
- // }
- // }
- // }
-
- // else
- // {
- // cellBewilligtImZeitraumHeader.Visible = false;
- // cellBewilligteFLSImBereich.Visible = false;
- // cellGeleistetImBereich.Visible = false;
- // cellGeleistetImZeitraumHeader.Visible = false;
- // cellRateFactorHeader.Visible = false;
- // cellRateFactor.Visible = false;
- // }
- // this.bindingSource1.DataSource = pRO;
- //}
-
- //private void CalculateBillableAmountInReportTimeSpan(FinanceRO.SupportConceptFinanceRO scRo, DateTime start, DateTime end)
- //{
- // Dictionary> dict = new Dictionary>();
-
- // CompactSupportConceptDC sc = CreateCompactSupportConcept(scRo.Costbearer2Supportconcept);
- // if (scRo.ServiceRecords != null)
- // {
- // foreach (var sr in scRo.ServiceRecords)
- // {
- // sr.AlreadyAccounted = false;
- // }
- // }
-
- // //if (scRo.Costbearer2Supportconcept.SupportConcept != null && scRo.Costbearer2Supportconcept.SupportConcept.CustomerFullName != null && scRo.Costbearer2Supportconcept.SupportConcept.CustomerFullName.Contains("Grote"))
- // //{
- // // int test = 0;
- // //}
-
- // dict.Add(sc, scRo.ServiceRecords);
- // var creator = new DefaultInvoiceCreation();
-
- // DateTimeSpan span = new DateTimeSpan();
- // span.StartDate = start;
- // span.EndDate = end;
-
-
- // //var invoices = creator.GenerateServiceInvoices(scRo.Costbearer2Supportconcept.CostBearer.CostBearerOid.Value, span, dict);
-
- // //if (invoices != null && invoices.Count == 1)
- // //{
- // // scRo.BillableAmountInReportTimeSpan = invoices[0].ClaimSum ?? 0;
- // //}
-
-
- //}
-
- //private CompactSupportConceptDC CreateCompactSupportConcept(SupportConceptCostBearerRelDC c2s)
- //{
- // var dc = new CompactSupportConceptDC();
- // dc.SupportConceptOid = c2s.SupportConcept.SupportConceptOid;
- // dc.CostBearerRelOids = new List();
- // dc.CostBearerRelOids.Add(c2s.CostBearer2SupportConceptOid.Value);
- // dc.IsApproved = true;
-
- // return dc;
- //}
-
- public void SetReportDataSource(FinanceRO pRO)
- {
- pRO.CalculateBillableAmountInReportTimeSpan();
-
- if (pRO.ReportStartDate.HasValue && pRO.ReportEndDate.HasValue)
- {
- DateTime start = pRO.ReportStartDate.Value;
- DateTime end = pRO.ReportEndDate.Value;
- DateTimeSpan lastMonth = new DateTimeSpan();
- lastMonth.StartDateTime = start;
- lastMonth.EndDateTime = end.AddDays(1).AddTicks(-1);
-
- if (start.Year == end.Year && start.Month == end.Month && start.Day == 1 &&
- end.Day == DateTime.DaysInMonth(end.Year, end.Month))
- {
- lblTitel.Text = String.Format("Finanzauswertung {0:MMMM yyyy}", start);
- cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:MMMM}", start);
- cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:MMMM}", start);
- }
- else
- {
- lblTitel.Text = String.Format("Finanzauswertung {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
- cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
- cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
- if (start.Year != end.Year || start.Month != end.Month)
- lastMonth.StartDateTime = new DateTime(end.Year, end.Month, 1);
- }
- if (pRO.RateFactor.HasValue)
- {
- cellRateFactorHeader.Text = String.Format("geleistete Std. x {0:0.##}", pRO.RateFactor);
- }
- else
- {
- cellRateFactorHeader.Visible = false;
- cellRateFactor.Visible = false;
- }
-
- if (pRO.SupportConceptFinanceList != null)
- {
- foreach (var scRo in pRO.SupportConceptFinanceList)
- {
- if (scRo.Costbearer2Supportconcept != null)
- {
- var invoices = DAOFactory.SearchDAO.GetServiceInvoices(scRo.Costbearer2Supportconcept.CostBearer2SupportConceptOid.Value, lastMonth);
- foreach (var i in invoices)
- {
- if (i.IsActive.Equals(ActivationTypeId.Active))
- scRo.Custom1 = i.InvoiceBase.InvoiceNumber.ToString();
- }
- String kst = GetKostenstelle(scRo);
-
- if (String.IsNullOrEmpty(kst))
- {
- scRo.Custom5 = " ";
- }
- else
- {
- scRo.Custom5 = String.Format("Kostenstelle {0}", kst);
- }
- }
- }
- }
- }
- else
- {
- cellBewilligtImZeitraumHeader.Visible = false;
- cellBewilligteFLSImBereich.Visible = false;
- cellGeleistetImBereich.Visible = false;
- cellGeleistetImZeitraumHeader.Visible = false;
- cellRateFactorHeader.Visible = false;
- cellRateFactor.Visible = false;
- }
- this.bindingSource1.DataSource = pRO;
- }
-
- private string GetKostenstelle(FinanceRO.SupportConceptFinanceRO scRo)
- {
- return scRo.Costbearer2Supportconcept.SupportConcept.Customer.CostCenter;
- }
- }
-}
diff --git a/ReportImp/AwoDortmund/SonderFinanzauswertung.cs b/ReportImp/AwoDortmund/SonderFinanzauswertung.cs
new file mode 100644
index 000000000..21561e3c9
--- /dev/null
+++ b/ReportImp/AwoDortmund/SonderFinanzauswertung.cs
@@ -0,0 +1,174 @@
+using System;
+using System.Collections.Generic;
+using AwoDortmund.Invoicing;
+using BeWo.Data.Access;
+using BeWo.Report.ReportObjects;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
+
+namespace BeWo.Report.DefaultReports
+{
+ public partial class SonderFinanzauswertung : DevExpress.XtraReports.UI.XtraReport//, IBeWoReport
+ {
+ public SonderFinanzauswertung()
+ {
+ InitializeComponent();
+ }
+
+ public void SetReportDataSource(FinanceRO pRO)
+ {
+ pRO.CalculateBillableAmountInReportTimeSpan();
+
+ if (pRO.ReportStartDate.HasValue && pRO.ReportEndDate.HasValue)
+ {
+ DateTime start = pRO.ReportStartDate.Value;
+ DateTime end = pRO.ReportEndDate.Value;
+ DateTimeSpan lastMonth = new DateTimeSpan();
+ lastMonth.StartDateTime = start;
+ lastMonth.EndDateTime = end.AddDays(1).AddTicks(-1);
+
+ if (start.Year == end.Year && start.Month == end.Month && start.Day == 1 &&
+ end.Day == DateTime.DaysInMonth(end.Year, end.Month))
+ {
+ lblTitel.Text = String.Format("Finanzauswertung {0:MMMM yyyy}", start);
+ cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:MMMM}", start);
+ cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:MMMM}", start);
+ }
+ else
+ {
+ lblTitel.Text = String.Format("Finanzauswertung {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
+ cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
+ cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
+ if (start.Year != end.Year || start.Month != end.Month)
+ lastMonth.StartDateTime = new DateTime(end.Year, end.Month, 1);
+ }
+ if (pRO.RateFactor.HasValue)
+ {
+ cellRateFactorHeader.Text = String.Format("geleistete Std. x {0:0.##}", pRO.RateFactor);
+ }
+ else
+ {
+ cellRateFactorHeader.Visible = false;
+ cellRateFactor.Visible = false;
+ }
+
+ if (pRO.SupportConceptFinanceList != null)
+ {
+ var listLength = pRO.SupportConceptFinanceList.Count;
+
+ for (int i = listLength - 1; i >= 0; i--)
+ {
+ var scRo = pRO.SupportConceptFinanceList[i];
+ if (scRo.Costbearer2Supportconcept != null)
+ {
+ String kst = GetKostenstelle(scRo);
+
+ if (String.IsNullOrEmpty(kst) || kst.Contains("610900"))
+ {
+ scRo.Custom5 = "Kostenstelle 610900 - BEWO";
+ }
+ else if (kst.Contains("610915"))
+ {
+ scRo.Custom5 = "Kostenstelle 610915 - Assistenzdienst";
+ }
+ else if (kst.Contains("610905"))
+ {
+ scRo.Custom5 = "Kostenstelle 610905 - Soziotherapie";
+ }
+ else
+ {
+ scRo.Custom5 = String.Format("Kostenstelle {0}", kst);
+ }
+ var invoices = DAOFactory.SearchDAO.GetServiceInvoices(scRo.Costbearer2Supportconcept.CostBearer2SupportConceptOid.Value, lastMonth);
+ // Splitten der Zeilen für die Krankenkassen
+ if (!String.IsNullOrEmpty(kst) && kst.Contains("610915"))
+ {
+ var count = 0;
+ var invCount = 0;
+ foreach (var ii in invoices)
+ {
+ if (ii.IsActive.Equals(ActivationTypeId.Active))
+ invCount += 1;
+ }
+
+ foreach (var ii in invoices)
+ {
+ if (ii.IsActive.Equals(ActivationTypeId.Active))
+ {
+ count += 1;
+ if (count == 1)
+ {
+ scRo.Custom1 = ii.InvoiceBase.InvoiceNumber.ToString();
+ if (invCount > 1)
+ {
+ scRo.ApprovedHoursInReportTimeSpan = 0;
+ scRo.BillableHoursInReportTimeSpanWithFactor = 0;
+ scRo.BillableAmountInReportTimeSpan = (decimal)ii.GetTotalClaim();
+ if (ii.ServiceInvoicePeriodList != null && ii.ServiceInvoicePeriodList[0].InvoiceItemList != null)
+ {
+ scRo.BillableHoursInReportTimeSpan = ii.ServiceInvoicePeriodList[0].InvoiceItemList[0].UnitCount ?? 0;
+ scRo.HourlyRate = ii.ServiceInvoicePeriodList[0].InvoiceItemList[0].AmountPerUnit ?? 0;
+ }
+ }
+ }
+
+ if (count > 1)
+ {
+ var ro = new FinanceRO.SupportConceptFinanceRO();
+ ro.CustomerName = scRo.CustomerName;
+ ro.CostBearerName = scRo.CostBearerName;
+ ro.SupportConceptApprovalPeriod = scRo.SupportConceptApprovalPeriod;
+ ro.Custom5 = scRo.Custom5;
+ ro.Custom1 = ii.InvoiceBase.InvoiceNumber.ToString();
+ ro.BillableAmountInReportTimeSpan = (decimal)ii.GetTotalClaim();
+ if (ii.ServiceInvoicePeriodList != null && ii.ServiceInvoicePeriodList[0].InvoiceItemList != null)
+ {
+ ro.BillableHoursInReportTimeSpan = ii.ServiceInvoicePeriodList[0].InvoiceItemList[0].UnitCount ?? 0;
+ ro.HourlyRate = ii.ServiceInvoicePeriodList[0].InvoiceItemList[0].AmountPerUnit ?? 0;
+ }
+ pRO.SupportConceptFinanceList.Add(ro);
+ }
+ }
+ }
+ }
+ else
+ {
+ foreach (var ii in invoices)
+ {
+ if (ii.IsActive.Equals(ActivationTypeId.Active))
+ {
+ scRo.Custom1 = ii.InvoiceBase.InvoiceNumber.ToString();
+ if (!String.IsNullOrEmpty(kst) && kst.Contains("610905"))
+ {
+ if (ii.ServiceInvoicePeriodList != null && ii.ServiceInvoicePeriodList[0].InvoiceItemList != null)
+ {
+ scRo.HourlyRate = ii.ServiceInvoicePeriodList[0].InvoiceItemList[0].AmountPerUnit ?? 0;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ cellBewilligtImZeitraumHeader.Visible = false;
+ cellBewilligteFLSImBereich.Visible = false;
+ cellGeleistetImBereich.Visible = false;
+ cellGeleistetImZeitraumHeader.Visible = false;
+ cellRateFactorHeader.Visible = false;
+ cellRateFactor.Visible = false;
+ }
+ this.bindingSource1.DataSource = pRO;
+ }
+
+ private string GetKostenstelle(FinanceRO.SupportConceptFinanceRO scRo)
+ {
+ return scRo.Costbearer2Supportconcept.SupportConcept.Customer.CostCenter;
+ }
+ }
+}
diff --git a/ReportImp/AwoDortmund/Finanzauswertung.designer.cs b/ReportImp/AwoDortmund/SonderFinanzauswertung.designer.cs
similarity index 96%
rename from ReportImp/AwoDortmund/Finanzauswertung.designer.cs
rename to ReportImp/AwoDortmund/SonderFinanzauswertung.designer.cs
index 3de105ffe..bb03527b6 100644
--- a/ReportImp/AwoDortmund/Finanzauswertung.designer.cs
+++ b/ReportImp/AwoDortmund/SonderFinanzauswertung.designer.cs
@@ -1,7 +1,7 @@
using BeWo.Report.ReportObjects;
namespace BeWo.Report.DefaultReports
{
- partial class Finanzauswertung
+ partial class SonderFinanzauswertung
{
///
/// Required designer variable.
@@ -75,6 +75,9 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
@@ -87,9 +90,6 @@ namespace BeWo.Report.DefaultReports
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
- this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
- this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -164,14 +164,14 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Custom1")});
this.xrTableCell30.Name = "xrTableCell30";
- this.xrTableCell30.Weight = 0.28194249030203633D;
+ this.xrTableCell30.Weight = 0.24372226596051094D;
//
// xrTableCell6
//
this.xrTableCell6.Multiline = true;
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Text = "[CustomerName]\r\n[SupportConceptTimeSpanString]";
- this.xrTableCell6.Weight = 0.64161752326140242D;
+ this.xrTableCell6.Weight = 0.65583456770200232D;
//
// xrTableCell7
//
@@ -181,7 +181,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "Mitarbeiter/in";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell7.Weight = 0.39697197407686857D;
+ this.xrTableCell7.Weight = 0.44313159214105335D;
//
// cellBewilligteFLSImBereich
//
@@ -191,7 +191,7 @@ namespace BeWo.Report.DefaultReports
this.cellBewilligteFLSImBereich.StylePriority.UseTextAlignment = false;
this.cellBewilligteFLSImBereich.Text = "cellBewilligteFLSImBereich";
this.cellBewilligteFLSImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.cellBewilligteFLSImBereich.Weight = 0.33234834297277566D;
+ this.cellBewilligteFLSImBereich.Weight = 0.33234861343875954D;
//
// cellGeleistetImBereich
//
@@ -201,7 +201,7 @@ namespace BeWo.Report.DefaultReports
this.cellGeleistetImBereich.StylePriority.UseTextAlignment = false;
this.cellGeleistetImBereich.Text = "cellGeleistetImBereich";
this.cellGeleistetImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.cellGeleistetImBereich.Weight = 0.33234861340684652D;
+ this.cellGeleistetImBereich.Weight = 0.33234861340684646D;
//
// cellRateFactor
//
@@ -211,7 +211,7 @@ namespace BeWo.Report.DefaultReports
this.cellRateFactor.StylePriority.UseTextAlignment = false;
this.cellRateFactor.Text = "cellRateFactor";
this.cellRateFactor.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.cellRateFactor.Weight = 0.3323484781738546D;
+ this.cellRateFactor.Weight = 0.33234820770787077D;
//
// xrTableCell8
//
@@ -220,7 +220,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell8.Weight = 0.31019204125307365D;
+ this.xrTableCell8.Weight = 0.2880356030898143D;
//
// xrTableCell26
//
@@ -312,13 +312,13 @@ namespace BeWo.Report.DefaultReports
//
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Text = "RG Nr.";
- this.xrTableCell28.Weight = 0.28194241879275189D;
+ this.xrTableCell28.Weight = 0.24372229802479162D;
//
// xrTableCell1
//
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Text = "KlientIn/Hilfeplan";
- this.xrTableCell1.Weight = 0.64161765487934708D;
+ this.xrTableCell1.Weight = 0.65583452947940246D;
//
// xrTableCell2
//
@@ -326,7 +326,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "Kostenträger";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell2.Weight = 0.39697167653871296D;
+ this.xrTableCell2.Weight = 0.44313142724068466D;
//
// cellBewilligtImZeitraumHeader
//
@@ -358,7 +358,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "€/Stunde";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell5.Weight = 0.31019199346200216D;
+ this.xrTableCell5.Weight = 0.28803543821556626D;
//
// xrTableCell25
//
@@ -366,7 +366,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell25.StylePriority.UseTextAlignment = false;
this.xrTableCell25.Text = "Betrag";
this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell25.Weight = 0.42097478659830467D;
+ this.xrTableCell25.Weight = 0.42097483731067376D;
//
// GroupFooter2
//
@@ -417,7 +417,7 @@ namespace BeWo.Report.DefaultReports
// xrTableCell3
//
this.xrTableCell3.Name = "xrTableCell3";
- this.xrTableCell3.Weight = 0.28194239053638581D;
+ this.xrTableCell3.Weight = 0.24372228360791093D;
//
// xrTableCell15
//
@@ -426,7 +426,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell15.Weight = 0.64161782384139809D;
+ this.xrTableCell15.Weight = 0.65583461506079621D;
//
// xrTableCell16
//
@@ -434,7 +434,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell16.Weight = 0.39697214196781172D;
+ this.xrTableCell16.Weight = 0.44313176113805786D;
//
// xrTableCell22
//
@@ -448,7 +448,7 @@ namespace BeWo.Report.DefaultReports
xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell22.Summary = xrSummary2;
this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell22.Weight = 0.33234832553773658D;
+ this.xrTableCell22.Weight = 0.3323485960037269D;
//
// xrTableCell23
//
@@ -462,7 +462,7 @@ namespace BeWo.Report.DefaultReports
xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell23.Summary = xrSummary3;
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell23.Weight = 0.33234832550581894D;
+ this.xrTableCell23.Weight = 0.33234859597180927D;
//
// xrTableCell24
//
@@ -476,14 +476,14 @@ namespace BeWo.Report.DefaultReports
xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell24.Summary = xrSummary4;
this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell24.Weight = 0.33234873120481223D;
+ this.xrTableCell24.Weight = 0.33234819027283158D;
//
// xrTableCell9
//
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell9.Weight = 0.31019202222531739D;
+ this.xrTableCell9.Weight = 0.288035718764148D;
//
// xrTableCell27
//
@@ -497,6 +497,32 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell27.Weight = 0.4209748242446183D;
//
+ // GroupHeader1
+ //
+ this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel1});
+ this.GroupHeader1.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
+ new DevExpress.XtraReports.UI.GroupField("Custom5", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
+ this.GroupHeader1.HeightF = 41.66667F;
+ this.GroupHeader1.Level = 1;
+ this.GroupHeader1.Name = "GroupHeader1";
+ //
+ // xrLabel1
+ //
+ this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Custom5")});
+ this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
+ this.xrLabel1.Name = "xrLabel1";
+ this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel1.SizeF = new System.Drawing.SizeF(351.0001F, 23F);
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.Text = "xrLabel1";
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO);
+ //
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -598,32 +624,6 @@ namespace BeWo.Report.DefaultReports
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
- // GroupHeader1
- //
- this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrLabel1});
- this.GroupHeader1.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
- new DevExpress.XtraReports.UI.GroupField("Custom5", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
- this.GroupHeader1.HeightF = 41.66667F;
- this.GroupHeader1.Level = 1;
- this.GroupHeader1.Name = "GroupHeader1";
- //
- // xrLabel1
- //
- this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Custom5")});
- this.xrLabel1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
- this.xrLabel1.Name = "xrLabel1";
- this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel1.SizeF = new System.Drawing.SizeF(100F, 23F);
- this.xrLabel1.StylePriority.UseFont = false;
- this.xrLabel1.Text = "xrLabel1";
- //
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO);
- //
// Finanzauswertung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
diff --git a/ReportImp/AwoDortmund/Finanzauswertung.resx b/ReportImp/AwoDortmund/SonderFinanzauswertung.resx
similarity index 100%
rename from ReportImp/AwoDortmund/Finanzauswertung.resx
rename to ReportImp/AwoDortmund/SonderFinanzauswertung.resx
diff --git a/ReportImp/BetreuWoReports/ServicesOverviewReport.Designer.cs b/ReportImp/BetreuWoReports/ServicesOverviewReport.Designer.cs
index 3d9491b34..a78205546 100644
--- a/ReportImp/BetreuWoReports/ServicesOverviewReport.Designer.cs
+++ b/ReportImp/BetreuWoReports/ServicesOverviewReport.Designer.cs
@@ -88,6 +88,9 @@ namespace BeWo.BetreuWoReports
this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldMinutenProWoche = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldApprovedMinutesPerWeek = new DevExpress.XtraReports.UI.CalculatedField();
+ this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -108,7 +111,7 @@ namespace BeWo.BetreuWoReports
this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
- this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(684.0002F, 20F);
+ this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(707F, 20F);
this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
this.xrTableServiceRecords1.StylePriority.UseBorders = false;
this.xrTableServiceRecords1.StylePriority.UseFont = false;
@@ -123,7 +126,8 @@ namespace BeWo.BetreuWoReports
this.xrTableCell1,
this.xrTableCell2,
this.xrTableCell11,
- this.xrTableCell9});
+ this.xrTableCell9,
+ this.xrTableCell8});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow2.StylePriority.UseTextAlignment = false;
@@ -152,19 +156,19 @@ namespace BeWo.BetreuWoReports
this.xrTableCell4.StylePriority.UsePadding = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "von";
- this.xrTableCell4.Weight = 0.14631550810433525D;
+ this.xrTableCell4.Weight = 0.097543671938006463D;
//
// xrTableCell1
//
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Text = "bis";
- this.xrTableCell1.Weight = 0.14631550830166079D;
+ this.xrTableCell1.Weight = 0.097543672135332021D;
//
// xrTableCell2
//
this.xrTableCell2.Name = "xrTableCell2";
- this.xrTableCell2.Text = "Mitarbeiter";
- this.xrTableCell2.Weight = 0.24385918063431838D;
+ this.xrTableCell2.Text = "Mitarbeiter/in";
+ this.xrTableCell2.Weight = 0.24385921784427636D;
//
// xrTableCell11
//
@@ -175,7 +179,7 @@ namespace BeWo.BetreuWoReports
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.Text = "Minuten";
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- this.xrTableCell11.Weight = 0.19508734229740865D;
+ this.xrTableCell11.Weight = 0.19508734229740868D;
//
// xrTableCell9
//
@@ -184,7 +188,7 @@ namespace BeWo.BetreuWoReports
this.xrTableCell9.StylePriority.UsePadding = false;
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "Modul";
- this.xrTableCell9.Weight = 0.65598164690312932D;
+ this.xrTableCell9.Weight = 0.3482101965629083D;
//
// DetailReport
//
@@ -217,7 +221,7 @@ namespace BeWo.BetreuWoReports
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow6});
- this.xrTable3.SizeF = new System.Drawing.SizeF(684.0002F, 20F);
+ this.xrTable3.SizeF = new System.Drawing.SizeF(707F, 20F);
this.xrTable3.StylePriority.UseBorders = false;
this.xrTable3.StylePriority.UseFont = false;
this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -231,7 +235,8 @@ namespace BeWo.BetreuWoReports
this.xrTableCell14,
this.xrTableCell15,
this.xrTableCell16,
- this.xrTableCell17});
+ this.xrTableCell17,
+ this.xrTableCell10});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -265,7 +270,7 @@ namespace BeWo.BetreuWoReports
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "xrTableCell7";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell7.Weight = 0.075757564277447342D;
+ this.xrTableCell7.Weight = 0.050505000538928632D;
//
// xrTableCell14
//
@@ -277,7 +282,7 @@ namespace BeWo.BetreuWoReports
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.Text = "xrTableCell14";
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell14.Weight = 0.0757575642774482D;
+ this.xrTableCell14.Weight = 0.050505087236594456D;
//
// xrTableCell15
//
@@ -289,7 +294,7 @@ namespace BeWo.BetreuWoReports
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.Text = "xrTableCell15";
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell15.Weight = 0.12626261060743146D;
+ this.xrTableCell15.Weight = 0.12626262024050536D;
//
// xrTableCell16
//
@@ -314,7 +319,7 @@ namespace BeWo.BetreuWoReports
this.xrTableCell17.StylePriority.UseTextAlignment = false;
this.xrTableCell17.Text = "xrTableCell17";
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell17.Weight = 0.33964670681491133D;
+ this.xrTableCell17.Weight = 0.18029229511861927D;
//
// GroupHeader1
//
@@ -329,13 +334,13 @@ namespace BeWo.BetreuWoReports
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel18});
- this.GroupFooter1.HeightF = 27.00001F;
+ this.GroupFooter1.HeightF = 27.00007F;
this.GroupFooter1.Name = "GroupFooter1";
//
// xrLabel18
//
this.xrLabel18.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold);
- this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(269.9999F, 0F);
+ this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(295F, 6.357829E-05F);
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel18.SizeF = new System.Drawing.SizeF(155.4584F, 27.00001F);
@@ -590,7 +595,7 @@ namespace BeWo.BetreuWoReports
// xrLabel14
//
this.xrLabel14.Font = new System.Drawing.Font("Arial", 9.75F);
- this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(480.0415F, 9.999974F);
+ this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(492.9581F, 9.999974F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(56.49997F, 18.00003F);
@@ -602,7 +607,7 @@ namespace BeWo.BetreuWoReports
this.xrLabel12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLHoursMinutesString", "{0:0.##}")});
this.xrLabel12.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold);
- this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(425.4583F, 9.999974F);
+ this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(438.3749F, 9.999974F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(54.58328F, 18.00003F);
@@ -615,7 +620,7 @@ namespace BeWo.BetreuWoReports
// xrLabel9
//
this.xrLabel9.Font = new System.Drawing.Font("Arial", 9.75F);
- this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(368.9583F, 9.999974F);
+ this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(376.8301F, 9.999974F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(56.49997F, 18.00003F);
@@ -641,10 +646,10 @@ namespace BeWo.BetreuWoReports
this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMBillable", "{0:0.##}")});
this.xrLabel4.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold);
- this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(282.0834F, 9.999974F);
+ this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(295F, 9.999974F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F);
- this.xrLabel4.SizeF = new System.Drawing.SizeF(86.87497F, 18.00003F);
+ this.xrLabel4.SizeF = new System.Drawing.SizeF(80F, 18.00003F);
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UsePadding = false;
this.xrLabel4.StylePriority.UseTextAlignment = false;
@@ -680,6 +685,33 @@ namespace BeWo.BetreuWoReports
this.fieldApprovedMinutesPerWeek.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldApprovedMinutesPerWeek.Name = "fieldApprovedMinutesPerWeek";
//
+ // xrTableCell8
+ //
+ this.xrTableCell8.Name = "xrTableCell8";
+ this.xrTableCell8.Text = "Unterschrift Klient/in";
+ this.xrTableCell8.Weight = 0.46140221684636357D;
+ //
+ // xrTableCell10
+ //
+ this.xrTableCell10.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.picSignature});
+ this.xrTableCell10.Name = "xrTableCell10";
+ this.xrTableCell10.StylePriority.UseTextAlignment = false;
+ this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell10.Weight = 0.23889960786930606D;
+ //
+ // picSignature
+ //
+ this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")});
+ this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.picSignature.Name = "picSignature";
+ this.picSignature.SizeF = new System.Drawing.SizeF(189.2085F, 20.00001F);
+ this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+ this.picSignature.StylePriority.UseBorders = false;
+ this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint);
+ //
// Stundenzettel
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -771,5 +803,8 @@ namespace BeWo.BetreuWoReports
private DevExpress.XtraReports.UI.XRPanel xrPanel1;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+ private DevExpress.XtraReports.UI.XRPictureBox picSignature;
}
}
diff --git a/ReportImp/BetreuWoReports/ServicesOverviewReport.cs b/ReportImp/BetreuWoReports/ServicesOverviewReport.cs
index d4beeb95c..6c188d4ae 100644
--- a/ReportImp/BetreuWoReports/ServicesOverviewReport.cs
+++ b/ReportImp/BetreuWoReports/ServicesOverviewReport.cs
@@ -4,6 +4,10 @@ using System.ComponentModel;
using DevExpress.XtraReports.UI;
using BeWo.Report.ReportObjects;
using BeWo.Report;
+using System.Drawing;
+using System.IO;
+using BS.Shared.Core;
+using System.Text.RegularExpressions;
namespace BeWo.BetreuWoReports
{
@@ -22,6 +26,7 @@ namespace BeWo.BetreuWoReports
{
foreach (var item in pRO.Services)
{
+ ServicesOverviewRO.CreateSignatureString(item);
if (item.CustomerCount > 1)
{
item.ServiceDescription += " (" + item.CustomerCount + " Teilnehmer)";
@@ -30,5 +35,32 @@ namespace BeWo.BetreuWoReports
}
this.bindingSource1.DataSource = pRO;
}
+
+ private void picSignature_BeforePrint(object sender, System.Drawing.Printing.PrintEventArgs e)
+ {
+ XRPictureBox xrBox = sender as XRPictureBox;
+ //var test = this.GetCurrent
+ string base64String = xrBox.Tag as string;
+ if (!String.IsNullOrWhiteSpace(base64String))
+ {
+ var base64Data = Regex.Match(base64String, @"data:image/(?.+?),(?.+)").Groups["data"].Value;
+ var binData = Convert.FromBase64String(base64Data);
+ Image img = ByteArrayToImage(binData);
+ xrBox.Image = Utils.CropImage(img);
+ }
+ else
+ {
+ xrBox.Image = null;
+ }
+ }
+
+ public Image ByteArrayToImage(byte[] byteArrayIn)
+ {
+ Image returnImage = null;
+ MemoryStream ms = new System.IO.MemoryStream(byteArrayIn);
+ returnImage = Image.FromStream(ms);
+
+ return returnImage;
+ }
}
}
diff --git a/ReportImp/VkmHamm/Teamauslastung.cs b/ReportImp/VkmHamm/Teamauslastung.cs
new file mode 100644
index 000000000..aa96add40
--- /dev/null
+++ b/ReportImp/VkmHamm/Teamauslastung.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using BeWo.Data.Entities;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+
+namespace VkmHamm
+{
+ [IDSpecificClass(Identifier = "Teamauslastung")]
+ public partial class Teamauslastung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport
+ {
+
+
+ public Teamauslastung()
+ {
+ InitializeComponent();
+ }
+
+ public void SetReportDataSource(MitarbeiterauslastungRO pRO)
+ {
+ AuslastungBerechnung b = new AuslastungBerechnung();
+ b.CreateReport(pRO);
+
+ foreach (var td in pRO.TeamDetailList)
+ {
+ foreach (var scd in td.SupportConceptDetailList)
+ {
+ if (scd.Customer != null && scd.Customer.Employee2CustomerList != null)
+ foreach (var e2c in scd.Customer.Employee2CustomerList)
+ {
+ foreach (var v2o in e2c.ValueList)
+ {
+ if (v2o.Entry.Type == ValueListEntryType.StaffRoleType)
+ {
+ if (v2o.Entry.Value.Contains("Bezugsbetreuer"))
+
+ {
+ scd.Custom3 = e2c.Employee.Person.LastName + ", " + scd.Customer.Employee2CustomerList[0].Employee.Person.FirstName;
+ if (e2c.Employee.Contracts != null && e2c.Employee.Contracts.Count != 0)
+ {
+ var contract = e2c.Employee.Contracts.FirstOrDefault(x => (!x.EntryDate.HasValue ||
+ x.EntryDate.Value <= pRO.ReportStartDate.Date) &&
+ (!x.ContractEndDate.HasValue || x.ContractEndDate.Value >= pRO.ReportStartDate.Date));
+ scd.Custom2 = String.Format("Wochenstunden {0:0.00}, FLS/Woche: {1:0.00}", contract.WeeklyTotalHours ?? 0, contract.WeeklyFLS ?? 0);
+ }
+ else
+ scd.Custom2 = "Wochenstunden 0.00, FLS/Woche: 0.00";
+ }
+ }
+ }
+ }
+ }
+ }
+
+ this.bindingSource1.DataSource = pRO;
+ }
+ }
+}
diff --git a/ReportImp/VkmHamm/Teamauslastung.designer.cs b/ReportImp/VkmHamm/Teamauslastung.designer.cs
new file mode 100644
index 000000000..4ac107289
--- /dev/null
+++ b/ReportImp/VkmHamm/Teamauslastung.designer.cs
@@ -0,0 +1,602 @@
+using BeWo.Report.ReportObjects;
+namespace VkmHamm
+{
+ partial class Teamauslastung
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ 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.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
+ this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+ this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+ this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+ this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
+ this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
+ this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
+ this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
+ this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
+ this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+ this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+ this.fieldTotalSC = new DevExpress.XtraReports.UI.CalculatedField();
+ this.fieldTotalEmp = new DevExpress.XtraReports.UI.CalculatedField();
+ this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+ //
+ // Detail
+ //
+ this.Detail.Expanded = false;
+ this.Detail.HeightF = 0F;
+ this.Detail.Name = "Detail";
+ this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // Detail1
+ //
+ this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel4,
+ this.xrLabel3,
+ this.xrLabel1});
+ this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.Detail1.HeightF = 25F;
+ this.Detail1.KeepTogether = true;
+ this.Detail1.KeepTogetherWithDetailReports = true;
+ this.Detail1.Name = "Detail1";
+ this.Detail1.StylePriority.UseFont = false;
+ //
+ // xrLabel1
+ //
+ this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.TeamName")});
+ this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrLabel1.Multiline = true;
+ this.xrLabel1.Name = "xrLabel1";
+ this.xrLabel1.SizeF = new System.Drawing.SizeF(350.0001F, 25F);
+ this.xrLabel1.StyleName = "Title";
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.Text = "xrLabel1";
+ //
+ // xrTableDetail
+ //
+ this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTableDetail.Name = "xrTableDetail";
+ this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRowDetail});
+ this.xrTableDetail.SizeF = new System.Drawing.SizeF(750F, 25F);
+ this.xrTableDetail.StylePriority.UseBorders = false;
+ this.xrTableDetail.StylePriority.UseFont = false;
+ this.xrTableDetail.StylePriority.UsePadding = false;
+ this.xrTableDetail.StylePriority.UseTextAlignment = false;
+ this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrTableRowDetail
+ //
+ this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell3,
+ this.xrTableCell19,
+ this.xrTableCell2,
+ this.xrTableCell28});
+ this.xrTableRowDetail.Name = "xrTableRowDetail";
+ this.xrTableRowDetail.Weight = 1D;
+ //
+ // xrTableCell3
+ //
+ this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.SupportConceptDetailList.CustomerFullName")});
+ this.xrTableCell3.Name = "xrTableCell3";
+ this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+ this.xrTableCell3.StylePriority.UseFont = false;
+ this.xrTableCell3.StylePriority.UsePadding = false;
+ this.xrTableCell3.StylePriority.UseTextAlignment = false;
+ this.xrTableCell3.Text = "xrTableCell3";
+ this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell3.Weight = 0.18034265103697025D;
+ //
+ // xrTableCell19
+ //
+ this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.SupportConceptDetailList.TimeRangeString", "{0:0.00}")});
+ this.xrTableCell19.Name = "xrTableCell19";
+ this.xrTableCell19.Text = "xrTableCell19";
+ this.xrTableCell19.Weight = 0.1352569882777277D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.SupportConceptDetailList.OrganisationName")});
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.Text = "xrTableCell2";
+ this.xrTableCell2.Weight = 0.18034265103697023D;
+ //
+ // xrTableCell28
+ //
+ this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.SupportConceptDetailList.ApprovedHoursPerWeek", "{0:0.00}")});
+ this.xrTableCell28.Name = "xrTableCell28";
+ this.xrTableCell28.Text = "xrTableCell28";
+ this.xrTableCell28.Weight = 0.18034265103697023D;
+ //
+ // DetailReport
+ //
+ this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail1,
+ this.DetailReport1});
+ this.DetailReport.DataMember = "TeamDetailList";
+ this.DetailReport.DataSource = this.bindingSource1;
+ this.DetailReport.Level = 0;
+ this.DetailReport.Name = "DetailReport";
+ //
+ // DetailReport1
+ //
+ this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail2,
+ this.GroupHeader2,
+ this.GroupHeader1,
+ this.GroupFooter2});
+ this.DetailReport1.DataMember = "TeamDetailList.SupportConceptDetailList";
+ this.DetailReport1.DataSource = this.bindingSource1;
+ this.DetailReport1.Level = 0;
+ this.DetailReport1.Name = "DetailReport1";
+ //
+ // Detail2
+ //
+ this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTableDetail});
+ this.Detail2.HeightF = 25F;
+ this.Detail2.Name = "Detail2";
+ //
+ // GroupHeader2
+ //
+ this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTableHeader});
+ this.GroupHeader2.HeightF = 40F;
+ this.GroupHeader2.Name = "GroupHeader2";
+ this.GroupHeader2.RepeatEveryPage = true;
+ //
+ // xrTableHeader
+ //
+ 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);
+ this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRowHeader});
+ this.xrTableHeader.SizeF = new System.Drawing.SizeF(750F, 40F);
+ this.xrTableHeader.StylePriority.UseBorders = false;
+ this.xrTableHeader.StylePriority.UseFont = false;
+ this.xrTableHeader.StylePriority.UsePadding = false;
+ this.xrTableHeader.StylePriority.UseTextAlignment = false;
+ this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrTableRowHeader
+ //
+ this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell5,
+ this.xrTableCell4,
+ this.xrTableCell1,
+ this.xrTableCell9});
+ this.xrTableRowHeader.Name = "xrTableRowHeader";
+ this.xrTableRowHeader.Weight = 1.5999999999999996D;
+ //
+ // xrTableCell5
+ //
+ 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 = "Klient/in";
+ this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell5.Weight = 0.18034264782021736D;
+ //
+ // xrTableCell4
+ //
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.Text = "Zeitraum";
+ this.xrTableCell4.Weight = 0.1352569910754918D;
+ //
+ // xrTableCell1
+ //
+ this.xrTableCell1.Name = "xrTableCell1";
+ this.xrTableCell1.Text = "Kostenträger";
+ this.xrTableCell1.Weight = 0.18034265124646462D;
+ //
+ // xrTableCell9
+ //
+ this.xrTableCell9.Multiline = true;
+ this.xrTableCell9.Name = "xrTableCell9";
+ this.xrTableCell9.Text = "Bewilligt/Woche";
+ this.xrTableCell9.Weight = 0.18034265124646462D;
+ //
+ // xrTable1
+ //
+ this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.000111262F, 0F);
+ this.xrTable1.Name = "xrTable1";
+ this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow1});
+ this.xrTable1.SizeF = new System.Drawing.SizeF(750F, 25F);
+ this.xrTable1.StylePriority.UseBorders = false;
+ this.xrTable1.StylePriority.UseFont = false;
+ this.xrTable1.StylePriority.UsePadding = false;
+ this.xrTable1.StylePriority.UseTextAlignment = false;
+ this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrTableRow1
+ //
+ this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell35,
+ this.xrTableCell38,
+ this.xrTableCell6,
+ this.cellSollGesamt});
+ this.xrTableRow1.Name = "xrTableRow1";
+ this.xrTableRow1.Weight = 1D;
+ //
+ // xrTableCell35
+ //
+ this.xrTableCell35.Name = "xrTableCell35";
+ this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+ this.xrTableCell35.StylePriority.UseFont = false;
+ this.xrTableCell35.StylePriority.UsePadding = false;
+ this.xrTableCell35.StylePriority.UseTextAlignment = false;
+ this.xrTableCell35.Text = "Gesamt pro Mitarbeiter/in";
+ this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell35.Weight = 0.18034265103697028D;
+ //
+ // xrTableCell38
+ //
+ this.xrTableCell38.Name = "xrTableCell38";
+ this.xrTableCell38.Weight = 0.1352569882777277D;
+ //
+ // xrTableCell6
+ //
+ this.xrTableCell6.Name = "xrTableCell6";
+ this.xrTableCell6.Weight = 0.18034265103697075D;
+ //
+ // cellSollGesamt
+ //
+ this.cellSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.SupportConceptDetailList.ApprovedHoursPerWeek")});
+ this.cellSollGesamt.Name = "cellSollGesamt";
+ xrSummary1.FormatString = "{0:#.##}";
+ xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.cellSollGesamt.Summary = xrSummary1;
+ this.cellSollGesamt.Weight = 0.18034265103697075D;
+ //
+ // GroupHeader1
+ //
+ this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel5,
+ this.xrLabel2});
+ this.GroupHeader1.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
+ new DevExpress.XtraReports.UI.GroupField("Custom3", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
+ this.GroupHeader1.HeightF = 76.08331F;
+ this.GroupHeader1.Level = 1;
+ this.GroupHeader1.Name = "GroupHeader1";
+ //
+ // xrLabel2
+ //
+ this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.SupportConceptDetailList.Custom3")});
+ this.xrLabel2.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 28.08332F);
+ this.xrLabel2.Name = "xrLabel2";
+ this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel2.SizeF = new System.Drawing.SizeF(223.9583F, 23F);
+ this.xrLabel2.StylePriority.UseFont = false;
+ this.xrLabel2.Text = "xrLabel2";
+ //
+ // GroupFooter2
+ //
+ this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable1});
+ this.GroupFooter2.HeightF = 51.04167F;
+ this.GroupFooter2.Name = "GroupFooter2";
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterauslastungRO);
+ //
+ // ReportHeader
+ //
+ this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.lblMonat});
+ this.ReportHeader.HeightF = 60F;
+ this.ReportHeader.Name = "ReportHeader";
+ //
+ // lblMonat
+ //
+ this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Auslastung {0:MMMM yy}")});
+ this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
+ this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.lblMonat.Multiline = true;
+ this.lblMonat.Name = "lblMonat";
+ this.lblMonat.SizeF = new System.Drawing.SizeF(676.9999F, 25F);
+ this.lblMonat.StyleName = "Title";
+ this.lblMonat.StylePriority.UseFont = false;
+ this.lblMonat.Text = "lblMonat";
+ //
+ // pageFooterBand1
+ //
+ this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrPageInfo2,
+ this.xrPageInfo1});
+ this.pageFooterBand1.HeightF = 48F;
+ this.pageFooterBand1.Name = "pageFooterBand1";
+ //
+ // xrPageInfo2
+ //
+ this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrPageInfo2.Format = "Seite {0} von {1}";
+ this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(452.417F, 25F);
+ this.xrPageInfo2.Name = "xrPageInfo2";
+ this.xrPageInfo2.SizeF = new System.Drawing.SizeF(297.5831F, 23F);
+ this.xrPageInfo2.StyleName = "PageInfo";
+ this.xrPageInfo2.StylePriority.UseFont = false;
+ this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // xrPageInfo1
+ //
+ this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
+ this.xrPageInfo1.Name = "xrPageInfo1";
+ this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
+ this.xrPageInfo1.SizeF = new System.Drawing.SizeF(287F, 23F);
+ this.xrPageInfo1.StyleName = "PageInfo";
+ this.xrPageInfo1.StylePriority.UseFont = false;
+ //
+ // Title
+ //
+ this.Title.BackColor = System.Drawing.Color.White;
+ this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.Title.BorderWidth = 1F;
+ this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
+ this.Title.ForeColor = System.Drawing.Color.Black;
+ this.Title.Name = "Title";
+ //
+ // FieldCaption
+ //
+ this.FieldCaption.BackColor = System.Drawing.Color.White;
+ this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.FieldCaption.BorderWidth = 1F;
+ this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+ this.FieldCaption.ForeColor = System.Drawing.Color.Black;
+ this.FieldCaption.Name = "FieldCaption";
+ //
+ // PageInfo
+ //
+ this.PageInfo.BackColor = System.Drawing.Color.White;
+ this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.PageInfo.BorderWidth = 1F;
+ this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.PageInfo.ForeColor = System.Drawing.Color.Black;
+ this.PageInfo.Name = "PageInfo";
+ //
+ // DataField
+ //
+ this.DataField.BackColor = System.Drawing.Color.White;
+ this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.DataField.BorderWidth = 1F;
+ this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Name = "DataField";
+ //
+ // fieldFLS
+ //
+ this.fieldFLS.DataMember = "FLSReportGroups";
+ this.fieldFLS.Expression = "[TotalFLM] / 60";
+ this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldFLS.Name = "fieldFLS";
+ //
+ // topMarginBand1
+ //
+ this.topMarginBand1.HeightF = 50F;
+ this.topMarginBand1.Name = "topMarginBand1";
+ //
+ // bottomMarginBand1
+ //
+ this.bottomMarginBand1.HeightF = 30F;
+ this.bottomMarginBand1.Name = "bottomMarginBand1";
+ //
+ // fieldTotalSC
+ //
+ this.fieldTotalSC.DataMember = "TeamDetailList.SupportConceptDetailList";
+ this.fieldTotalSC.Expression = "[DirectIst]+[MittelbarIst]";
+ this.fieldTotalSC.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldTotalSC.Name = "fieldTotalSC";
+ //
+ // fieldTotalEmp
+ //
+ this.fieldTotalEmp.DataMember = "TeamDetailList";
+ this.fieldTotalEmp.Expression = "[DirectIst]+[MittelbarIst]";
+ this.fieldTotalEmp.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldTotalEmp.Name = "fieldTotalEmp";
+ //
+ // xrLabel3
+ //
+ this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.ApprovedHoursPerWeek", "{0:#.00}")});
+ this.xrLabel3.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(650.0001F, 0F);
+ this.xrLabel3.Name = "xrLabel3";
+ this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel3.SizeF = new System.Drawing.SizeF(100F, 23F);
+ this.xrLabel3.StylePriority.UseFont = false;
+ this.xrLabel3.Text = "xrLabel3";
+ //
+ // xrLabel4
+ //
+ this.xrLabel4.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
+ this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(510.4167F, 0F);
+ this.xrLabel4.Name = "xrLabel4";
+ this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel4.SizeF = new System.Drawing.SizeF(139.5833F, 23F);
+ this.xrLabel4.StylePriority.UseFont = false;
+ this.xrLabel4.Text = "Stunden im Team:";
+ //
+ // xrLabel5
+ //
+ this.xrLabel5.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
+ this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0.000111262F, 51.08331F);
+ this.xrLabel5.Multiline = true;
+ this.xrLabel5.Name = "xrLabel5";
+ this.xrLabel5.SizeF = new System.Drawing.SizeF(676.9999F, 25F);
+ this.xrLabel5.StyleName = "Title";
+ this.xrLabel5.StylePriority.UseFont = false;
+ this.xrLabel5.Text = "[Custom2]";
+ //
+ // Teamauslastung
+ //
+ this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail,
+ this.DetailReport,
+ this.ReportHeader,
+ this.pageFooterBand1,
+ this.topMarginBand1,
+ this.bottomMarginBand1});
+ this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+ this.fieldFLS,
+ this.fieldTotalSC,
+ this.fieldTotalEmp});
+ this.DataSource = this.bindingSource1;
+ this.Margins = new System.Drawing.Printing.Margins(50, 20, 50, 30);
+ this.PageHeight = 1169;
+ this.PageWidth = 827;
+ this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+ this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
+ this.Title,
+ this.FieldCaption,
+ this.PageInfo,
+ this.DataField});
+ this.Version = "17.1";
+ ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraReports.UI.DetailBand Detail;
+ private System.Windows.Forms.BindingSource bindingSource1;
+ private DevExpress.XtraReports.UI.DetailBand Detail1;
+ private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+ private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+ private DevExpress.XtraReports.UI.XRLabel lblMonat;
+ private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1;
+ private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
+ private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
+ private DevExpress.XtraReports.UI.XRControlStyle Title;
+ private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
+ private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
+ private DevExpress.XtraReports.UI.XRControlStyle DataField;
+ private DevExpress.XtraReports.UI.XRTable xrTableHeader;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+ private DevExpress.XtraReports.UI.XRTable xrTableDetail;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+ private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
+ private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+ private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
+ private DevExpress.XtraReports.UI.XRTable xrTable1;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
+ private DevExpress.XtraReports.UI.XRTableCell cellSollGesamt;
+ private DevExpress.XtraReports.UI.DetailReportBand DetailReport1;
+ private DevExpress.XtraReports.UI.DetailBand Detail2;
+ private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+ private DevExpress.XtraReports.UI.CalculatedField fieldTotalSC;
+ private DevExpress.XtraReports.UI.CalculatedField fieldTotalEmp;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+ private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+ private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+ }
+}
diff --git a/ReportImp/VkmHamm/Teamauslastung.resx b/ReportImp/VkmHamm/Teamauslastung.resx
new file mode 100644
index 000000000..d25f3eba2
--- /dev/null
+++ b/ReportImp/VkmHamm/Teamauslastung.resx
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/ReportImp/VkmHamm/VkmHamm.csproj b/ReportImp/VkmHamm/VkmHamm.csproj
index 092e76db9..adb5a0df5 100644
--- a/ReportImp/VkmHamm/VkmHamm.csproj
+++ b/ReportImp/VkmHamm/VkmHamm.csproj
@@ -119,6 +119,12 @@
SettlementReport2.cs
+
+ Component
+
+
+ Teamauslastung.cs
+
Component
@@ -180,6 +186,9 @@
SettlementReport2.cs
Designer
+
+ Teamauslastung.cs
+
Teamstundenkonto.cs