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 
Ein Arsch voll Konflikte.
This commit is contained in:
Lyndon Jetten
2020-08-19 12:15:10 +02:00
parent b27cd20c2e 7c3424c00f
commit 1fc2ffcc2d
1083 changed files with 313104 additions and 18615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Service/ServiceImplementations/CustomerServiceImp.cs
View File

@@ -9,6 +9,7 @@ using BeWo.Data.Entities;
using BeWo.Data.Security;
using BeWo.Service.Core;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.OwnChat;
using BeWo.Service.Plugins;
using BeWo.Service.ServiceContracts;
using BS.Shared;
@@ -934,6 +935,7 @@ namespace BeWo.Service.ServiceImplementations
object[] Lists = GetFromNHibernateDecoupledCustomerRelatedLists(lOriginal);
MakeCustomerHistoryEntry(lOriginal, lOriginal.Oid.Value, StatementType.Insert, Lists[0] as List<Customer2Person>, Lists[1] as List<Customer2Organisation>, Lists[2] as List<Employee2Customer>);
OwnChatHelper.StartOwnChatSync();
return oid;
}
catch (Exception e)
@@ -1178,7 +1180,9 @@ namespace BeWo.Service.ServiceImplementations
CheckUpdatedReferenceNumbers(pCustomerDC, lOriginal);
return lOriginal.Oid.Value;
OwnChatHelper.StartOwnChatSync();
return lOriginal.Oid.Value;
}
catch (StaleObjectStateException)
{
@@ -2326,6 +2330,13 @@ namespace BeWo.Service.ServiceImplementations
var result = new List<SupportConceptDC>();
var supportConcepts = DAOFactory.SearchDAO.GetAllActiveSupportConceptsByCustomers(pCustomerOids.ToList());
foreach (var sc in supportConcepts)
{
if (sc.Customer.Person.LastName == "Janzen")
{
int test = 0;
}
}
result.AddRange(MapperFactory.SupportConceptDC_SupportConcept.MapToNewDCs(supportConcepts));
return result;

51
Service/ServiceImplementations/EmployeeServiceImp.cs
View File

@@ -7,6 +7,7 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.Core;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.OwnChat;
using BeWo.Service.Plugins;
using BeWo.Service.SBD;
using BeWo.Service.Security;
@@ -683,9 +684,9 @@ namespace BeWo.Service.ServiceImplementations
MakeNewEmployeeHistoryEntry(temp, StatementType.Insert);
OwnChatHelper.StartOwnChatSync();
return id;
return id;
}
catch (Exception e)
{
@@ -713,6 +714,9 @@ namespace BeWo.Service.ServiceImplementations
{
Team lTeam = MapperFactory.TeamDC_Team.MapToNewEntity(pTeam);
DAOFactory.GenericDAO.Insert(lTeam);
OwnChatHelper.StartOwnChatSync();
return lTeam.Oid.Value;
}
catch (Exception e)
@@ -859,6 +863,8 @@ namespace BeWo.Service.ServiceImplementations
MakeNewEmployeeHistoryEntry(lOriginal, StatementType.Update);
DAOFactory.GenericDAO.Update(lOriginal);
OwnChatHelper.StartOwnChatSync();
return lOriginal.Oid.Value;
}
catch (StaleObjectStateException)
@@ -892,6 +898,9 @@ namespace BeWo.Service.ServiceImplementations
Team lOriginal = DAOFactory.GenericDAO.LoadByID<Team>(pTeam.TeamOid.Value);
MapperFactory.TeamDC_Team.MergeWithEntity(pTeam, lOriginal);
DAOFactory.GenericDAO.Update(lOriginal);
OwnChatHelper.StartOwnChatSync();
return lOriginal.Oid.Value;
}
catch (Exception e)
@@ -1381,7 +1390,38 @@ namespace BeWo.Service.ServiceImplementations
vertretungsItem.Employee != null).Select(item => item.Employee.EmployeeOid);
employeeOids = employeeOids.Where(e => !abwesenendeEmployeeOids.Contains(e));
return MapperFactory.CompactVertreterEmployeeDC_VertreterEmployee.MapToNewDCs(DAOFactory.GenericDAO.GetActiveByIDs<Employee>(employeeOids));
var list = MapperFactory.CompactVertreterEmployeeDC_VertreterEmployee.MapToNewDCs(DAOFactory.GenericDAO.GetActiveByIDs<Employee>(employeeOids));
//Setze Betreuungszeiten
foreach (var vertreter in list)
{
foreach (var item in vertretungsListe)
{
if (item.Employee.EmployeeOid == vertreter.EmployeeOid)
{
//if (vertreter.Arbeitszeit == null)
//{
// vertreter.Arbeitszeit = new List<ArbeitszeitDC>();
//}
//if (vertreter.Arbeitszeit.Count == 0)
//{
// vertreter.Arbeitszeit.Add(new ArbeitszeitDC
// {
// Eintraege = new List<ArbeitszeitEintragDC>()
// });
//}
//vertreter.Arbeitszeit[0].Eintraege.AddRange(item.Arbeitszeiten);
vertreter.Arbeitszeit = new List<ArbeitszeitDC>();
vertreter.Arbeitszeit.Add(
new ArbeitszeitDC
{
Eintraege = item.Arbeitszeiten.ToList()
});
}
}
}
return list;
}
catch (Exception e)
{
@@ -1499,9 +1539,10 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
var employees = DAOFactory.GenericDAO.GetAll<Employee>();
var s = PluginLoader.FindClass<EmployeeService>();
return s.GetAllCompactEmployees();
return MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(employees);
}
catch(Exception e)
{

1092
Service/ServiceImplementations/OperationsServiceImp.cs
View File

File diff suppressed because it is too large Load Diff

32
Service/ServiceImplementations/UserServiceImp.cs
View File

@@ -23,6 +23,7 @@ using BS.Shared.Extensions;
using MySql.Data.MySqlClient;
using BeWo.Service.Configuration;
using BeWo.Service.OwnChat;
using BeWo.Service.Plugins;
namespace BeWo.Service.ServiceImplementations
@@ -68,6 +69,9 @@ namespace BeWo.Service.ServiceImplementations
DAOFactory.GenericDAO.Insert(passwortvelauf);
DAOFactory.GenericDAO.Update(lOriginal);
OwnChatHelper.StartOwnChatSync();
return lOriginal.Version.Value;
}
catch (Exception e)
@@ -752,13 +756,33 @@ namespace BeWo.Service.ServiceImplementations
return "Das Passwort muss mindestens 8 Zeichen lang sein!";
}
//if (!(pNewPassword.Any(x => sonderzeichen.Contains(x)) && pNewPassword.Any(x => zahlen.Contains(x)) && pNewPassword.Any(x => grossBuchstaben.Contains(x)) && pNewPassword.Any(x => kleinBuchstaben.Contains(x))))
if (!(pNewPassword.Any(x => zahlen.Contains(x)) && pNewPassword.Any(x => grossBuchstaben.Contains(x)) && pNewPassword.Any(x => kleinBuchstaben.Contains(x))))
int richtlinienCount = 0;
if (pNewPassword.Any(x => zahlen.Contains(x)))
{
return "Das Passwort sollte Sonderzeichen, Zahlen, Groß- und Kleinbuchstaben enthalten.";
richtlinienCount++;
}
if (pNewPassword.Any(x => grossBuchstaben.Contains(x)))
{
richtlinienCount++;
}
if (pNewPassword.Any(x => kleinBuchstaben.Contains(x)))
{
richtlinienCount++;
}
if (pNewPassword.Any(x => sonderzeichen.Contains(x)))
{
richtlinienCount++;
}
if (pNewPassword.Equals("bewo")) {
//if (!(pNewPassword.Any(x => sonderzeichen.Contains(x)) && pNewPassword.Any(x => zahlen.Contains(x)) && pNewPassword.Any(x => grossBuchstaben.Contains(x)) && pNewPassword.Any(x => kleinBuchstaben.Contains(x))))
if (richtlinienCount < 3)
{
return "Das Passwort muss mindestens drei Zeichen aus der Gruppe Sonderzeichen, Zahlen, Groß- und Kleinbuchstaben enthalten.";
}
if (pNewPassword.Equals("bewo"))
{
return "Das Passwort darf nicht bewo heißen";
}