From 89660160cfd6a1ccc9ee0522d6cd2af92158451a Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Mon, 20 Sep 2021 00:29:51 +0200 Subject: [PATCH] Added StartUpDistributerPage --- Borepin/Borepin/App.xaml.cs | 6 ++- Borepin/Borepin/Model/MachineVisualize.cs | 6 +-- Borepin/Borepin/Model/SpaceVisualize.cs | 4 +- Borepin/Borepin/Model/UserVisualize.cs | 6 +-- Borepin/Borepin/Page/MachinePage.xaml | 5 ++- .../PageModel/StartUpDistributorPageModel.cs | 41 ++++++++++++++++++- .../ViewModel/MachineListItemViewModel.cs | 31 +++++++++----- .../ViewModel/ServerListItemViewModel.cs | 31 +++++--------- 8 files changed, 86 insertions(+), 44 deletions(-) diff --git a/Borepin/Borepin/App.xaml.cs b/Borepin/Borepin/App.xaml.cs index 6368efa..09f5c74 100644 --- a/Borepin/Borepin/App.xaml.cs +++ b/Borepin/Borepin/App.xaml.cs @@ -26,7 +26,7 @@ namespace Borepin { InitializeComponent(); - Prism.Navigation.INavigationResult result = await NavigationService.NavigateAsync("/MainPage/NavigationPage/SetUpProcess_WelcomePage"); + Prism.Navigation.INavigationResult result = await NavigationService.NavigateAsync("/MainPage/NavigationPage/StartUpDistributorPage"); if (!result.Success) { System.Diagnostics.Debugger.Break(); @@ -36,6 +36,8 @@ namespace Borepin protected override void RegisterTypes(IContainerRegistry containerRegistry) { // Register Navigation + containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); @@ -44,7 +46,6 @@ namespace Borepin containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); - containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation("SetUpProcess_WelcomePage"); containerRegistry.RegisterForNavigation("SetUpProcess_ScanPage"); @@ -53,6 +54,7 @@ namespace Borepin containerRegistry.RegisterForNavigation("AddServerProcess_HostSelectPage"); containerRegistry.RegisterForNavigation("AddServerProcess_LoginChoosePage"); + //containerRegistry.RegisterForNavigation(); // Register Dialog containerRegistry.RegisterDialog(); diff --git a/Borepin/Borepin/Model/MachineVisualize.cs b/Borepin/Borepin/Model/MachineVisualize.cs index e9f6138..ef37065 100644 --- a/Borepin/Borepin/Model/MachineVisualize.cs +++ b/Borepin/Borepin/Model/MachineVisualize.cs @@ -7,7 +7,7 @@ namespace Borepin.Model public class MachineVisualize : BindableBase { #region Private Properties - public Machine _Machine { get; private set; } + public readonly Machine _Machine; #endregion #region Constructors @@ -22,8 +22,8 @@ namespace Borepin.Model #region Methods public void LoadData() { - ID = _Machine.Id; - Space = new SpaceVisualize(_Machine.Space); + //ID = _Machine.Id; + //Space = new SpaceVisualize(_Machine.Space); Name = _Machine.Name; Description = _Machine.Description; State = _Machine.State; diff --git a/Borepin/Borepin/Model/SpaceVisualize.cs b/Borepin/Borepin/Model/SpaceVisualize.cs index 495f916..54f7547 100644 --- a/Borepin/Borepin/Model/SpaceVisualize.cs +++ b/Borepin/Borepin/Model/SpaceVisualize.cs @@ -6,7 +6,7 @@ namespace Borepin.Model public class SpaceVisualize : BindableBase { #region Private Properties - public Space _Space { get; private set; } + public readonly Space _Space; #endregion #region Constructors @@ -20,7 +20,7 @@ namespace Borepin.Model #region LoadData public void LoadData() { - ID = _Space.Id; + //ID = _Space.Id; Name = _Space.Name; Info = _Space.Info; } diff --git a/Borepin/Borepin/Model/UserVisualize.cs b/Borepin/Borepin/Model/UserVisualize.cs index 62a1ed4..d0eaa9a 100644 --- a/Borepin/Borepin/Model/UserVisualize.cs +++ b/Borepin/Borepin/Model/UserVisualize.cs @@ -6,7 +6,7 @@ namespace Borepin.Model public class UserVisualize : BindableBase { #region Private Properties - public User _User { get; private set; } + public readonly User _User; #endregion #region Contructors @@ -20,9 +20,9 @@ namespace Borepin.Model #region LoadData public void LoadData() { - ID = _User.Id; + //ID = _User.Id; Username = _User.Username; - Space = new SpaceVisualize(_User.Space); + //Space = new SpaceVisualize(_User.Space); } #endregion diff --git a/Borepin/Borepin/Page/MachinePage.xaml b/Borepin/Borepin/Page/MachinePage.xaml index 07b3c88..c4a8201 100644 --- a/Borepin/Borepin/Page/MachinePage.xaml +++ b/Borepin/Borepin/Page/MachinePage.xaml @@ -4,11 +4,12 @@ x:Class="Borepin.Page.MachinePage" xmlns:converters="clr-namespace:Borepin.Converter"> - + @@ -19,7 +20,7 @@ -