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

Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo

Browse Source
This commit is contained in:
HirschleM
2026-06-02 10:14:41 +02:00
parent 97cc47eeea 5cb9abcea3
commit ef7e70cb82
4 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs
View File

@@ -50,6 +50,12 @@ namespace BeWo.DiakonieKKKleve
s.GoalList += ", ";
s.GoalList += goal.Abbreviation;
}
else if (goal.Parent != null && !String.IsNullOrEmpty(goal.Parent.Abbreviation))
{
if (s.GoalList.Length > 0)
s.GoalList += ", ";
s.GoalList += goal.Parent.Abbreviation;
}
}
}
if (s.ServiceDescription.Contains("Gruppe")) //die erstellen meist über Mehrfachbuchung

13
ReportImp/PerspektivenEV/CustomReportCreator.cs
View File

@@ -568,13 +568,14 @@ namespace PerspektivenEV
public override XtraReport CreateServiceRecordListReport(long employeeOid, long customerOid, long supportConceptOid, long costbearer2SupportConceptOid, bool isLimitedToAdditionalServices, DateTimeSpan limitingTimeSpan)
{
IBeWoReport<ServiceRecordListRO> lServiceRecordListReport = null;
IBeWoReport<ServiceRecordListRO> lServiceRecordListReport = new Leistungen();
var customer = MapperFactory.CustomerDC_Customer.MapToNewDC(DAOFactory.GenericDAO.GetByID<Customer>(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<Customer>(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);

2
ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs
View File

@@ -229,7 +229,7 @@ namespace PerspektivenEV.Export
{
sc = scs.Where(p => p.StartDate < lastDate && p.EndDate > new DateTime(date.Year, date.Month, 1)).FirstOrDefault();
}
var cb2sc = sc.CostBearer2SupportConceptList.Where(sc => sc.CostBearer.Organisation.Name != "EIGENANTEIL" && sc.CostBearer.Organisation.Name != "SELBSTZAHLER").FirstOrDefault();
var cb2sc = sc.CostBearer2SupportConceptList.Where(sc1 => sc1.CostBearer.Organisation.Name != "EIGENANTEIL" && sc1.CostBearer.Organisation.Name != "SELBSTZAHLER").FirstOrDefault();
if (cb2sc != null && cb2sc.KontoHilfeplan != null && cb2sc.KontoHilfeplan.Length > 0)
{
debitor = cb2sc.KontoHilfeplan;

22
ReportImp/PerspektivenEV/ServiceRecordListReport.cs
View File

@@ -23,15 +23,21 @@ namespace PerspektivenEV
if (pRO.ServiceRecordDetailList.Count > 0)
{
var c = DAOFactory.GenericDAO.LoadByID<Customer>(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<Customer>(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)
{