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

- Rechnungsformular Prof. Eggers Stiftung

Browse Source 
- Klientennamen im Jahresbericht eingebaut
- Bugfix Reports für fehlende Unterschriften
- Bugfix History
This commit is contained in:
Christian
2025-03-19 00:58:48 +01:00
parent 7d012635e9
commit bc48047b3e
23 changed files with 436 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
BeWo/View/Detail/AbsenceTimesView.xaml.cs
View File

@@ -76,28 +76,30 @@ namespace BeWo.View.Detail
private List<AbsenceTimeVM> PruefeAufUeberschneidungen()
{
var neu = AbsenceTimes.NewVM;
DateTime neuStart = neu.Start ?? DateTime.MinValue;
DateTime neuEnd = neu.End ?? DateTime.MaxValue;
List<AbsenceTimeVM> abwesenheitenMitUeberschneidungen = new List<AbsenceTimeVM>();
foreach (var alt in AbsenceTimes.VMList)
if (AbsenceTimes != null)
{
var neu = AbsenceTimes.NewVM;
DateTime altStart = alt.Start ?? DateTime.MinValue;
DateTime altEnd = alt.End ?? DateTime.MaxValue;
DateTime neuStart = neu.Start ?? DateTime.MinValue;
DateTime neuEnd = neu.End ?? DateTime.MaxValue;
if (neuEnd >= altStart && neuStart <= altEnd)
foreach (var alt in AbsenceTimes.VMList)
{
abwesenheitenMitUeberschneidungen.Add(alt);
DateTime altStart = alt.Start ?? DateTime.MinValue;
DateTime altEnd = alt.End ?? DateTime.MaxValue;
if (neuEnd >= altStart && neuStart <= altEnd)
{
abwesenheitenMitUeberschneidungen.Add(alt);
}
}
}
return abwesenheitenMitUeberschneidungen;
}

2
Queries/Einträge ohne Monatsunterschrift der Hauptbetreuung.txt
View File

@@ -26,6 +26,6 @@ order by p.Lastname, sr.startdate
INSERT INTO `query` (`Oid`,`Tid`,`Type`,`Title`,`SQL`,`Notice`,`InsTs`,`InsUser`,`UdpUser`,`Version`,`IsActive`,`SystemEntryID`,`UserGroupOids`,`ReportTypeName`,`FileName`,`ExportTitle`) VALUES (4713,24,0,'Einträge ohne Monatsunterschrift der Hauptbetreuung','SELECT \np.LastName as \'Nachname\',\np.Firstname as \'Vorname\',\nc2s.ApprovedStartDate as \'Bewilligt von\',\nc2s.ApprovedEndDate as \'Bewilligt bis\',\nscat.Name as \'Kategorie\',\nDate_Format(sr.StartDate, \'%d.%m.%Y\') as \'Datum\',\nIF (Date_Format(sr.StartDate, \'%s\') <> \'00\', \'\', Date_Format(sr.StartDate, \'%H:%i\')) as \'von\',\nIF (Date_Format(sr.StartDate, \'%s\') <> \'00\', \'\', Date_Format(Date_Add(sr.StartDate, INTERVAL sr.Roundedduration MINUTE), \'%H:%i\')) as \'bis\',\nRound(sr.Roundedduration, 0) as \'Minuten\',\n(select CONCAT(emp1p.`FirstName`, \' \', emp1p.`LastName`) from employee emp1 join `person` emp1p on emp1p.`Oid` = emp1.`PersonOid` where emp1.`Oid` in (select employeeoid from `employee2customer` e2c1 join `valuelistentry2object` vl2o on e2c1.`Oid` = vl2o.`ObjectOid` join `valuelistentry` vle on vl2o.`ValueListEntryOid` = vle.`Oid` where e2c1.`CustomerOid` = c.`Oid` and vle.`SystemEntryID` = 3) LIMIT 1) as \'Hauptbetreuung\',\n(select t.`Name` from team t where t.`Oid` in (select teamoid from `team2customer` t2c where t2c.`CustomerOid` = c.`Oid`) LIMIT 1) as \'Team\' \nFROM servicerecord sr\njoin costbearer2supportconcept c2s on sr.costbearer2supportconceptoid = c2s.oid\njoin supportconcept sc on c2s.supportconceptoid = sc.oid\njoin customer c on sc.customeroid = c.oid\njoin person p on c.personoid = p.oid\njoin servicedescription sd on sd.oid = sr.servicedescriptionoid\njoin servicecategory scat on scat.oid = sd.servicecategoryoid\nwhere sr.oid \nnot in (select servicerecordoid from confirmationreceiptsignature2servicerecord crs2s\njoin confirmationreceiptsignature crs on crs2s.confirmationreceiptsignatureoid = crs.oid where crs.employeeoid is not null and crs.customeroid is null) and\nscat.billable = true and\nsr.startdate >= \':Von\' and sr.startdate < \':bis\'\norder by p.Lastname, sr.startdate',NULL,NULL,NULL,NULL,1,1,NULL,`1`,NULL,NULL,NULL);
INSERT INTO `query` (`Oid`,`Tid`,`Type`,`Title`,`SQL`,`Notice`,`InsTs`,`InsUser`,`UdpUser`,`Version`,`IsActive`,`SystemEntryID`,`UserGroupOids`,`ReportTypeName`,`FileName`,`ExportTitle`) VALUES (4713,24,0,'Einträge ohne Monatsunterschrift der Hauptbetreuung','SELECT \np.LastName as \'Nachname\',\np.Firstname as \'Vorname\',\nc2s.ApprovedStartDate as \'Bewilligt von\',\nc2s.ApprovedEndDate as \'Bewilligt bis\',\nscat.Name as \'Kategorie\',\nDate_Format(sr.StartDate, \'%d.%m.%Y\') as \'Datum\',\nIF (Date_Format(sr.StartDate, \'%s\') <> \'00\', \'\', Date_Format(sr.StartDate, \'%H:%i\')) as \'von\',\nIF (Date_Format(sr.StartDate, \'%s\') <> \'00\', \'\', Date_Format(Date_Add(sr.StartDate, INTERVAL sr.Roundedduration MINUTE), \'%H:%i\')) as \'bis\',\nRound(sr.Roundedduration, 0) as \'Minuten\',\n(select CONCAT(emp1p.`FirstName`, \' \', emp1p.`LastName`) from employee emp1 join `person` emp1p on emp1p.`Oid` = emp1.`PersonOid` where emp1.`Oid` in (select employeeoid from `employee2customer` e2c1 join `valuelistentry2object` vl2o on e2c1.`Oid` = vl2o.`ObjectOid` join `valuelistentry` vle on vl2o.`ValueListEntryOid` = vle.`Oid` where e2c1.`CustomerOid` = c.`Oid` and vle.`SystemEntryID` = 3) LIMIT 1) as \'Hauptbetreuung\',\n(select t.`Name` from team t where t.`Oid` in (select teamoid from `team2customer` t2c where t2c.`CustomerOid` = c.`Oid`) LIMIT 1) as \'Team\' \nFROM servicerecord sr\njoin costbearer2supportconcept c2s on sr.costbearer2supportconceptoid = c2s.oid\njoin supportconcept sc on c2s.supportconceptoid = sc.oid\njoin customer c on sc.customeroid = c.oid\njoin person p on c.personoid = p.oid\njoin servicedescription sd on sd.oid = sr.servicedescriptionoid\njoin servicecategory scat on scat.oid = sd.servicecategoryoid\nwhere sr.oid \nnot in (select servicerecordoid from confirmationreceiptsignature2servicerecord crs2s\njoin confirmationreceiptsignature crs on crs2s.confirmationreceiptsignatureoid = crs.oid where crs.employeeoid is not null and crs.customeroid is null) and\nscat.billable = true and\nsr.startdate >= \':Von\' and sr.startdate < \':bis\'\norder by p.Lastname, sr.startdate',NULL,NULL,NULL,NULL,1,1,NULL,'1',NULL,NULL,NULL);
INSERT INTO `parameter` (`QueryOid`,`Tid`,`Name`,`Type`,`DbType`,`InsTs`,`InsUser`,`UdpUser`,`Version`,`IsActive`,`SystemEntryID`,`DefaultValue`) VALUES (4713,25,'Von_bis',5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'aktueller Monat');

