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

EmployeeListReport Fixes

Browse Source
This commit is contained in:
Kojo
2023-09-20 09:20:31 +02:00
parent 21583772e1
commit a17e1441a6
2 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
Report/DefaultReportCreator.cs
View File

@@ -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<Query>(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<ServicesOverviewRO>(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<CostBearer2SupportConcept>(lSettlementDC.CostBearer2SupportConceptOid.Value);
reportId = c2s.CostBearer.ID;
}
if (lSettlementDC.DifferentHourlyRateCount > 0)
{
IBeWoReport<SettlementRO> lSettlementReport = FindReportImp<SettlementRO>(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<EmployeeKilometerauswertungsRO>();
report.SetReportDataSource(EmployeeKilometerauswertungsRO.Create(MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(DAOFactory.GenericDAO.LoadByID<Employee>(employeeOid)), serviceDescriptionOids, start, end));
report.SetReportDataSource(EmployeeKilometerauswertungsRO.Create(MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(DAOFactory.GenericDAO.LoadByID<Employee>(employeeOid)), serviceDescriptionOids, start, end));
return report as XtraReport;
return report as XtraReport;
}
public override XtraReport CreateKilometerauswertungForAllEmployees(List<long> employeeOids, List<long> serviceDescriptionOids, DateTime start, DateTime end)
{
var report = FindReportImp<EmployeeKilometerauswertungsListRO>();
report.SetReportDataSource(EmployeeKilometerauswertungsListRO.Create(MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(DAOFactory.GenericDAO.LoadByIDs<Employee>(employeeOids)), serviceDescriptionOids, start, end));
report.SetReportDataSource(EmployeeKilometerauswertungsListRO.Create(MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(DAOFactory.GenericDAO.LoadByIDs<Employee>(employeeOids)), serviceDescriptionOids, start, end));
return report as XtraReport;
}
@@ -991,12 +991,12 @@ namespace BeWo.Report
{
var report = FindReportImp<AbsenceRO>();
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<CompactTeamDC> compactTeams = new List<CompactTeamDC>();
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<RosterIstRO>();
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<VorlageRO>();
report.SetReportDataSource(VorlageRO.Create(text));
((XtraReport)report).CreateDocument();
@@ -1192,7 +1192,7 @@ namespace BeWo.Report
IBeWoReport<ValidationMessageListRO> report = FindReportImp<ValidationMessageListRO>();
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<long> oids)
{
{
var ro = CustomerListRO.Create(oids);
IBeWoReport<CustomerListRO> report = FindReportImp<CustomerListRO>();
report.SetReportDataSource(ro);
return report as XtraReport;
}
public override XtraReport CreatePersonListReport(List<long> oids)
{
var ro = PersonListRO.Create(oids);
@@ -1385,5 +1385,5 @@ namespace BeWo.Report
return queryReport as XtraReport;
}
}
}

2
Report/DefaultReports/EmployeeListReport.cs
View File

@@ -9,7 +9,7 @@ namespace BeWo.Report.DefaultReports
InitializeComponent();
}
public void SetReportDataSource(CustomerListRO pRO)
public void SetReportDataSource(EmployeeListRO pRO)
{
bindingSource1.DataSource = pRO;
}