- Überarbeitung Perseh Import für weiteres LWL Format
- Arbeitszeit Kopieren im EmployeeView eingebaut - Diverse Kundenanpassungen (Christopherus Haus, Prof Eggers Stiftung, Trias) - Bugfix History für Klienten
This commit is contained in:
@@ -39,7 +39,7 @@ namespace BeWo.Service.ServiceImplementations
|
||||
foreach (var sc in c.SupportConcepts)
|
||||
ServiceLogic.SetActivationType<SupportConcept>(sc.Oid.Value, sc.Version.Value, ActivationTypeId.Archived);
|
||||
|
||||
HistoryCreator.MakeCustomerHistoryEntry(c, MapperFactory.CustomerDC_Customer.MapToNewDC(c), null, StatementType.Archived, null, null, null);
|
||||
HistoryCreator.MakeCustomerHistoryEntry(c, MapperFactory.CustomerDC_Customer.MapToNewDC(c), null, StatementType.Archived, null, null, null, null);
|
||||
|
||||
}
|
||||
|
||||
@@ -122,7 +122,7 @@ namespace BeWo.Service.ServiceImplementations
|
||||
foreach (var sc in customer.SupportConcepts)
|
||||
ServiceLogic.SetActivationType<SupportConcept>(sc.Oid.Value, sc.Version.Value, ActivationTypeId.Deleted);
|
||||
|
||||
HistoryCreator.MakeCustomerHistoryEntry(customer, MapperFactory.CustomerDC_Customer.MapToNewDC(customer), null, StatementType.Delete, null, null, null);
|
||||
HistoryCreator.MakeCustomerHistoryEntry(customer, MapperFactory.CustomerDC_Customer.MapToNewDC(customer), null, StatementType.Delete, null, null, null, null);
|
||||
}
|
||||
|
||||
public void DeactivateOrganisation(long pOid, long pVersion)
|
||||
@@ -251,7 +251,7 @@ namespace BeWo.Service.ServiceImplementations
|
||||
lOriginals.DoForEach(or => MapperFactory.CustomerDC_Customer.ConcurrencyCheck(pOid2Version[or.Oid.Value], or));
|
||||
|
||||
foreach (Customer lOriginal in lOriginals)
|
||||
HistoryCreator.MakeCustomerHistoryEntry(lOriginal, MapperFactory.CustomerDC_Customer.MapToNewDC(lOriginal), null, StatementType.Delete, null, null, null);
|
||||
HistoryCreator.MakeCustomerHistoryEntry(lOriginal, MapperFactory.CustomerDC_Customer.MapToNewDC(lOriginal), null, StatementType.Delete, null, null, null, null);
|
||||
|
||||
DAOFactory.GenericDAO.Delete(lOriginals);
|
||||
}
|
||||
@@ -1016,7 +1016,7 @@ namespace BeWo.Service.ServiceImplementations
|
||||
var lOriginal = DAOFactory.GenericDAO.LoadByID<Customer>(oid);
|
||||
|
||||
object[] Lists = GetFromNHibernateDecoupledCustomerRelatedLists(lOriginal);
|
||||
HistoryCreator.MakeCustomerHistoryEntry(lOriginal, pCustomerDC, lOriginal.Oid.Value, StatementType.Insert, Lists[0] as List<Customer2Person>, Lists[1] as List<Customer2Organisation>, Lists[2] as List<Employee2Customer>);
|
||||
HistoryCreator.MakeCustomerHistoryEntry(lOriginal, pCustomerDC, lOriginal.Oid.Value, StatementType.Insert, Lists[0] as List<Customer2Person>, Lists[1] as List<Customer2Organisation>, Lists[2] as List<Employee2Customer>, Lists[3] as List<AbsenceTime>);
|
||||
|
||||
OwnChatHelper.StartOwnChatSync();
|
||||
return oid;
|
||||
@@ -1250,13 +1250,11 @@ namespace BeWo.Service.ServiceImplementations
|
||||
|
||||
object[] Lists = GetFromNHibernateDecoupledCustomerRelatedLists(lOriginal);
|
||||
|
||||
HistoryCreator.MakeCustomerHistoryEntry(lOriginal, pCustomerDC, null, StatementType.Update, Lists[0] as List<Customer2Person>, Lists[1] as List<Customer2Organisation>, Lists[2] as List<Employee2Customer>);
|
||||
|
||||
MapperFactory.CustomerDC_Customer.MergeWithEntity(pCustomerDC, lOriginal);
|
||||
|
||||
DAOFactory.GenericDAO.Update(lOriginal);
|
||||
|
||||
|
||||
HistoryCreator.MakeCustomerHistoryEntry(lOriginal, pCustomerDC, null, StatementType.Update, Lists[0] as List<Customer2Person>, Lists[1] as List<Customer2Organisation>, Lists[2] as List<Employee2Customer>, Lists[3] as List<AbsenceTime>);
|
||||
|
||||
CheckUpdatedReferenceNumbers(pCustomerDC, lOriginal);
|
||||
|
||||
@@ -2085,7 +2083,7 @@ namespace BeWo.Service.ServiceImplementations
|
||||
|
||||
private static object[] GetFromNHibernateDecoupledCustomerRelatedLists(Customer customer)
|
||||
{
|
||||
var CustomerRelatedListsList = new object[3];
|
||||
var CustomerRelatedListsList = new object[4];
|
||||
|
||||
List<Customer2Person> originalC2PList = customer.Customer2PersonList.Select(element => new Customer2Person
|
||||
{
|
||||
@@ -2132,10 +2130,27 @@ namespace BeWo.Service.ServiceImplementations
|
||||
ValueList = element.ValueList,
|
||||
Version = element.Version
|
||||
}).ToList();
|
||||
List<AbsenceTime> originalAbsenceTimeList =
|
||||
customer.AbsenceTimes.Select(element => new AbsenceTime
|
||||
{
|
||||
CustomerOid = element.CustomerOid,
|
||||
Notice = element.Notice,
|
||||
Oid = element.Oid,
|
||||
InsTs = element.InsTs,
|
||||
InsUser = element.InsUser,
|
||||
UdpUser = element.UdpUser,
|
||||
Version = element.Version,
|
||||
AbsenceReason = element.AbsenceReason,
|
||||
Start = element.Start,
|
||||
End = element.End,
|
||||
KrankheitsMeldung = element.KrankheitsMeldung,
|
||||
UpdTs = element.UpdTs
|
||||
}).ToList();
|
||||
|
||||
CustomerRelatedListsList[0] = originalC2PList;
|
||||
CustomerRelatedListsList[1] = originalC2OList;
|
||||
CustomerRelatedListsList[2] = original2CList;
|
||||
CustomerRelatedListsList[3] = originalAbsenceTimeList;
|
||||
|
||||
return CustomerRelatedListsList;
|
||||
}
|
||||
@@ -2304,7 +2319,7 @@ namespace BeWo.Service.ServiceImplementations
|
||||
|
||||
ServiceLogic.SetActivationType<Customer>(pOid, pVersion, ActivationTypeId.Active);
|
||||
|
||||
HistoryCreator.MakeCustomerHistoryEntry(c, MapperFactory.CustomerDC_Customer.MapToNewDC(c), null, StatementType.Reactivate, null, null, null);
|
||||
HistoryCreator.MakeCustomerHistoryEntry(c, MapperFactory.CustomerDC_Customer.MapToNewDC(c), null, StatementType.Reactivate, null, null, null, null);
|
||||
}
|
||||
|
||||
public void ReactivateSupportConcept(long pOid, long pVersion)
|
||||
|
||||
Reference in New Issue
Block a user