2
Queries/Einträge ohne Monatsunterschrift des Klienten.txt
View File

@@ -27,7 +27,7 @@ order by p.Lastname, sr.startdate
INSERT INTO `query` (`Oid`,`Tid`,`Type`,`Title`,`SQL`,`Notice`,`InsTs`,`InsUser`,`UdpUser`,`Version`,`IsActive`,`SystemEntryID`,`UserGroupOids`,`ReportTypeName`,`FileName`,`ExportTitle`) VALUES (4712,24,0,'Einträge ohne Monatsunterschrift des Klienten','SELECT \np.LastName as \'Nachname\',\np.Firstname as \'Vorname\',\nc2s.ApprovedStartDate as \'Bewilligt von\',\nc2s.ApprovedEndDate as \'Bewilligt bis\',\nscat.Name as \'Kategorie\',\nDate_Format(sr.StartDate, \'%d.%m.%Y\') as \'Datum\',\nIF (Date_Format(sr.StartDate, \'%s\') <> \'00\', \'\', Date_Format(sr.StartDate, \'%H:%i\')) as \'von\',\nIF (Date_Format(sr.StartDate, \'%s\') <> \'00\', \'\', Date_Format(Date_Add(sr.StartDate, INTERVAL sr.Roundedduration MINUTE), \'%H:%i\')) as \'bis\',\nRound(sr.Roundedduration, 0) as \'Minuten\',\n(select CONCAT(emp1p.`FirstName`, \' \', emp1p.`LastName`) from employee emp1 join `person` emp1p on emp1p.`Oid` = emp1.`PersonOid` where emp1.`Oid` in (select employeeoid from `employee2customer` e2c1 join `valuelistentry2object` vl2o on e2c1.`Oid` = vl2o.`ObjectOid` join `valuelistentry` vle on vl2o.`ValueListEntryOid` = vle.`Oid` where e2c1.`CustomerOid` = c.`Oid` and vle.`SystemEntryID` = 3) LIMIT 1) as \'Hauptbetreuung\',\n(select t.`Name` from team t where t.`Oid` in (select teamoid from `team2customer` t2c where t2c.`CustomerOid` = c.`Oid`) LIMIT 1) as \'Team\' \nFROM servicerecord sr\njoin costbearer2supportconcept c2s on sr.costbearer2supportconceptoid = c2s.oid\njoin supportconcept sc on c2s.supportconceptoid = sc.oid\njoin customer c on sc.customeroid = c.oid\njoin person p on c.personoid = p.oid\njoin servicedescription sd on sd.oid = sr.servicedescriptionoid\njoin servicecategory scat on scat.oid = sd.servicecategoryoid\nwhere sr.oid \nnot in (select servicerecordoid from confirmationreceiptsignature2servicerecord crs2s\njoin confirmationreceiptsignature crs on crs2s.confirmationreceiptsignatureoid = crs.oid where crs.employeeoid is null and crs.customeroid is not null) and\nscat.billable = true and\nsr.startdate >= \':Von\' and sr.startdate < \':bis\'\norder by p.Lastname, sr.startdate',NULL,NULL,NULL,NULL,1,1,NULL,`1`,NULL,NULL,NULL);
INSERT INTO `query` (`Oid`,`Tid`,`Type`,`Title`,`SQL`,`Notice`,`InsTs`,`InsUser`,`UdpUser`,`Version`,`IsActive`,`SystemEntryID`,`UserGroupOids`,`ReportTypeName`,`FileName`,`ExportTitle`) VALUES (4712,24,0,'Einträge ohne Monatsunterschrift des Klienten','SELECT \np.LastName as \'Nachname\',\np.Firstname as \'Vorname\',\nc2s.ApprovedStartDate as \'Bewilligt von\',\nc2s.ApprovedEndDate as \'Bewilligt bis\',\nscat.Name as \'Kategorie\',\nDate_Format(sr.StartDate, \'%d.%m.%Y\') as \'Datum\',\nIF (Date_Format(sr.StartDate, \'%s\') <> \'00\', \'\', Date_Format(sr.StartDate, \'%H:%i\')) as \'von\',\nIF (Date_Format(sr.StartDate, \'%s\') <> \'00\', \'\', Date_Format(Date_Add(sr.StartDate, INTERVAL sr.Roundedduration MINUTE), \'%H:%i\')) as \'bis\',\nRound(sr.Roundedduration, 0) as \'Minuten\',\n(select CONCAT(emp1p.`FirstName`, \' \', emp1p.`LastName`) from employee emp1 join `person` emp1p on emp1p.`Oid` = emp1.`PersonOid` where emp1.`Oid` in (select employeeoid from `employee2customer` e2c1 join `valuelistentry2object` vl2o on e2c1.`Oid` = vl2o.`ObjectOid` join `valuelistentry` vle on vl2o.`ValueListEntryOid` = vle.`Oid` where e2c1.`CustomerOid` = c.`Oid` and vle.`SystemEntryID` = 3) LIMIT 1) as \'Hauptbetreuung\',\n(select t.`Name` from team t where t.`Oid` in (select teamoid from `team2customer` t2c where t2c.`CustomerOid` = c.`Oid`) LIMIT 1) as \'Team\' \nFROM servicerecord sr\njoin costbearer2supportconcept c2s on sr.costbearer2supportconceptoid = c2s.oid\njoin supportconcept sc on c2s.supportconceptoid = sc.oid\njoin customer c on sc.customeroid = c.oid\njoin person p on c.personoid = p.oid\njoin servicedescription sd on sd.oid = sr.servicedescriptionoid\njoin servicecategory scat on scat.oid = sd.servicecategoryoid\nwhere sr.oid \nnot in (select servicerecordoid from confirmationreceiptsignature2servicerecord crs2s\njoin confirmationreceiptsignature crs on crs2s.confirmationreceiptsignatureoid = crs.oid where crs.employeeoid is null and crs.customeroid is not null) and\nscat.billable = true and\nsr.startdate >= \':Von\' and sr.startdate < \':bis\'\norder by p.Lastname, sr.startdate',NULL,NULL,NULL,NULL,1,1,NULL,'1',NULL,NULL,NULL);
INSERT INTO `parameter` (`QueryOid`,`Tid`,`Name`,`Type`,`DbType`,`InsTs`,`InsUser`,`UdpUser`,`Version`,`IsActive`,`SystemEntryID`,`DefaultValue`) VALUES (4712,25,'Von_bis',5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'aktueller Monat');

