From 231eb8162a5b7e15663de7b0432fc3dd7e660a2e Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 24 Feb 2021 11:00:38 +0100 Subject: [PATCH] cb, farbige Markierung in Listenansicht in der Zeiterfassung --- BeWo/View/Detail/ServiceRecordView2.xaml | 4 ++-- BeWo/ViewModel/ServiceRecordVM.cs | 9 ++++++--- BeWoPlanerMobil/BeWoPlanerMobil.csproj.user | 2 +- BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs | 2 +- BeWoPlanerMobil/TestWebService.asmx.cs | 2 +- Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs | 2 +- Service/Plugins/PluginLoader.cs | 2 +- Service/ServiceImplementations/OperationsServiceImp.cs | 2 +- 8 files changed, 14 insertions(+), 11 deletions(-) diff --git a/BeWo/View/Detail/ServiceRecordView2.xaml b/BeWo/View/Detail/ServiceRecordView2.xaml index 059a20250..dacc8ebed 100644 --- a/BeWo/View/Detail/ServiceRecordView2.xaml +++ b/BeWo/View/Detail/ServiceRecordView2.xaml @@ -1273,8 +1273,8 @@ - - + + diff --git a/BeWo/ViewModel/ServiceRecordVM.cs b/BeWo/ViewModel/ServiceRecordVM.cs index faa8ad985..87f3d8946 100644 --- a/BeWo/ViewModel/ServiceRecordVM.cs +++ b/BeWo/ViewModel/ServiceRecordVM.cs @@ -299,11 +299,14 @@ namespace BeWo.ViewModel get { Brush brush = null; - if (_GroupOid != null) + //if (_GroupOid != null) + //{ + // brush = Application.Current.FindResource("GroupBookingBackgroundBrush") as Brush; + //} + if (!String.IsNullOrEmpty(BackgroundColor)) { - brush = Application.Current.FindResource("GroupBookingBackgroundBrush") as Brush; + return new SolidColorBrush((Color)System.Windows.Media.ColorConverter.ConvertFromString(BackgroundColor)); } - return brush ?? Brushes.White; } } diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user index e244fab95..017954e4c 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user @@ -8,7 +8,7 @@ - Debug|Any CPU + Release|Any CPU ShowAllFiles 600 MvcControllerEmptyScaffolder diff --git a/BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs b/BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs index 89dca3c82..f0de9261b 100644 --- a/BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs +++ b/BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs @@ -165,7 +165,7 @@ namespace BeWoPlanerMobil.Service //log.Info(String.Format("TryAuthenticateWithLoginForm with username: '{0}', Password: '{1}', Tenant: {2}", name, password, MobileSessionFacade.Tenant)); log.Info($"TryAuthenticateWithLoginForm with username: '{name}', Tenant: {MobileSessionFacade.Tenant}"); - if (s.IsUserValid(name, password, null, "MobilClient", false) == UserValidationResult.UserValid) + if (s.IsUserValid(name, password, null, "MobilClient", false, "") == UserValidationResult.UserValid) { var user = DAOFactory.UserDAO.FindUserByLoginName(name); diff --git a/BeWoPlanerMobil/TestWebService.asmx.cs b/BeWoPlanerMobil/TestWebService.asmx.cs index 976ed690a..a525c42a9 100644 --- a/BeWoPlanerMobil/TestWebService.asmx.cs +++ b/BeWoPlanerMobil/TestWebService.asmx.cs @@ -40,7 +40,7 @@ namespace BeWoPlanerMobil var s = new UserServiceImp(); - if (s.IsUserValid(pUserName, pPassword, null, "MobilClient", false) == UserValidationResult.UserValid) + if (s.IsUserValid(pUserName, pPassword, null, "MobilClient", false, "") == UserValidationResult.UserValid) { var user = DAOFactory.UserDAO.FindUserByLoginName(pUserName); diff --git a/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs b/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs index f6a97f858..dbb107a1e 100644 --- a/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs +++ b/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs @@ -124,7 +124,7 @@ namespace BeWo.Service.DCEntityMapper if (pEntity.ServiceRecordType.HasValue && pEntity.ServiceRecordType.Value == ServiceRecordTypeId.Content) { - pDataContract.BackgroundColor = "#FF008EED"; + pDataContract.BackgroundColor = "#FF78BFFF"; } return pDataContract; diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 438850760..52d17b830 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -171,7 +171,7 @@ namespace BeWo.Service.Plugins //t = "3614251071"; // Pusteblume //t = "7755740484"; // Sawo //t = "8275654834"; // Twg Jonathan - //t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V. + t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V. //t = "2632162696"; // Pro BeWo Düren //t = "6340891020"; // Caritas Ahlen //t = "3659854106"; // alpha e.V. diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs index 1a5a9d648..f818026ad 100644 --- a/Service/ServiceImplementations/OperationsServiceImp.cs +++ b/Service/ServiceImplementations/OperationsServiceImp.cs @@ -2527,7 +2527,7 @@ namespace BeWo.Service.ServiceImplementations if (sr.ServiceRecordType.HasValue && sr.ServiceRecordType.Value == ServiceRecordTypeId.Content) { - dc.BackgroundColor = "#FF008EED"; + dc.BackgroundColor = "#FF78BFFF"; }