From a17e1441a69105313c1ba00545cb20863fb88fbf Mon Sep 17 00:00:00 2001 From: Kojo Date: Wed, 20 Sep 2023 09:20:31 +0200 Subject: [PATCH] EmployeeListReport Fixes --- Report/DefaultReportCreator.cs | 56 ++++++++++----------- Report/DefaultReports/EmployeeListReport.cs | 2 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Report/DefaultReportCreator.cs b/Report/DefaultReportCreator.cs index 009492603..be25b6306 100644 --- a/Report/DefaultReportCreator.cs +++ b/Report/DefaultReportCreator.cs @@ -123,7 +123,7 @@ namespace BeWo.Report } return attr.Identifier.Equals(specificReportId); } - + return false; } @@ -224,7 +224,7 @@ namespace BeWo.Report { var query = DAOFactory.GenericDAO.LoadByID(queryOid); - if(query is null) + if (query is null) { return new XtraReport(); } @@ -400,7 +400,7 @@ namespace BeWo.Report reportId = organisation.Name; } - + var ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid); var lServiceOverviewSingleCustomerReport = this.FindReportImp(reportId); @@ -408,8 +408,8 @@ namespace BeWo.Report { lServiceOverviewSingleCustomerReport.SetReportDataSource(ro); } - - + + return lServiceOverviewSingleCustomerReport as XtraReport; } @@ -552,7 +552,7 @@ namespace BeWo.Report customerOids.Add(c.Oid.Value); } } - + } } @@ -721,10 +721,10 @@ namespace BeWo.Report CostBearer2SupportConcept c2s = DAOFactory.GenericDAO.LoadByID(lSettlementDC.CostBearer2SupportConceptOid.Value); reportId = c2s.CostBearer.ID; } - + if (lSettlementDC.DifferentHourlyRateCount > 0) { - + IBeWoReport lSettlementReport = FindReportImp(reportId); var ro = SettlementRO.Create(lSettlementDC); lSettlementReport.SetReportDataSource(ro); @@ -737,9 +737,9 @@ namespace BeWo.Report lSettlementReport.SetReportDataSource(Settlement2RO.Create(lSettlementDC)); report = lSettlementReport as XtraReport; - + } - + if (createAnhang) { if (report != null) @@ -754,7 +754,7 @@ namespace BeWo.Report } } } - + return report; } @@ -818,7 +818,7 @@ namespace BeWo.Report } } - var reportObject = MitarbeiterstundenkontoRO.Create(employeeOid, teamOids, startDate, endDate, null); + var reportObject = MitarbeiterstundenkontoRO.Create(employeeOid, teamOids, startDate, endDate, null); report.SetReportDataSource(reportObject); return report as XtraReport; @@ -973,16 +973,16 @@ namespace BeWo.Report { var report = FindReportImp(); - report.SetReportDataSource(EmployeeKilometerauswertungsRO.Create(MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(DAOFactory.GenericDAO.LoadByID(employeeOid)), serviceDescriptionOids, start, end)); + report.SetReportDataSource(EmployeeKilometerauswertungsRO.Create(MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(DAOFactory.GenericDAO.LoadByID(employeeOid)), serviceDescriptionOids, start, end)); - return report as XtraReport; + return report as XtraReport; } public override XtraReport CreateKilometerauswertungForAllEmployees(List employeeOids, List serviceDescriptionOids, DateTime start, DateTime end) { var report = FindReportImp(); - report.SetReportDataSource(EmployeeKilometerauswertungsListRO.Create(MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(DAOFactory.GenericDAO.LoadByIDs(employeeOids)), serviceDescriptionOids, start, end)); + report.SetReportDataSource(EmployeeKilometerauswertungsListRO.Create(MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(DAOFactory.GenericDAO.LoadByIDs(employeeOids)), serviceDescriptionOids, start, end)); return report as XtraReport; } @@ -991,12 +991,12 @@ namespace BeWo.Report { var report = FindReportImp(); var service = new OperationsServiceImp(); - - var filter = new AbsenceOverviewFilterDC() { AbsenceReasons = abs, EmploymentType = empTypes, Year = dt.Year, Month = dt.Month, Teams = teams}; + + var filter = new AbsenceOverviewFilterDC() { AbsenceReasons = abs, EmploymentType = empTypes, Year = dt.Year, Month = dt.Month, Teams = teams }; List compactTeams = new List(); if (teams != null) { - if(teams.Count > 0) + if (teams.Count > 0) compactTeams = service.GetCertainTeamsById(teams); } @@ -1047,7 +1047,7 @@ namespace BeWo.Report var opertionsService = new OperationsServiceImp(); var customerService = new CustomerServiceImp(); var employeeService = new EmployeeServiceImp(); - + var report = FindReportImp(); var dienstEintraege = opertionsService.GetAllDienstEintraegeAsList(wOid, dt.Year, dt.Month); @@ -1103,7 +1103,7 @@ namespace BeWo.Report } } - report.SetReportDataSource(RosterIstRO.Create(dienstEintraege, vertretungen, employee, opertionsService.GetAllDienste(wOid), + report.SetReportDataSource(RosterIstRO.Create(dienstEintraege, vertretungen, employee, opertionsService.GetAllDienste(wOid), customerService.GetAllActiveWohnheimeCompact().First(x => x.WohnheimOid == wOid), dt.Year, dt.Month, feiertageDCs, absences, stundenBeiAbwesenheit)); return report as XtraReport; @@ -1118,11 +1118,11 @@ namespace BeWo.Report OperationsServiceImp operations = new OperationsServiceImp(); XtraReport mainReport = null; - + foreach (var oid in objectOids) { string text = operations.ReplacePlaceholdersInTemplate(templateDC, oid, table); - + var report = FindReportImp(); report.SetReportDataSource(VorlageRO.Create(text)); ((XtraReport)report).CreateDocument(); @@ -1192,7 +1192,7 @@ namespace BeWo.Report IBeWoReport report = FindReportImp(); report.SetReportDataSource(ValidationMessageListRO.Create(startDate, endDate, DAOFactory.SearchDAO.GetValidationMessagesForMonth(startDate, endDate).ToList())); - + return report as XtraReport; } @@ -1229,22 +1229,22 @@ namespace BeWo.Report { master.Pages.AddRange(report.Pages); } - + } } return master; } - + public override XtraReport CreateCustomerListReport(List oids) - { + { var ro = CustomerListRO.Create(oids); IBeWoReport report = FindReportImp(); report.SetReportDataSource(ro); return report as XtraReport; } - + public override XtraReport CreatePersonListReport(List oids) { var ro = PersonListRO.Create(oids); @@ -1385,5 +1385,5 @@ namespace BeWo.Report return queryReport as XtraReport; } - + } } \ No newline at end of file diff --git a/Report/DefaultReports/EmployeeListReport.cs b/Report/DefaultReports/EmployeeListReport.cs index 8e415ba30..b2203c0c8 100644 --- a/Report/DefaultReports/EmployeeListReport.cs +++ b/Report/DefaultReports/EmployeeListReport.cs @@ -9,7 +9,7 @@ namespace BeWo.Report.DefaultReports InitializeComponent(); } - public void SetReportDataSource(CustomerListRO pRO) + public void SetReportDataSource(EmployeeListRO pRO) { bindingSource1.DataSource = pRO; }