joelthomastrenser/Training-VehicleService-May26
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix Remove User Issue

Browse Source 
- Added "Remove User" header in AdminMenu::removeUser for clarity.
- Updated filterActiveUsers in MenuHelper.h to exclude ADMIN users from the active user list.

Fixes #1742
This commit is contained in:
Avinash Rajesh
2026-05-26 16:35:17 +05:30
committed by Joel Thomas
parent d55bbb6349
commit f1ca8c2a58
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/AdminMenu.cpp
+1
View File
@@ -474,6 +474,7 @@ void AdminMenu::removeUser()
auto listOfUsers = m_controller.getUsers(); auto listOfUsers = m_controller.getUsers();
auto listOfActiveUsers = filterActiveUsers(listOfUsers); auto listOfActiveUsers = filterActiveUsers(listOfUsers);
int activeUserCount = listOfActiveUsers.getSize(); int activeUserCount = listOfActiveUsers.getSize();
std::cout << "Remove User \n";
if (activeUserCount < 1) if (activeUserCount < 1)
{ {
std::cout << "No Active users." << std::endl; std::cout << "No Active users." << std::endl;
Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/MenuHelper.h
+1 -1
View File
@@ -675,7 +675,7 @@ inline util::Map<std::string, const User*> filterActiveUsers(const util::Map<std
for (int index = 0; index < inventorySize; index++) for (int index = 0; index < inventorySize; index++)
{ {
const User* user = listOfUsers.getValueAt(index); const User* user = listOfUsers.getValueAt(index);
if (user != nullptr && user->getState() != util::State::INACTIVE) if (user != nullptr && user->getState() != util::State::INACTIVE && user->getUserType() != util::UserType::ADMIN)
{ {
activeUsers.insert(user->getId(), user); activeUsers.insert(user->getId(), user);
} }