diff --git a/Borepin/Borepin/App.xaml.cs b/Borepin/Borepin/App.xaml.cs index 9ae10de..a0e9e50 100644 --- a/Borepin/Borepin/App.xaml.cs +++ b/Borepin/Borepin/App.xaml.cs @@ -3,6 +3,7 @@ using Prism.Ioc; using Borepin.PageModel; using Borepin.Page; using Xamarin.Forms; +using Borepin.Service; namespace Borepin { @@ -32,6 +33,9 @@ namespace Borepin containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); + + // Use Admin as Default + containerRegistry.RegisterInstance(typeof(BFFHInterface), BFFHService.Auth(BFFHService.AdminID)); } } } diff --git a/Borepin/Borepin/Borepin.csproj b/Borepin/Borepin/Borepin.csproj index 3467af8..fbc0d73 100644 --- a/Borepin/Borepin/Borepin.csproj +++ b/Borepin/Borepin/Borepin.csproj @@ -73,6 +73,5 @@ - \ No newline at end of file diff --git a/Borepin/Borepin/Model/Machine.cs b/Borepin/Borepin/Model/Machine.cs index 9860bc3..b4d048f 100644 --- a/Borepin/Borepin/Model/Machine.cs +++ b/Borepin/Borepin/Model/Machine.cs @@ -2,6 +2,16 @@ namespace Borepin.Model { + public enum MachineStates + { + Free, + InUse, + ToCheck, + Blocked, + Disabled, + Reserved + } + public class Machine : BindableBase { private string _ID; @@ -11,8 +21,8 @@ namespace Borepin.Model set => SetProperty(ref _ID, value); } - private string _State; - public string State + private MachineStates _State; + public MachineStates State { get => _State; set => SetProperty(ref _State, value); @@ -25,11 +35,20 @@ namespace Borepin.Model set => SetProperty(ref _Description, value); } - private string _User; - public string User + private User _User; + public User User { get => _User; set => SetProperty(ref _User, value); } } + + public class User + { + public string ID { get; set; } + + public string Name { get; set; } + + public string OriginalWorkshop { get; set; } + } } diff --git a/Borepin/Borepin/Page/MachinePage.xaml b/Borepin/Borepin/Page/MachinePage.xaml index fd6a1c2..78a5d2b 100644 --- a/Borepin/Borepin/Page/MachinePage.xaml +++ b/Borepin/Borepin/Page/MachinePage.xaml @@ -1,18 +1,24 @@  + x:Class="Borepin.Page.MachinePage" + Title="{Binding Machine.ID}"> -