diff --git a/Borepin/Borepin/App.xaml.cs b/Borepin/Borepin/App.xaml.cs index 28165b3..177c56b 100644 --- a/Borepin/Borepin/App.xaml.cs +++ b/Borepin/Borepin/App.xaml.cs @@ -47,7 +47,8 @@ namespace Borepin containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); - containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterForNavigation("ScanPage"); + containerRegistry.RegisterForNavigation("ScanURNPage"); #endregion #region Register Sequence Navigation diff --git a/Borepin/Borepin/Model/MachineVisualize.cs b/Borepin/Borepin/Model/MachineVisualize.cs index baeaa71..0b4442c 100644 --- a/Borepin/Borepin/Model/MachineVisualize.cs +++ b/Borepin/Borepin/Model/MachineVisualize.cs @@ -38,7 +38,7 @@ namespace Borepin.Model Manager = null; } - if(_Machine.Manage != null) + if(!((ManageInterface_Proxy)_Machine.Manage).IsNull) { MachineInfoExtended machineInfoExtended = await _Machine.Manage.GetMachineInfoExtended().ConfigureAwait(false); if (machineInfoExtended.CurrentUser.Just == null) @@ -51,7 +51,7 @@ namespace Borepin.Model CurrentUser.LoadData(); } - if (machineInfoExtended.LastUser.Just == null) + if (machineInfoExtended.LastUser .Just== null) { LastUser = null; } @@ -68,11 +68,11 @@ namespace Borepin.Model } 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; + 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; } #endregion diff --git a/Borepin/Borepin/Page/MachineListPage.xaml b/Borepin/Borepin/Page/MachineListPage.xaml index 4465ae9..a7842a8 100644 --- a/Borepin/Borepin/Page/MachineListPage.xaml +++ b/Borepin/Borepin/Page/MachineListPage.xaml @@ -24,7 +24,7 @@ diff --git a/Borepin/Borepin/Page/ScanPage.xaml b/Borepin/Borepin/Page/ScanPage.xaml index a42564e..0bce7f6 100644 --- a/Borepin/Borepin/Page/ScanPage.xaml +++ b/Borepin/Borepin/Page/ScanPage.xaml @@ -5,7 +5,7 @@ x:Class="Borepin.Page.ScanPage"> - +