2
Queries/Fehlende Einzelunterschriften im ausgewählten Zeitaum.txt
View File

@@ -26,7 +26,7 @@ order by p.Lastname, sr.startdate
INSERT INTO `query` (`Oid`,`Tid`,`Type`,`Title`,`SQL`,`Notice`,`InsTs`,`InsUser`,`UdpUser`,`Version`,`IsActive`,`SystemEntryID`,`UserGroupOids`,`ReportTypeName`,`FileName`,`ExportTitle`) VALUES (4711,24,0,'Einträge ohne Unterschrift','SELECT \np.LastName as \'Nachname\',\np.Firstname as \'Vorname\',\nc2s.ApprovedStartDate as \'Bewilligt von\',\nc2s.ApprovedEndDate as \'Bewilligt bis\',\nscat.Name as \'Kategorie\',\nDate_Format(sr.StartDate, \'%d.%m.%Y\') as \'Datum\',\nIF (Date_Format(sr.StartDate, \'%s\') <> \'00\', \'\', Date_Format(sr.StartDate, \'%H:%i\')) as \'von\',\nIF (Date_Format(sr.StartDate, \'%s\') <> \'00\', \'\', Date_Format(Date_Add(sr.StartDate, INTERVAL sr.Roundedduration MINUTE), \'%H:%i\')) as \'bis\',\nRound(sr.Roundedduration, 0) as \'Minuten\',\n(select CONCAT(emp1p.`FirstName`, \' \', emp1p.`LastName`) from employee emp1 join `person` emp1p on emp1p.`Oid` = emp1.`PersonOid` where emp1.`Oid` in (select employeeoid from `employee2customer` e2c1 join `valuelistentry2object` vl2o on e2c1.`Oid` = vl2o.`ObjectOid` join `valuelistentry` vle on vl2o.`ValueListEntryOid` = vle.`Oid` where e2c1.`CustomerOid` = c.`Oid` and vle.`SystemEntryID` = 3) LIMIT 1) as \'Hauptbetreuung\',\n(select t.`Name` from team t where t.`Oid` in (select teamoid from `team2customer` t2c where t2c.`CustomerOid` = c.`Oid`) LIMIT 1) as \'Team\' \nFROM servicerecord sr\njoin costbearer2supportconcept c2s on sr.costbearer2supportconceptoid = c2s.oid\njoin supportconcept sc on c2s.supportconceptoid = sc.oid\njoin customer c on sc.customeroid = c.oid\njoin person p on c.personoid = p.oid\njoin servicedescription sd on sd.oid = sr.servicedescriptionoid\njoin servicecategory scat on scat.oid = sd.servicecategoryoid\nwhere sr.SignatureOID is null and\nscat.billable = true and\nsr.startdate >= \':Von\' and sr.startdate < \':bis\'\norder by p.Lastname, sr.startdate',NULL,NULL,NULL,NULL,1,1,NULL,`1`,NULL,NULL,NULL);
INSERT INTO `query` (`Oid`,`Tid`,`Type`,`Title`,`SQL`,`Notice`,`InsTs`,`InsUser`,`UdpUser`,`Version`,`IsActive`,`SystemEntryID`,`UserGroupOids`,`ReportTypeName`,`FileName`,`ExportTitle`) VALUES (4711,24,0,'Einträge ohne Einzelunterschrift','SELECT \np.LastName as \'Nachname\',\np.Firstname as \'Vorname\',\nc2s.ApprovedStartDate as \'Bewilligt von\',\nc2s.ApprovedEndDate as \'Bewilligt bis\',\nscat.Name as \'Kategorie\',\nDate_Format(sr.StartDate, \'%d.%m.%Y\') as \'Datum\',\nIF (Date_Format(sr.StartDate, \'%s\') <> \'00\', \'\', Date_Format(sr.StartDate, \'%H:%i\')) as \'von\',\nIF (Date_Format(sr.StartDate, \'%s\') <> \'00\', \'\', Date_Format(Date_Add(sr.StartDate, INTERVAL sr.Roundedduration MINUTE), \'%H:%i\')) as \'bis\',\nRound(sr.Roundedduration, 0) as \'Minuten\',\n(select CONCAT(emp1p.`FirstName`, \' \', emp1p.`LastName`) from employee emp1 join `person` emp1p on emp1p.`Oid` = emp1.`PersonOid` where emp1.`Oid` in (select employeeoid from `employee2customer` e2c1 join `valuelistentry2object` vl2o on e2c1.`Oid` = vl2o.`ObjectOid` join `valuelistentry` vle on vl2o.`ValueListEntryOid` = vle.`Oid` where e2c1.`CustomerOid` = c.`Oid` and vle.`SystemEntryID` = 3) LIMIT 1) as \'Hauptbetreuung\',\n(select t.`Name` from team t where t.`Oid` in (select teamoid from `team2customer` t2c where t2c.`CustomerOid` = c.`Oid`) LIMIT 1) as \'Team\' \nFROM servicerecord sr\njoin costbearer2supportconcept c2s on sr.costbearer2supportconceptoid = c2s.oid\njoin supportconcept sc on c2s.supportconceptoid = sc.oid\njoin customer c on sc.customeroid = c.oid\njoin person p on c.personoid = p.oid\njoin servicedescription sd on sd.oid = sr.servicedescriptionoid\njoin servicecategory scat on scat.oid = sd.servicecategoryoid\nwhere sr.SignatureOID is null and\nscat.billable = true and\nsr.startdate >= \':Von\' and sr.startdate < \':bis\'\norder by p.Lastname, sr.startdate',NULL,NULL,NULL,NULL,1,1,NULL,'1',NULL,NULL,NULL);
INSERT INTO `parameter` (`QueryOid`,`Tid`,`Name`,`Type`,`DbType`,`InsTs`,`InsUser`,`UdpUser`,`Version`,`IsActive`,`SystemEntryID`,`DefaultValue`) VALUES (4711,25,'Von_bis',5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'aktueller Monat');

89
Report/DefaultReports/JahresReport.cs
View File

