cb, letzte Bugfixes vor Version

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

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";
}
}
}