From 5392185ece56d081ab3cfdb2f065b7c8b50a354e Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Wed, 20 Apr 2022 17:38:43 +0200 Subject: [PATCH] Fixed get user from manage interface to visualize --- Borepin/Borepin/Model/MachineVisualize.cs | 60 ++++++++++++----------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/Borepin/Borepin/Model/MachineVisualize.cs b/Borepin/Borepin/Model/MachineVisualize.cs index c1011ab..17ccb06 100644 --- a/Borepin/Borepin/Model/MachineVisualize.cs +++ b/Borepin/Borepin/Model/MachineVisualize.cs @@ -30,41 +30,43 @@ namespace Borepin.Model Manager = new UserVisualize(_Machine.Manager); Manager.LoadData(); - MachineInfoExtended machineInfoExtended = await _Machine.Manage.GetMachineInfoExtended().ConfigureAwait(false); - if(machineInfoExtended != null) - { - if (machineInfoExtended.CurrentUser == null || machineInfoExtended.CurrentUser.Username == null) - { - CurrentUser = null; - } - else - { - CurrentUser = new UserVisualize(machineInfoExtended.CurrentUser); - CurrentUser.LoadData(); - } - - if (machineInfoExtended.LastUser == null || machineInfoExtended.LastUser.Username == null) - { - LastUser = null; - } - else - { - LastUser = new UserVisualize(machineInfoExtended.LastUser); - LastUser.LoadData(); - } - } - else - { - CurrentUser = null; - LastUser = null; - } - CanUse = !((UseInterface_Proxy)_Machine.Use).IsNull; CanInUse = !((InUseInterface_Proxy) _Machine.Inuse).IsNull; CanTakeOver = !((TakeoverInterface_Proxy) _Machine.Takeover).IsNull; CanCheck = !((CheckInterface_Proxy) _Machine.Check).IsNull; CanManage = !((ManageInterface_Proxy) _Machine.Manage).IsNull; CanAdmin = !((AdminInterface_Proxy) _Machine.Admin).IsNull; + + CurrentUser = null; + LastUser = null; + + if (CanManage) + { + MachineInfoExtended machineInfoExtended = await _Machine.Manage.GetMachineInfoExtended().ConfigureAwait(false); + if (machineInfoExtended != null) + { + + if (machineInfoExtended.CurrentUser == null || machineInfoExtended.CurrentUser.Username == null) + { + CurrentUser = null; + } + else + { + CurrentUser = new UserVisualize(machineInfoExtended.CurrentUser); + CurrentUser.LoadData(); + } + + if (machineInfoExtended.LastUser == null || machineInfoExtended.LastUser.Username == null) + { + LastUser = null; + } + else + { + LastUser = new UserVisualize(machineInfoExtended.LastUser); + LastUser.LoadData(); + } + } + } } #endregion