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

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

Browse Source
This commit is contained in:
staccatomamba
2016-09-30 10:19:20 +02:00
parent fbb6db4dd2 cbcc1e428d
commit 67b9c869aa
39 changed files with 1747 additions and 1072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Service/ServiceImplementations/CustomerServiceImp.cs
View File

@@ -3146,23 +3146,28 @@ namespace BeWo.Service.ServiceImplementations
}
}
// TODO: CompactPersonDCs benutzen
public List<CompactCustomerDC> GetAllChatActiveCustomersCompact(long personOid)
{
try
{
var customers = DAOFactory.SearchDAO.FindAllChatActiveCustomers();
var employee = DAOFactory.SearchDAO.FindEmployeeWithPersonOid(personOid);
var chatpartner = DAOFactory.SearchDAO.FindAllChatpartnerEmployee2Customer(personOid);
var customeroids = employee.Employee2CustomerList.Select(s => s.CustomerOid.Value);
List<Customer> customerpartner = new List<Customer>();
foreach (var x in customers)
{
foreach (var y in chatpartner)
{
if (x.Oid == y.CustomerOid)
{
customerpartner.Add(x);
}
}
}
return MapperFactory.CompactCustomerDC_Customer.MapToNewDCs(customers);
return MapperFactory.CompactCustomerDC_Customer.MapToNewDCs(customerpartner);
}
catch (Exception e)
{
@@ -3204,7 +3209,7 @@ namespace BeWo.Service.ServiceImplementations
{
var messages = DAOFactory.SearchDAO.FindAllEmpfängerChatMessages(senderOid, empfaengerOid);
// var updateGelesen = MapperFactory.ChatMessagesDC_ChatMessages.MapToNewDCs(messages);
// var updateGelesen = MapperFactory.ChatMessagesDC_ChatMessages.MapToNewDCs(messages);
foreach (var read in messages)
{
@@ -3253,6 +3258,21 @@ namespace BeWo.Service.ServiceImplementations
}
}
public Byte[] GetCustomerThumbnail(long customerOid)
{
try
{
var customer = DAOFactory.GenericDAO.GetByID<Customer>(customerOid);
return customer.Thumbnail;
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
private static String SerializeObject(object obj)
{
return JsonConvert.SerializeObject(obj, Formatting.Indented, new JsonSerializerSettings { ContractResolver = new ShouldSerializeContractResolver(), ReferenceLoopHandling = ReferenceLoopHandling.Ignore });