From f1ca8c2a586159513919fcd284950a296e7d09d4 Mon Sep 17 00:00:00 2001
From: Avinash Rajesh <avinash.rajesh@trenser.com>
Date: Tue, 26 May 2026 16:35:17 +0530
Subject: [PATCH] Fix Remove User Issue

- 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
---
 .../Trenser.VehicleServiceSystem/views/AdminMenu.cpp            | 1 +
 .../Trenser.VehicleServiceSystem/views/MenuHelper.h             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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<std::string, const User*> filterActiveUsers(const util::Map<std
     for (int index = 0; index < inventorySize; 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);
         }