@@ -2,7 +2,8 @@ using System;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using System.Data;
using System.Collections.Generic;
using System.Linq;
namespace BeWo.Report.DefaultReports
{
@@ -19,32 +20,80 @@ namespace BeWo.Report.DefaultReports
public void SetReportDataSource(JahresReportRO pRO)
{
JahresReportRO b = new JahresReportRO();
//b.CreateReport(pRO);
//b.CreateReport(pRO);
JoinCustomerNames(pRO);
this.bindingSource1.DataSource = pRO;
}
}
private void JoinCustomerNames(JahresReportRO pRO)
{
foreach (var tab in pRO.JahresReportTabelleList)
{
bool join = true;
foreach (var item in tab.JahresReportDetailList)
{
if (item.Name.Contains(String.Format("{0:yyyy}", pRO.ReportStartDate)))
{
join = false; // Vereine die Klientennamen nur bei den Berichten, die nicht pro Jahr ausgewertet werden
}
}
if (join)
{
var allCustomerNames = new List<String>();
foreach (var item in tab.JahresReportDetailList)
{
foreach (var name in item.CustomerNames)
{
if (!allCustomerNames.Contains(name))
{
allCustomerNames.Add(name);
}
}
}
var sorted = allCustomerNames.OrderBy(a => a).ToList();
String names = "";
foreach (var name in sorted)
{
if (names.Length > 0)
{
names += "; ";
}
names += name;
}
foreach (var item in tab.JahresReportDetailList)
{
item.CustomerNames = sorted;
item.AllCustomerString = names;
}
}
}
}
/*private DataTable CreateChartData() {
// Create an empty table.
DataTable table = new DataTable("Table1");
// Create an empty table.
DataTable table = new DataTable("Table1");
// Add three columns to the table.
table.Columns.Add("Anzahl", typeof(Int32));
table.Columns.Add("Weiblich", typeof(Int32));
table.Columns.Add("Männlich", typeof(Int32));
// Add three columns to the table.
table.Columns.Add("Anzahl", typeof(Int32));
table.Columns.Add("Weiblich", typeof(Int32));
table.Columns.Add("Männlich", typeof(Int32));
// Add data rows to the table.
table.Rows.Add(new object[] { "1", "Section1", 10 });
table.Rows.Add(new object[] { "2", "Section2", 20 });
table.Rows.Add(new object[] { "3", "Section1", 20 });
table.Rows.Add(new object[] { "4", "Section2", 30 });
table.Rows.Add(new object[] { "5", "Section1", 15 });
table.Rows.Add(new object[] { "6", "Section2", 25 });
// Add data rows to the table.
table.Rows.Add(new object[] { "1", "Section1", 10 });
table.Rows.Add(new object[] { "2", "Section2", 20 });
table.Rows.Add(new object[] { "3", "Section1", 20 });
table.Rows.Add(new object[] { "4", "Section2", 30 });
table.Rows.Add(new object[] { "5", "Section1", 15 });
table.Rows.Add(new object[] { "6", "Section2", 25 });
return table;
}*/
return table;
}*/
}
}
}

130
Report/DefaultReports/JahresReport.designer.cs generated
View File

