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

cb, letzte Bugfixes vor Version

Browse Source
This commit is contained in:
Christian
2020-11-10 02:25:15 +01:00
parent 55afb28b52
commit 514c19ce3d
66 changed files with 815 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Service/ServiceImplementations/CustomerServiceImp.cs
View File

@@ -2057,7 +2057,7 @@ namespace BeWo.Service.ServiceImplementations
}
else if (cust.TerminationDate.HasValue)
{
customerDC.TerminationReason = String.Format("Betreuung vorzeitig beendet am {0:dd.MM.yyyy}", cust.TerminationDate);
//customerDC.TerminationReason = String.Format("Betreuung vorzeitig beendet am {0:dd.MM.yyyy}", cust.TerminationDate);
}
if (cust.Person.Address != null)

34
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -449,7 +449,29 @@ namespace BeWo.Service.ServiceImplementations
try
{
IList<ServiceCategory> list = DAOFactory.GenericDAO.GetAllActive<ServiceCategory>();
return MapperFactory.ServiceCategoryDC_ServiceCategory.MapToNewDCs(list);
var dcList = MapperFactory.ServiceCategoryDC_ServiceCategory.MapToNewDCs(list);
//AppSettings settings = AppSettings.CreateSettings();
//if (settings.SortServiceDescriptionAlphabetically)
//{
// dcList = dcList.OrderBy(c => c.Name).ToList();
//}
//else
//{
dcList.Sort((a, b) =>
{
if (a.Position == b.Position)
{
return a.ServiceCategoryOid.Value.CompareTo(b.ServiceCategoryOid.Value);
}
else
{
return a.Position.CompareTo(b.Position);
}
});
//}
return dcList;
}
catch (Exception e)
{
@@ -6446,5 +6468,15 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(exception);
}
}
public String GetOwnChatSettingsUrl()
{
//var url = ConfigurationManager.AppSettings.Get("OwnChatSettingsUrl");
//url = url.Replace("[TENANT]", MultitenancyOperationContextExt.Current.Tenant);
//return url;
return "http://www.bewoplaner.de";
}
}
}

5
Service/ServiceImplementations/ResourceServiceImp.cs
View File

@@ -1095,7 +1095,7 @@ namespace BeWo.Service.ServiceImplementations
ownerOid = pEmployeeOid;
}
//Man hat nur Customer und/oder Resourcen ausgewählt, dann dürfen die eigenen nicht angezeigt werden
//Man hat nur Customer und/oder Ressourcen ausgewählt, dann dürfen die eigenen nicht angezeigt werden
if((pSelectedEmployees == null || pSelectedEmployees.Count == 0) &&
(pSelectedCustomer != null && pSelectedCustomer.Count > 0 ||
pSelectedResources != null && pSelectedResources.Count > 0))
@@ -1261,7 +1261,7 @@ namespace BeWo.Service.ServiceImplementations
ownerOid = pEmployeeOid;
}
//Man hat nur Customer und/oder Resourcen ausgewählt, dann dürfen die eigenen nicht angezeigt werden
//Man hat nur Customer und/oder Ressourcen ausgewählt, dann dürfen die eigenen nicht angezeigt werden
if ((pSelectedEmployees == null || pSelectedEmployees.Count == 0) &&
(pSelectedCustomer != null && pSelectedCustomer.Count > 0 ||
pSelectedResources != null && pSelectedResources.Count > 0))
@@ -1523,6 +1523,7 @@ namespace BeWo.Service.ServiceImplementations
IsActive = task.IsActive,
IsTask = true,
DueDate = task.DueDate,
CompletedDate = task.CompletedDate,
StartDate = task.CompletedDate.HasValue ? task.DueDate?.GetShortDateTime() : task.InsTs?.GetShortDateTime(),
EndDate = task.DueDate?.GetShortDateTime().AddDays(1) ?? DateTime.MaxValue.Date
};

6
Service/ServiceImplementations/UserServiceImp.cs
View File

@@ -314,6 +314,9 @@ namespace BeWo.Service.ServiceImplementations
lEntity.InitSalt();
lEntity.ChangePassword(pUser.NewPassword);
DAOFactory.GenericDAO.Insert(lEntity);
OwnChatHelper.StartOwnChatSync();
return lEntity.Oid.Value;
}
catch (FaultException<BeWoFault> e)
@@ -562,6 +565,9 @@ namespace BeWo.Service.ServiceImplementations
ApplicationUser lOriginal = DAOFactory.GenericDAO.LoadByID<ApplicationUser>(pUser.UserOid.Value);
DAOFactory.GenericDAO.Update(MapperFactory.UserDC_User.MergeWithEntity(pUser, lOriginal));
OwnChatHelper.StartOwnChatSync();
return lOriginal.Oid.Value;
}
catch (FaultException<BeWoFault> e)