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

Maßnahme und Ziele Icf Import

Browse Source 
Maßnahme und Ziele per Popup bearbeiten
Maßnahme und Ziele Notiz optional einblenden
Das selbe auch bei Hilfeplan -> Ziele (ohne Icf import)

ReportTemplate hinzugefügt (Tabelle, Hibernate, Enity, Mapper, DC)

Listbox Select hinzugefügt, dient dem generischen Auswählen eines object aus einer list<object> per control
This commit is contained in:
rene
2019-08-26 16:11:00 +02:00
parent 0f2ef3a075
commit 928aa4a807
34 changed files with 2072 additions and 1622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -37,14 +37,11 @@ namespace BeWo.Service.ServiceImplementations
[ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall, ConcurrencyMode = ConcurrencyMode.Single)]
public class OperationsServiceImp : IOperationsService
{
public Mandator GetMandatorEntity()
{
return AppSettings.GetMandatorEntity();
}
public void DeactivateInvoices(List<InvoiceDC> pInvoices)
{
try
@@ -1122,7 +1119,7 @@ namespace BeWo.Service.ServiceImplementations
{
CostBearer = cb2sc.CostBearer.Organisation.Name,
ApprovedHours = calc.GetApprovedHoursTotal(cb2sc.MapToNewDC(), true) ?? 0m,
RecordedHours = calc.GetBillableDurationInMinutes(cb2sc.ServiceRecords.MapToNewDCsCompact())/60
RecordedHours = calc.GetBillableDurationInMinutes(cb2sc.ServiceRecords.MapToNewDCsCompact()) / 60
};
// if (cb2sc.ApprovedStartDate.HasValue && cb2sc.ApprovedEndDate.HasValue)
@@ -1538,7 +1535,7 @@ namespace BeWo.Service.ServiceImplementations
{
if (!group.StartDate.HasValue && group.EndDate.HasValue)
{
group.StartDate = group.EndDate.Value.AddMinutes((double)group.RoundedDuration*-1);
group.StartDate = group.EndDate.Value.AddMinutes((double)group.RoundedDuration * -1);
}
if (group.StartDate.HasValue && group.EndDate.HasValue)
@@ -2211,7 +2208,7 @@ namespace BeWo.Service.ServiceImplementations
var gc = gdc.CalculateGroupDuration(serviceRecord.GroupPersonCount.Value,
serviceRecord.GroupEmployeeCount.Value, serviceRecord.RoundedDuration);
var singleduration = serviceRecord.RoundedDuration/serviceRecord.GroupPersonCount.Value;
var singleduration = serviceRecord.RoundedDuration / serviceRecord.GroupPersonCount.Value;
if (gc != null)
{
@@ -3530,7 +3527,7 @@ namespace BeWo.Service.ServiceImplementations
try
{
string serverURl = serverUrl+"/api/ownchat/chatcode/create/"+ apikey +"/"+ customerId + "/"+userId; // ändern
string serverURl = serverUrl + "/api/ownchat/chatcode/create/" + apikey + "/" + customerId + "/" + userId; // ändern
WebRequest request = WebRequest.Create(serverURl);
@@ -4686,10 +4683,10 @@ namespace BeWo.Service.ServiceImplementations
var organisation2Person = new Organisation2Person
{
Organisation = DAOFactory.GenericDAO.LoadByID<Organisation>(pOrganisationOid),
Organisation = DAOFactory.GenericDAO.LoadByID<Organisation>(pOrganisationOid),
Notice = pNotice,
RolleInOrganisation = pValue != null ? DAOFactory.GenericDAO.LoadByID<ValueListEntry>(pValue.ValueListEntryOid.Value) : null,
Person = DAOFactory.GenericDAO.LoadByID<Person>(personOid),
Person = DAOFactory.GenericDAO.LoadByID<Person>(personOid),
Contacts = contactList
};
@@ -5202,27 +5199,27 @@ namespace BeWo.Service.ServiceImplementations
customer.VarFieldValueList?.Clear();
customer.AbWelchemKrankheitsTag = 0;
customer.AbWelchemKrankheitsTag = 0;
customer.AbsenceTimes.DoForEach(at =>
{
at.Notice = null;
at.Notice = null;
at.InsUser = anonimyzedName;
at.UdpUser = anonimyzedName;
});
customer.Ansprechpartner = null;
customer.Ansprechpartner = null;
customer.AssessmentSheetCategoryList?.Clear();
customer.AssistanceBegin = null;
customer.AusstVersAmt = null;
customer.AusweisGueltigBis = null;
customer.AusweisGueltigVon = null;
customer.AssistanceBegin = null;
customer.AusstVersAmt = null;
customer.AusweisGueltigBis = null;
customer.AusweisGueltigVon = null;
customer.AusweisUnbefristetGueltig = null;
customer.BehinderungsartenListe?.Clear();
customer.BeiblattGueltigBis = null;
customer.Childs = null;
customer.CostCenter = null;
customer.Ansprechpartner = null;
customer.AssistanceBegin = null;
customer.BeiblattGueltigBis = null;
customer.Childs = null;
customer.CostCenter = null;
customer.Ansprechpartner = null;
customer.AssistanceBegin = null;
customer.Customer2CostBearerList?.Clear();
customer.Customer2OrganisationList?.Clear();
@@ -5237,63 +5234,63 @@ namespace BeWo.Service.ServiceImplementations
personRelation.Notice = null;
});
customer.CustomerAlias = null;
customer.DebitorNumber = null;
customer.Diagnosis = null;
customer.CustomerAlias = null;
customer.DebitorNumber = null;
customer.Diagnosis = null;
customer.Diagnosis2CustomerList?.Clear();
customer.DistanceInMeter = null;
customer.DistanceInMeter = null;
customer.Employee2CustomerList?.Clear();
customer.Environment = null;
customer.EquityContribution = null;
customer.FamilyData = null;
customer.GradDerBehinderung = null;
customer.ICD10Diagnosis = null;
customer.InsUser = anonimyzedName;
customer.IsAdvisedOrAttended = null;
customer.Jugendamt = null;
customer.Medication = null;
customer.Environment = null;
customer.EquityContribution = null;
customer.FamilyData = null;
customer.GradDerBehinderung = null;
customer.ICD10Diagnosis = null;
customer.InsUser = anonimyzedName;
customer.IsAdvisedOrAttended = null;
customer.Jugendamt = null;
customer.Medication = null;
customer.Medikamentenverordnungslisten?.Clear();
customer.MerkzeichenListe?.Clear();
customer.Notice = null;
customer.Pflegegrad = null;
customer.Notice = null;
customer.Pflegegrad = null;
customer.PlacementList?.Clear();
customer.ReferenceNumber = null;
customer.ReferenceNumber = null;
customer.Team2CustomerList?.Clear();
customer.TerminationDate = null;
customer.TerminationReason = null;
customer.UdpUser = anonimyzedName;
customer.TerminationDate = null;
customer.TerminationReason = null;
customer.UdpUser = anonimyzedName;
customer.ValueList?.Clear();
customer.VertretungDringendErforderlich = false;
customer.VertretungGewuenscht = false;
customer.VertretungGewuenscht = false;
customer.ServiceRecordList?.DoForEach(record =>
{
record.Notice = null;
record.Notice2 = null;
record.Notice3 = null;
record.Notice4 = null;
record.Notice5 = null;
record.RTFNotice1 = null;
record.RTFNotice2 = null;
record.RTFNotice3 = null;
record.RTFNotice4 = null;
record.RTFNotice5 = null;
record.InsUser = anonimyzedName;
record.UdpUser = anonimyzedName;
record.Notice = null;
record.Notice2 = null;
record.Notice3 = null;
record.Notice4 = null;
record.Notice5 = null;
record.RTFNotice1 = null;
record.RTFNotice2 = null;
record.RTFNotice3 = null;
record.RTFNotice4 = null;
record.RTFNotice5 = null;
record.InsUser = anonimyzedName;
record.UdpUser = anonimyzedName;
});
customer.SupportConcepts?.DoForEach(supportConcept =>
{
supportConcept.Notice = null;
supportConcept.Notice = null;
supportConcept.InsUser = anonimyzedName;
supportConcept.UdpUser = anonimyzedName;
supportConcept.CostBearer2SupportConceptList.DoForEach(cb2SC =>
{
cb2SC.CustomerReferenceNumber = null;
cb2SC.Notice = null;
cb2SC.InsUser = anonimyzedName;
cb2SC.UdpUser = anonimyzedName;
cb2SC.Notice = null;
cb2SC.InsUser = anonimyzedName;
cb2SC.UdpUser = anonimyzedName;
});
});
@@ -5646,7 +5643,7 @@ namespace BeWo.Service.ServiceImplementations
try
{
var s = PluginLoader.FindClass<FlexibleReportService>();
return s.GetAllFlexibleReportEntrys(filter);
}
catch (Exception e)
@@ -5654,7 +5651,7 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(e);
}
}
public IList<FlexibleReportLayoutDC> GetFlexibleReportLayouts()
{
var result = new List<FlexibleReportLayoutDC>();
@@ -5727,9 +5724,9 @@ namespace BeWo.Service.ServiceImplementations
{
return DAOFactory.SearchDAO.CheckForOverlappingSubstitutions(employeeOid, customerOid, startDate, endDate);
}
catch(Exception exception)
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(exception);
throw Utils.CreateBeWoFaultException(e);
}
}
@@ -5740,9 +5737,50 @@ namespace BeWo.Service.ServiceImplementations
return MapperFactory.HomeViewPanelDC_HomeViewPanel.MapToNewDCs(
DAOFactory.GenericDAO.GetAllActive<HomeViewPanel>());
}
catch (Exception exception)
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(exception);
throw Utils.CreateBeWoFaultException(e);
}
}
public IList<ValueListEntryDC> GetIcf()
{
try
{
var rawList = DAOFactory.GenericDAO.GetAll<Icf>().ToList();
var icfs = new List<ValueListEntryDC>
{
new ValueListEntryDC() {ParentOid = -1, TypeDescription = "ICF"}
};
icfs.AddRange(rawList.Select(x => new ValueListEntryDC()
{
ValueListEntryOid = x.Oid,
ParentOid = x.ParentID,
TypeDescription = x.Bezeichnung,
Abbreviation = x.Code,
Notice = x.Beschreibung
}));
return icfs;
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public IList<ReportTemplate> GetReportTemplates(ReportTemplateType reportTemplateType)
{
try
{
return DAOFactory.GenericDAO.GetAllActive<ReportTemplate>()
.Where(x => x.ReportTemplateType == reportTemplateType).ToList();
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
}