@@ -39,6 +39,8 @@ namespace BeWo.Report.DefaultReports
DevExpress.XtraCharts.Series series3 = new DevExpress.XtraCharts.Series();
DevExpress.XtraCharts.SideBySideBarSeriesLabel sideBySideBarSeriesLabel3 = new DevExpress.XtraCharts.SideBySideBarSeriesLabel();
DevExpress.XtraCharts.SideBySideBarSeriesLabel sideBySideBarSeriesLabel4 = new DevExpress.XtraCharts.SideBySideBarSeriesLabel();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
@@ -56,6 +58,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail3 = new DevExpress.XtraReports.UI.DetailBand();
this.DetailReport3 = new DevExpress.XtraReports.UI.DetailReportBand();
@@ -67,15 +70,16 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
BArChart1 = new DevExpress.XtraReports.UI.XRChart();
((System.ComponentModel.ISupportInitialize)(BArChart1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(xyDiagram1)).BeginInit();
@@ -86,9 +90,9 @@ namespace BeWo.Report.DefaultReports
((System.ComponentModel.ISupportInitialize)(series3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(sideBySideBarSeriesLabel3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(sideBySideBarSeriesLabel4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// BArChart1
@@ -108,6 +112,7 @@ namespace BeWo.Report.DefaultReports
xyDiagram1.DefaultPane.EnableAxisYScrolling = DevExpress.Utils.DefaultBoolean.False;
xyDiagram1.DefaultPane.EnableAxisYZooming = DevExpress.Utils.DefaultBoolean.False;
BArChart1.Diagram = xyDiagram1;
BArChart1.Legend.LegendID = -1;
BArChart1.Legend.Name = "Default Legend";
BArChart1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 4.791673F);
BArChart1.Name = "BArChart1";
@@ -120,6 +125,7 @@ namespace BeWo.Report.DefaultReports
sideBySideBarSeriesLabel1.LineVisibility = DevExpress.Utils.DefaultBoolean.True;
series1.Label = sideBySideBarSeriesLabel1;
series1.Name = "Anzahl";
series1.SeriesID = 0;
series1.TopNOptions.Count = 7;
series1.TopNOptions.Enabled = true;
series1.ValueDataMembersSerializable = "Anzahl";
@@ -128,6 +134,7 @@ namespace BeWo.Report.DefaultReports
sideBySideBarSeriesLabel2.LineVisibility = DevExpress.Utils.DefaultBoolean.True;
series2.Label = sideBySideBarSeriesLabel2;
series2.Name = "Männlich";
series2.SeriesID = 1;
series2.TopNOptions.Count = 7;
series2.TopNOptions.Enabled = true;
series2.ValueDataMembersSerializable = "MaennlichAnzahl";
@@ -136,6 +143,7 @@ namespace BeWo.Report.DefaultReports
sideBySideBarSeriesLabel3.LineVisibility = DevExpress.Utils.DefaultBoolean.True;
series3.Label = sideBySideBarSeriesLabel3;
series3.Name = "Weiblich";
series3.SeriesID = 2;
series3.TopNOptions.Count = 7;
series3.TopNOptions.Enabled = true;
series3.ValueDataMembersSerializable = "WeiblichAnzahl";
@@ -150,6 +158,10 @@ namespace BeWo.Report.DefaultReports
BArChart1.SeriesTemplate.Visible = false;
BArChart1.SizeF = new System.Drawing.SizeF(726.0417F, 79.99998F);
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.JahresReportRO);
//
// Detail
//
this.Detail.HeightF = 0F;
@@ -163,7 +175,7 @@ namespace BeWo.Report.DefaultReports
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.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F);
this.Title.ForeColor = System.Drawing.Color.Black;
this.Title.Name = "Title";
//
@@ -173,7 +185,7 @@ namespace BeWo.Report.DefaultReports
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.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.FieldCaption.ForeColor = System.Drawing.Color.Black;
this.FieldCaption.Name = "FieldCaption";
//
@@ -183,7 +195,7 @@ namespace BeWo.Report.DefaultReports
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.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.PageInfo.ForeColor = System.Drawing.Color.Black;
this.PageInfo.Name = "PageInfo";
//
@@ -193,7 +205,7 @@ namespace BeWo.Report.DefaultReports
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.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
this.DataField.Name = "DataField";
//
@@ -300,6 +312,11 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell17.Weight = 0.54232431564057115D;
//
// xrTableCell2
//
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Weight = 0.21089706066308517D;
//
// DetailReport2
//
this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -322,7 +339,8 @@ namespace BeWo.Report.DefaultReports
this.Detail4,
this.GroupHeader1,
this.GroupHeader2,
this.GroupHeader3});
this.GroupHeader3,
this.GroupFooter2});
this.DetailReport3.DataMember = "JahresReportTabelleList.JahresReportDetailList";
this.DetailReport3.DataSource = this.bindingSource1;
this.DetailReport3.Level = 0;
@@ -343,7 +361,6 @@ namespace BeWo.Report.DefaultReports
this.GroupHeader1.HeightF = 25F;
this.GroupHeader1.KeepTogether = true;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.RepeatEveryPage = true;
//
// xrTable9
//
@@ -380,7 +397,8 @@ namespace BeWo.Report.DefaultReports
//
// xrTableCell5
//
this.xrTableCell5.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell5.ForeColor = System.Drawing.Color.White;
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.StylePriority.UseFont = false;
@@ -392,7 +410,8 @@ namespace BeWo.Report.DefaultReports
//
// xrTableCell6
//
this.xrTableCell6.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell6.ForeColor = System.Drawing.Color.White;
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.StylePriority.UseFont = false;
@@ -404,7 +423,8 @@ namespace BeWo.Report.DefaultReports
//
// xrTableCell7
//
this.xrTableCell7.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell7.ForeColor = System.Drawing.Color.White;
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.StylePriority.UseFont = false;
@@ -414,6 +434,19 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell7.Weight = 0.54232422106673062D;
//
// xrTableCell1
//
this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell1.ForeColor = System.Drawing.Color.White;
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.StylePriority.UseFont = false;
this.xrTableCell1.StylePriority.UseForeColor = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "Divers";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell1.Weight = 0.54232422106673062D;
//
// xrTableCell8
//
this.xrTableCell8.Name = "xrTableCell8";
@@ -432,7 +465,8 @@ namespace BeWo.Report.DefaultReports
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "JahresReportTabelleList.Name")});
this.xrLabel8.Font = new System.Drawing.Font("Times New Roman", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Times New Roman", 14.25F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -452,6 +486,42 @@ namespace BeWo.Report.DefaultReports
this.GroupHeader3.Name = "GroupHeader3";
this.GroupHeader3.Visible = false;
//
// GroupFooter2
//
this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel3,
this.xrLabel2});
this.GroupFooter2.HeightF = 75.33325F;
this.GroupFooter2.Name = "GroupFooter2";
//
// xrLabel3
//
this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "JahresReportTabelleList.JahresReportDetailList.AllCustomerString")});
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 42.66663F);
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(726.0417F, 32.66663F);
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.StylePriority.UseForeColor = false;
this.xrLabel3.StylePriority.UseTextAlignment = false;
this.xrLabel3.Text = "Namen aller Personen im aktuellen Jahr:";
this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel2
//
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Times New Roman", 12F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(726.0417F, 32.66663F);
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.StylePriority.UseForeColor = false;
this.xrLabel2.StylePriority.UseTextAlignment = false;
this.xrLabel2.Text = "Namen aller Personen:";
this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -466,27 +536,6 @@ namespace BeWo.Report.DefaultReports
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(92.70833F, 45.83333F);
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.JahresReportRO);
//
// xrTableCell1
//
this.xrTableCell1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell1.ForeColor = System.Drawing.Color.White;
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.StylePriority.UseFont = false;
this.xrTableCell1.StylePriority.UseForeColor = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "Divers";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell1.Weight = 0.54232422106673062D;
//
// xrTableCell2
//
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Weight = 0.21089706066308517D;
//
// JahresReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -499,7 +548,7 @@ namespace BeWo.Report.DefaultReports
this.fieldTotalSC,
this.fieldTotalEmp});
this.DataSource = this.bindingSource1;
this.Margins = new System.Drawing.Printing.Margins(48, 20, 70, 88);
this.Margins = new DevExpress.Drawing.DXMargins(48F, 20F, 70F, 88F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -508,7 +557,9 @@ namespace BeWo.Report.DefaultReports
this.FieldCaption,
this.PageInfo,
this.DataField});
this.Version = "17.1";
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(xyDiagram1)).EndInit();
((System.ComponentModel.ISupportInitialize)(sideBySideBarSeriesLabel1)).EndInit();
((System.ComponentModel.ISupportInitialize)(series1)).EndInit();
@@ -518,9 +569,9 @@ namespace BeWo.Report.DefaultReports
((System.ComponentModel.ISupportInitialize)(series3)).EndInit();
((System.ComponentModel.ISupportInitialize)(sideBySideBarSeriesLabel4)).EndInit();
((System.ComponentModel.ISupportInitialize)(BArChart1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -564,5 +615,8 @@ namespace BeWo.Report.DefaultReports
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
}
}

3
Report/DefaultReports/JahresReport.resx
View File

@@ -120,7 +120,4 @@
<metadata name="BArChart1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

11
Report/ReportObjects/JahresReportRO.cs
View File

