diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/AdminMenu.cpp b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/AdminMenu.cpp index e9e0452..3b28e51 100644 --- a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/AdminMenu.cpp +++ b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/AdminMenu.cpp @@ -474,6 +474,7 @@ void AdminMenu::removeUser() auto listOfUsers = m_controller.getUsers(); auto listOfActiveUsers = filterActiveUsers(listOfUsers); int activeUserCount = listOfActiveUsers.getSize(); + std::cout << "Remove User \n"; if (activeUserCount < 1) { std::cout << "No Active users." << std::endl; diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/MenuHelper.h b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/MenuHelper.h index 09c4ecc..279c3b2 100644 --- a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/MenuHelper.h +++ b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/MenuHelper.h @@ -675,7 +675,7 @@ inline util::Map filterActiveUsers(const util::MapgetState() != util::State::INACTIVE) + if (user != nullptr && user->getState() != util::State::INACTIVE && user->getUserType() != util::UserType::ADMIN) { activeUsers.insert(user->getId(), user); }