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 into master

Browse Source
This commit is contained in:
Marcel Hirschle
2021-02-24 12:33:03 +01:00
parent 23803e5c40 1c38daa231
commit 0883de7356
8 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BeWo/View/Detail/ServiceRecordView2.xaml
View File

@@ -1273,8 +1273,8 @@
<dxg:GridColumn FieldName="Notice4" AllowEditing="False" Header="Dokumentation4" Width="200" x:Name="head_Doku4"/>
<dxg:GridColumn FieldName="Notice5" AllowEditing="False" Header="Dokumentation5" Width="200" x:Name="head_Doku5"/>
<dxg:GridColumn FieldName="OnlyGoalString" AllowEditing="False" Header="Ziele" />
<dxg:GridColumn FieldName="MassnahmenString" AllowEditing="False" Header="Maßnahmen" />
<dxg:GridColumn FieldName="OnlyGoalString" AllowEditing="False" Header="Ziele" Visible="{Binding Path=PrototypeVM.IsGoalTreeVisible}"/>
<dxg:GridColumn FieldName="MassnahmenString" AllowEditing="False" Header="Maßnahmen" Visible="{Binding Path=PrototypeVM.IsGoalTreeVisible}"/>
<dxg:GridColumn FieldName="EmployeeName" AllowEditing="False" Header="Angelegt für" />
<dxg:GridColumn FieldName="InsUser" AllowEditing="False" Header="Angelegt von" x:Name="InsertedByColumn" />
<dxg:GridColumn FieldName="InsertedOnDateTime" AllowEditing="False" Header="Angelegt am" x:Name="InsertedOnColumn">

9
BeWo/ViewModel/ServiceRecordVM.cs
View File

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

2
BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
View File

@@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<ProjectView>ShowAllFiles</ProjectView>
<WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>

2
BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs
View File

@@ -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);

2
BeWoPlanerMobil/TestWebService.asmx.cs
View File

@@ -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);

2
Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs
View File

@@ -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;

2
Service/Plugins/PluginLoader.cs
View File

@@ -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.

2
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -2527,7 +2527,7 @@ namespace BeWo.Service.ServiceImplementations
if (sr.ServiceRecordType.HasValue && sr.ServiceRecordType.Value == ServiceRecordTypeId.Content)
{
dc.BackgroundColor = "#FF008EED";
dc.BackgroundColor = "#FF78BFFF";
}