@@ -9,7 +9,10 @@ namespace BeWo.Report.ReportObjects
{
public class JahresReportRO : AbstractBeWoReportObject<JahresReportRO>
{
public DateTime ReportStartDate { get; set; }
public DateTime ReportEndDate { get; set; }
public IList<JahresReportTabelle> JahresReportTabelleList { get; set; }
public class JahresReportTabelle
@@ -75,7 +78,11 @@ namespace BeWo.Report.ReportObjects
var list = service.CreateAnnualReport(orgOid, teamOid, betreuungsartOid, start, end);
return Create(list);
var ro = Create(list);
ro.ReportStartDate = start;
ro.ReportEndDate = end;
return ro;
}
public static JahresReportRO Create(List<AnnualReportDC> annualReports)

80
ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisEntlastungsleistungen.Designer.cs generated
View File

@@ -53,6 +53,7 @@ namespace LebenshilfeFrankfurtOder
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
@@ -85,6 +86,7 @@ namespace LebenshilfeFrankfurtOder
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.fieldArtDerLeistung = new DevExpress.XtraReports.UI.CalculatedField();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
@@ -96,6 +98,7 @@ namespace LebenshilfeFrankfurtOder
this.cellPreisGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellStundenGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellKmGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.fieldStunden = new DevExpress.XtraReports.UI.CalculatedField();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
@@ -107,15 +110,12 @@ namespace LebenshilfeFrankfurtOder
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel23 = 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();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -375,6 +375,10 @@ namespace LebenshilfeFrankfurtOder
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell19.Weight = 0.030827448627439719D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -462,7 +466,7 @@ namespace LebenshilfeFrankfurtOder
this.xrLabel22.SizeF = new System.Drawing.SizeF(514.3026F, 20F);
this.xrLabel22.StylePriority.UseFont = false;
this.xrLabel22.StylePriority.UseTextAlignment = false;
this.xrLabel22.Text = "§ 45 a Abs. 3 SGB XI (Umwidmung bis zu 40% des Pflegesachleistungsbudgets)";
this.xrLabel22.Text = "§ 45 a laut SGB XI (Umwidmung bis zu 40% des Pflegesachleistungsbudgets)";
this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel10
@@ -477,7 +481,7 @@ namespace LebenshilfeFrankfurtOder
this.xrLabel10.SizeF = new System.Drawing.SizeF(295.0002F, 20F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.StylePriority.UseTextAlignment = false;
this.xrLabel10.Text = "§ 45 b Abs. 1/1a SGB XI (Budget 125 EUR) ";
this.xrLabel10.Text = "§ 45 b laut SGB XI (Budget 131 EUR) ";
this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel8
@@ -803,6 +807,22 @@ namespace LebenshilfeFrankfurtOder
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// xrLabel23
//
this.xrLabel23.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 7F);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0.0001939677F, 25.00001F);
this.xrLabel23.Multiline = true;
this.xrLabel23.Name = "xrLabel23";
this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel23.SizeF = new System.Drawing.SizeF(684.9998F, 14.46611F);
this.xrLabel23.StylePriority.UseBorders = false;
this.xrLabel23.StylePriority.UseFont = false;
this.xrLabel23.StylePriority.UseTextAlignment = false;
this.xrLabel23.Text = "* Die mit Sternchen gekennzeichneten km dienen lediglich der innerbetrieblich sta" +
"tistischen Erfassung und sind nicht Bestandteil der Rechnungslegung!";
this.xrLabel23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel4
//
this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.Top;
@@ -942,6 +962,19 @@ namespace LebenshilfeFrankfurtOder
this.cellKmGesamt.StylePriority.UseTextAlignment = false;
this.cellKmGesamt.Weight = 0.09145495273059695D;
//
// xrTableCell22
//
this.xrTableCell22.Borders = DevExpress.XtraPrinting.BorderSide.Left;
this.xrTableCell22.Multiline = true;
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTableCell22.StylePriority.UseBorders = false;
this.xrTableCell22.StylePriority.UsePadding = false;
this.xrTableCell22.StylePriority.UseTextAlignment = false;
this.xrTableCell22.Text = "Gesamt km";
this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell22.Weight = 0.21949183192882432D;
//
// fieldStunden
//
this.fieldStunden.DataMember = "Services";
@@ -1057,39 +1090,6 @@ namespace LebenshilfeFrankfurtOder
this.xrTableCell21.Text = "HdZ\r\nMA";
this.xrTableCell21.Weight = 0.082309457673826233D;
//
// xrTableCell22
//
this.xrTableCell22.Borders = DevExpress.XtraPrinting.BorderSide.Left;
this.xrTableCell22.Multiline = true;
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTableCell22.StylePriority.UseBorders = false;
this.xrTableCell22.StylePriority.UsePadding = false;
this.xrTableCell22.StylePriority.UseTextAlignment = false;
this.xrTableCell22.Text = "Gesamt km";
this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell22.Weight = 0.21949183192882432D;
//
// xrLabel23
//
this.xrLabel23.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 7F);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0.0001939677F, 25.00001F);
this.xrLabel23.Multiline = true;
this.xrLabel23.Name = "xrLabel23";
this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel23.SizeF = new System.Drawing.SizeF(684.9998F, 14.46611F);
this.xrLabel23.StylePriority.UseBorders = false;
this.xrLabel23.StylePriority.UseFont = false;
this.xrLabel23.StylePriority.UseTextAlignment = false;
this.xrLabel23.Text = "* Die mit Sternchen gekennzeichneten km dienen lediglich der innerbetrieblich sta" +
"tistischen Erfassung und sind nicht Bestandteil der Rechnungslegung!";
this.xrLabel23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// LeistungsnachweisEntlastungsleistungen
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1121,10 +1121,10 @@ namespace LebenshilfeFrankfurtOder
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}

2
ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisEntlastungsleistungen.resx
View File

File diff suppressed because one or more lines are too long

43
ReportImp/ProfEggersStiftung/KassenbelegReport.Designer.cs generated
View File

@@ -29,8 +29,9 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.lblEinAuszahlung = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -58,7 +59,7 @@
// Detail
//
this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel2,
this.lblEinAuszahlung,
this.xrTable2,
this.xrLabel12,
this.xrLabel1});
@@ -68,18 +69,21 @@
this.Detail.StylePriority.UseFont = false;
this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel2
// lblEinAuszahlung
//
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Calibri", 16F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 83.29165F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(649.0001F, 23F);
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.StylePriority.UsePadding = false;
this.xrLabel2.StylePriority.UseTextAlignment = false;
this.xrLabel2.Text = "(Ein-)Auszahlungsbeleg";
this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.lblEinAuszahlung.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Titel")});
this.lblEinAuszahlung.Font = new DevExpress.Drawing.DXFont("Calibri", 16F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.lblEinAuszahlung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 83.29165F);
this.lblEinAuszahlung.Name = "lblEinAuszahlung";
this.lblEinAuszahlung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.lblEinAuszahlung.SizeF = new System.Drawing.SizeF(649.0001F, 23F);
this.lblEinAuszahlung.StylePriority.UseFont = false;
this.lblEinAuszahlung.StylePriority.UsePadding = false;
this.lblEinAuszahlung.StylePriority.UseTextAlignment = false;
this.lblEinAuszahlung.Text = "(Ein-)Auszahlungsbeleg";
this.lblEinAuszahlung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTable2
//
@@ -214,14 +218,12 @@
//
// TopMargin
//
this.TopMargin.HeightF = 100F;
this.TopMargin.Name = "TopMargin";
this.TopMargin.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.TopMargin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// BottomMargin
//
this.BottomMargin.HeightF = 100F;
this.BottomMargin.Name = "BottomMargin";
this.BottomMargin.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.BottomMargin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -245,9 +247,14 @@
this.TopMargin,
this.BottomMargin,
this.GroupFooter1});
this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] {
this.bindingSource1});
this.DataSource = this.bindingSource1;
this.Font = new DevExpress.Drawing.DXFont("Calibri", 14F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.Version = "17.1";
this.Font = new DevExpress.Drawing.DXFont("Calibri", 14F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
@@ -277,6 +284,6 @@
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel lblEinAuszahlung;
}
}

