diff --git a/ReportImp/PerspektivenEV/CustomReportCreator.cs b/ReportImp/PerspektivenEV/CustomReportCreator.cs index e08988fb0..c37461104 100644 --- a/ReportImp/PerspektivenEV/CustomReportCreator.cs +++ b/ReportImp/PerspektivenEV/CustomReportCreator.cs @@ -568,13 +568,14 @@ namespace PerspektivenEV public override XtraReport CreateServiceRecordListReport(long employeeOid, long customerOid, long supportConceptOid, long costbearer2SupportConceptOid, bool isLimitedToAdditionalServices, DateTimeSpan limitingTimeSpan) { - IBeWoReport lServiceRecordListReport = null; + IBeWoReport lServiceRecordListReport = new Leistungen(); - var customer = MapperFactory.CustomerDC_Customer.MapToNewDC(DAOFactory.GenericDAO.GetByID(customerOid)); - if (customer.RelatedTeams.Any(t => t.Team.Name.ToLower().Contains("pfk"))) - lServiceRecordListReport = new LeistungenPFK(); - else - lServiceRecordListReport = new Leistungen(); + if (customerOid > 0) + { + var customer = MapperFactory.CustomerDC_Customer.MapToNewDC(DAOFactory.GenericDAO.GetByID(customerOid)); + if (customer.RelatedTeams.Any(t => t.Team.Name.ToLower().Contains("pfk"))) + lServiceRecordListReport = new LeistungenPFK(); + } var ro = ServiceRecordListRO.Create(employeeOid, customerOid, supportConceptOid, costbearer2SupportConceptOid, isLimitedToAdditionalServices, limitingTimeSpan); lServiceRecordListReport.SetReportDataSource(ro); diff --git a/ReportImp/PerspektivenEV/ServiceRecordListReport.cs b/ReportImp/PerspektivenEV/ServiceRecordListReport.cs index 7d9199b36..f61f6e9ac 100644 --- a/ReportImp/PerspektivenEV/ServiceRecordListReport.cs +++ b/ReportImp/PerspektivenEV/ServiceRecordListReport.cs @@ -23,15 +23,21 @@ namespace PerspektivenEV if (pRO.ServiceRecordDetailList.Count > 0) { - var c = DAOFactory.GenericDAO.LoadByID(pRO.ServiceRecordDetailList[0].ServiceRecord.Customer.CustomerOid); - var hauptbetreuer = c.Employee2CustomerList.FirstOrDefault( - e2c => e2c.ValueList.Any(ve => ve.Entry.SystemEntryID.HasValue && ve.Entry.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant)); - pRO.CostBearer = String.Format("{0} {1}", hauptbetreuer.Employee.Person.FirstName, hauptbetreuer.Employee.Person.LastName); - // pRO.CostBearer = pRO.ServiceRecordDetailList[0].ServiceRecord.SupportConcept.Customer.MainAttendant; -> ist leer!!! - foreach (var stat in pRO.Statistics) + if (pRO.ServiceRecordDetailList[0].ServiceRecord.Customer != null) { - if (stat.BEApprovedPerWeek != 0) - lblFLS.Text = String.Format("{0}", Math.Round(stat.BEApprovedPerWeek * 52, 0)); + var c = DAOFactory.GenericDAO.LoadByID(pRO.ServiceRecordDetailList[0].ServiceRecord.Customer.CustomerOid); + var hauptbetreuer = c.Employee2CustomerList.FirstOrDefault( + e2c => e2c.ValueList.Any(ve => ve.Entry.SystemEntryID.HasValue && ve.Entry.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant)); + pRO.CostBearer = String.Format("{0} {1}", hauptbetreuer.Employee.Person.FirstName, hauptbetreuer.Employee.Person.LastName); + // pRO.CostBearer = pRO.ServiceRecordDetailList[0].ServiceRecord.SupportConcept.Customer.MainAttendant; -> ist leer!!! + } + if (pRO.Statistics != null) + { + foreach (var stat in pRO.Statistics) + { + if (stat.BEApprovedPerWeek != 0) + lblFLS.Text = String.Format("{0}", Math.Round(stat.BEApprovedPerWeek * 52, 0)); + } } foreach (var sr in pRO.ServiceRecordDetailList) {