From bda6c0be3799ea68ef38e0f6fdbb5d1f62855194 Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Wed, 9 Mar 2022 16:02:40 +0100 Subject: [PATCH] Fixed: InfosExtended to ManageInterface && Added: Machine totakeover state --- machine.capnp | 7 ++++--- user.capnp | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/machine.capnp b/machine.capnp index 38254fe..aa39c35 100644 --- a/machine.capnp +++ b/machine.capnp @@ -18,10 +18,11 @@ struct Machine { blocked @3; disabled @4; reserved @5; + totakeover @6; } struct MachineInfoExtended { currentUser @0 :User; - transferUser @1 :User; + lastUser @1 :User; } struct Reservation { @@ -42,8 +43,6 @@ struct Machine { info @6 :Info; interface Info $CSharp.name("InfoInterface") { - getMachineInfoExtended @0 () -> ( machineInfoExtended :MachineInfoExtended, dummy :UInt8 = 0); - getPropertyList @1 () -> ( propertyList :List(General.KeyValuePair) ); getReservationList @2 () -> ( reservationList :List(Reservation) ); @@ -77,6 +76,8 @@ struct Machine { manage @11 :Manage; interface Manage $CSharp.name("ManageInterface") { + getMachineInfoExtended @0 () -> ( machineInfoExtended :MachineInfoExtended, dummy :UInt8 = 0); + setProperty @0 (property :General.KeyValuePair); removeProperty @1 (property :General.KeyValuePair); diff --git a/user.capnp b/user.capnp index 180efee..357e1c3 100644 --- a/user.capnp +++ b/user.capnp @@ -24,7 +24,6 @@ struct User info @3 :Info; interface Info $CSharp.name("InfoInterface") { - getUserInfoExtended @0 () -> ( userInfoExtended :UserInfoExtended ); listRoles @1 () -> ( roles :List(Role) ); } @@ -35,6 +34,8 @@ struct User admin @5 :Admin; interface Admin $CSharp.name("AdminInterface") { + getUserInfoExtended @0 () -> ( userInfoExtended :UserInfoExtended ); + addRole @0 ( role :Role ) -> (); removeRole @1 ( role :Role ) -> ();