1
ReportImp/ProfEggersStiftung/KassenbelegReport.cs
View File

@@ -14,6 +14,7 @@ namespace ProfEggersStiftung
public void SetReportDataSource(KassenbelegRO pRO)
{
//if (pRO.)
bindingSource1.DataSource = pRO;
}

3
ReportImp/ProfEggersStiftung/KassenbelegReport.resx
View File

@@ -117,7 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

9
ReportImp/ProfEggersStiftung/ProfEggersStiftung.csproj
View File

@@ -113,6 +113,11 @@
<DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="RechnungPflege.cs">
<SubType>Component</SubType>
</Compile>
@@ -182,6 +187,10 @@
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="RechnungPflege.resx">
<DependentUpon>RechnungPflege.cs</DependentUpon>
<SubType>Designer</SubType>

97
ReportImp/ProfEggersStiftung/RechnungPflege.Designer.cs generated
View File

@@ -29,10 +29,10 @@ namespace ProfEggersStiftung
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RechnungPflege));
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
@@ -72,6 +72,7 @@ namespace ProfEggersStiftung
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -80,6 +81,7 @@ namespace ProfEggersStiftung
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.lblUmzugTZ = new DevExpress.XtraReports.UI.XRLabel();
this.ReportFooter1 = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -87,13 +89,15 @@ namespace ProfEggersStiftung
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.lblUmzugTZ = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.picLogoOrange = new DevExpress.XtraReports.UI.XRPictureBox();
this.picAdresseOrange = new DevExpress.XtraReports.UI.XRPictureBox();
this.picLogoBlau = new DevExpress.XtraReports.UI.XRPictureBox();
this.picAdresseBlau = new DevExpress.XtraReports.UI.XRPictureBox();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -106,25 +110,15 @@ namespace ProfEggersStiftung
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel16});
this.picLogoBlau,
this.picAdresseBlau,
this.picLogoOrange,
this.picAdresseOrange});
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 170F;
this.ReportHeader.HeightF = 200F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrLabel16
//
this.xrLabel16.BackColor = System.Drawing.Color.Transparent;
this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(250F, 35.75F);
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel16.SizeF = new System.Drawing.SizeF(195.1251F, 31.00001F);
this.xrLabel16.StylePriority.UseBackColor = false;
this.xrLabel16.StylePriority.UseFont = false;
this.xrLabel16.StylePriority.UseTextAlignment = false;
this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// ruleRateFactorNull
//
this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
@@ -133,7 +127,7 @@ namespace ProfEggersStiftung
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 50F;
this.topMarginBand1.HeightF = 30F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
@@ -514,6 +508,10 @@ namespace ProfEggersStiftung
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell15.Weight = 1.4552725679749761D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -598,6 +596,16 @@ namespace ProfEggersStiftung
this.GroupHeader2.Level = 1;
this.GroupHeader2.Name = "GroupHeader2";
//
// lblUmzugTZ
//
this.lblUmzugTZ.CanShrink = true;
this.lblUmzugTZ.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblUmzugTZ.Multiline = true;
this.lblUmzugTZ.Name = "lblUmzugTZ";
this.lblUmzugTZ.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblUmzugTZ.SizeF = new System.Drawing.SizeF(642F, 43.67315F);
this.lblUmzugTZ.StylePriority.UseFont = false;
//
// ReportFooter1
//
this.ReportFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -673,19 +681,37 @@ namespace ProfEggersStiftung
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell19.Weight = 1.4552725679749761D;
//
// lblUmzugTZ
// picLogoOrange
//
this.lblUmzugTZ.CanShrink = true;
this.lblUmzugTZ.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblUmzugTZ.Multiline = true;
this.lblUmzugTZ.Name = "lblUmzugTZ";
this.lblUmzugTZ.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblUmzugTZ.SizeF = new System.Drawing.SizeF(642F, 43.67315F);
this.lblUmzugTZ.StylePriority.UseFont = false;
this.picLogoOrange.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("picLogoOrange.ImageSource"));
this.picLogoOrange.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.picLogoOrange.Name = "picLogoOrange";
this.picLogoOrange.SizeF = new System.Drawing.SizeF(652F, 150F);
this.picLogoOrange.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// bindingSource1
// picAdresseOrange
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
this.picAdresseOrange.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("picAdresseOrange.ImageSource"));
this.picAdresseOrange.LocationFloat = new DevExpress.Utils.PointFloat(0F, 169.9988F);
this.picAdresseOrange.Name = "picAdresseOrange";
this.picAdresseOrange.SizeF = new System.Drawing.SizeF(250F, 20.00122F);
this.picAdresseOrange.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// picLogoBlau
//
this.picLogoBlau.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("picLogoBlau.ImageSource"));
this.picLogoBlau.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.picLogoBlau.Name = "picLogoBlau";
this.picLogoBlau.SizeF = new System.Drawing.SizeF(652F, 150F);
this.picLogoBlau.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// picAdresseBlau
//
this.picAdresseBlau.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("picAdresseBlau.ImageSource"));
this.picAdresseBlau.LocationFloat = new DevExpress.Utils.PointFloat(0F, 169.9988F);
this.picAdresseBlau.Name = "picAdresseBlau";
this.picAdresseBlau.SizeF = new System.Drawing.SizeF(291.9999F, 20.00122F);
this.picAdresseBlau.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// RechnungPflege
//
@@ -703,18 +729,20 @@ namespace ProfEggersStiftung
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new DevExpress.Drawing.DXMargins(95F, 80F, 50F, 65F);
this.Margins = new DevExpress.Drawing.DXMargins(95F, 80F, 30F, 65F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
xrWatermark1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrWatermark1.ImageSource"));
xrWatermark1.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Stretch;
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -731,7 +759,6 @@ namespace ProfEggersStiftung
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel RecipientPostCodeAndTown;
private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientStreet;
private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientDivision;
@@ -779,5 +806,9 @@ namespace ProfEggersStiftung
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRLabel lblUmzugTZ;
private DevExpress.XtraReports.UI.XRPictureBox picLogoOrange;
private DevExpress.XtraReports.UI.XRPictureBox picAdresseOrange;
private DevExpress.XtraReports.UI.XRPictureBox picLogoBlau;
private DevExpress.XtraReports.UI.XRPictureBox picAdresseBlau;
}
}

35
ReportImp/ProfEggersStiftung/RechnungPflege.cs
View File

@@ -142,7 +142,40 @@ namespace ProfEggersStiftung
}
lblAbwesenheiten.Text = abwesenheiten;
String team = GetTeam(pRO);
if (team.ToLower().Contains("trialog"))
{
picAdresseBlau.Visible = false;
picLogoBlau.Visible = false;
picAdresseOrange.Visible = true;
picLogoOrange.Visible = true;
}
else
{
picAdresseBlau.Visible = true;
picLogoBlau.Visible = true;
picAdresseOrange.Visible = false;
picLogoOrange.Visible = false;
}
this.bindingSource1.DataSource = pRO;
}
}
private string GetTeam(ServiceInvoiceRO pRO)
{
String team = "";
if (pRO.InvoiceBase.CustomerOid > 0)
{
var c = DAOFactory.GenericDAO.LoadByID<Customer>(pRO.InvoiceBase.CustomerOid);
foreach (var t2c in c.Team2CustomerList)
{
team = t2c.Team.Name;
}
}
return team;
}
}
}

15
ReportImp/ProfEggersStiftung/RechnungPflege.resx
View File

File diff suppressed because one or more lines are too long

49
ReportImp/ProfEggersStiftung/ServiceInvoiceReport.Designer.cs generated
View File

@@ -29,10 +29,10 @@ namespace ProfEggersStiftung
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();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
@@ -64,6 +64,8 @@ namespace ProfEggersStiftung
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
@@ -78,25 +80,13 @@ namespace ProfEggersStiftung
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel16});
this.xrPictureBox2,
this.xrPictureBox1});
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 170F;
this.ReportHeader.HeightF = 200F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrLabel16
//
this.xrLabel16.BackColor = System.Drawing.Color.Transparent;
this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(250F, 35.75F);
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel16.SizeF = new System.Drawing.SizeF(195.1251F, 31.00001F);
this.xrLabel16.StylePriority.UseBackColor = false;
this.xrLabel16.StylePriority.UseFont = false;
this.xrLabel16.StylePriority.UseTextAlignment = false;
this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// ruleRateFactorNull
//
this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
@@ -105,7 +95,7 @@ namespace ProfEggersStiftung
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 50F;
this.topMarginBand1.HeightF = 30F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
@@ -405,6 +395,22 @@ namespace ProfEggersStiftung
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// xrPictureBox1
//
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(652F, 150F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrPictureBox2
//
this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource"));
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 169.9988F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(291.9999F, 20.00122F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -422,12 +428,14 @@ namespace ProfEggersStiftung
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new DevExpress.Drawing.DXMargins(95F, 80F, 50F, 65F);
this.Margins = new DevExpress.Drawing.DXMargins(95F, 80F, 30F, 65F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
xrWatermark1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrWatermark1.ImageSource"));
xrWatermark1.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom;
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -447,7 +455,6 @@ namespace ProfEggersStiftung
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel RecipientPostCodeAndTown;
private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientStreet;
private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientDivision;
@@ -469,6 +476,8 @@ namespace ProfEggersStiftung
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
}
}

9
ReportImp/ProfEggersStiftung/ServiceInvoiceReport.resx
View File

File diff suppressed because one or more lines are too long

2
Service/Plugins/CustomerService.cs
View File

@@ -1417,7 +1417,7 @@ namespace BeWo.Service.Plugins
if (!customer.Oid.HasValue)
{
//Neue Klienten werden noch nicht unterstützt.
result.ImportMessage = String.Format("Klient/in '{0}, {1}', geb. {2:dd.MM.yyyy} wurde nicht gefunden. Bitte legen Sie zunächst den/die Klient/in an, bevor Sie die Hilfeplanziele importieren.", customer.Person.LastName, customer.Person.FirstName, customer.Person.DateOfBirth);
result.ImportMessage = String.Format("Klient/in '{0}, {1}', geb. {2:dd.MM.yyyy} wurde nicht gefunden. Vorname, Nachname und Geburtstag müssen exakt übereinstimmen. Bitte prüfen Sie die Daten oder legen Sie zunächst den/die Klient/in an, bevor Sie die Hilfeplanziele importieren.", customer.Person.LastName, customer.Person.FirstName, customer.Person.DateOfBirth);
return result;
}
var supportConcept = FindOrCreateSupportConcept(hidc, customer);

4
Service/Plugins/PluginLoader.cs
View File

@@ -135,7 +135,7 @@ namespace BeWo.Service.Plugins
//t = "3227700467"; // Psychosozialer Trägerverein
//t = "4378753169"; // Die Wohnhelfer Köln
//t = "2214258555"; // Betreuungsbüro Baak
t = "4525013596"; // Hph Bersenbrück Freizeit und Reisen
//t = "4525013596"; // Hph Bersenbrück Freizeit und Reisen
//t = "1609455614"; // Hph Bersenbrück Aph
//t = "7852961459"; // B&B Betreutes Wohnen
//t = "8719930557"; // Lebenshilfe Rhein-Sieg
@@ -148,7 +148,7 @@ namespace BeWo.Service.Plugins
//t = "9975231461"; // Selwo
//t = "8181286349"; // BeWo am Rhein
//t = "4595275645"; // Eigenständig
//t = "7912635399"; // Prof. Dr. Eggers Stiftung
t = "7912635399"; // Prof. Dr. Eggers Stiftung
//t = "3549726254"; // Socia
//t = "1992495802"; // Monvita
//t = "7381352241"; // Ressource e.V.

28
Service/ServiceUtils/History/HistoryCreator.cs
View File

@@ -61,14 +61,16 @@ namespace BeWo.ServiceUtils.History
MakeNewPersonHistoryEntry(originalEmployee.Person, newEmployee, statementType);
CreateContractHistoryEntries(originalEmployee.Oid.Value, originalEmployee.Contracts, newEmployee.Contracts);
foreach (var item in newEmployee.AbsenceTimes)
{
if (!item.EmployeeOid.HasValue)
{
item.EmployeeOid = originalEmployee.Oid.Value;
}
}
if (newEmployee.AbsenceTimes != null)
{
foreach (var item in newEmployee.AbsenceTimes)
{
if (!item.EmployeeOid.HasValue)
{
item.EmployeeOid = originalEmployee.Oid.Value;
}
}
}
CreateAbsenceTimeHistoryEntry(originalEmployee.AbsenceTimes, newEmployee.AbsenceTimes);
@@ -241,14 +243,16 @@ namespace BeWo.ServiceUtils.History
var person = lOriginal.Person;
MakeNewPersonHistoryEntry(person, newCustomer, statementType);
foreach (var item in newCustomer.AbsenceTimes)
if (newCustomer.AbsenceTimes != null)
{
if (!item.CustomerOid.HasValue)
foreach (var item in newCustomer.AbsenceTimes)
{
item.CustomerOid = lOriginal.Oid.Value;
if (!item.CustomerOid.HasValue)
{
item.CustomerOid = lOriginal.Oid.Value;
}
}
}
CreateAbsenceTimeHistoryEntry(lOriginal.AbsenceTimes, newCustomer.AbsenceTimes);
}

2
Service/ServiceUtils/ServiceHelper.cs
View File

@@ -56,7 +56,7 @@ namespace BeWo.Service.ServiceUtils
// Hole entsprechende Methode
var name = $"BeWo.Service.ServiceContracts.{pServiceInterface}";
var t = Type.GetType(name);
methodInfo = t.GetMethod(pMethodName);
methodInfo = t?.GetMethod(pMethodName);
}
catch (Exception)
{