From daf33e1aab82479bb72b2fd4d15f51eff0f6a4dc Mon Sep 17 00:00:00 2001
From: Princy Jerin <princy.jerin@trenser.com>
Date: Wed, 8 Apr 2026 10:29:06 +0530
Subject: [PATCH] Implement Review Fixes

<UserStory> EMP002 : Deactivate Employee </UserStory>

<Changes>
- Updated employee listing to display in a tabular format with headers
- Renamed helper function from listActiveEmployees to listEmployees
- Updated error messages
- Removed blank spaces
</Changes>

<Review>
Smitha Mohan
</Review>
---
 .../Trenser.Zenvy/views/HRManagerMenu.cpp     | 65 +++++++++----------
 .../Trenser.Zenvy/views/MenuHelper.h          | 25 +++----
 2 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/Trenser.Zenvy/Trenser.Zenvy/views/HRManagerMenu.cpp b/Trenser.Zenvy/Trenser.Zenvy/views/HRManagerMenu.cpp
index 7fd76cc..8d51e73 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/views/HRManagerMenu.cpp
+++ b/Trenser.Zenvy/Trenser.Zenvy/views/HRManagerMenu.cpp
@@ -1,4 +1,3 @@
-
 #include <iostream>
 #include "HRManagerMenu.h"
 #include "InputHelper.h"
@@ -111,39 +110,39 @@ bool HRManagerMenu::handleOperation(int choice)
 {
 	switch (choice)
 	{
-	//case 1:
-	//	m_zenvyController.applyLeave();
-	//	break;
-	//case 2:
-	//	m_zenvyController.viewPayslip();
-	//	break;
-	//case 3:
-	//	m_zenvyController.viewPayslipHistory();
-	//	break;
-	//case 4:
-	//	m_zenvyController.viewEmployees();
-	//	break;
-	//case 5:
-	//	m_zenvyController.searchEmployee();
-	//	break;
-	//case 6:
-	//	m_zenvyController.viewNotifications();
-	//	break;
-	//case 7:
-	//	m_zenvyController.viewAnnouncements();
-	//	break;
-	case 8:
-		createEmployee(m_zenvyController);
+	/*case 1:
+		m_zenvyController.applyLeave();
 		break;
-	//case 9:
-	//	m_zenvyController.regularizeAttenance();
-	//	break;
-	//case 10:
-	//	m_zenvyController.updateLeaveRequest();
-	//	break;
-	//case 11:
-	//	m_zenvyController.registercandidateAsEmployee();
-	//	break;
+	case 2:
+		m_zenvyController.viewPayslip();
+		break;
+	case 3:
+		m_zenvyController.viewPayslipHistory();
+		break;
+	case 4:
+		m_zenvyController.viewEmployees();
+		break;
+	case 5:
+		m_zenvyController.searchEmployee();
+		break;
+	case 6:
+		m_zenvyController.viewNotifications();
+		break;
+	case 7:
+		m_zenvyController.viewAnnouncements();
+		break;
+	case 8:
+		m_zenvyController.createEmployee();
+		break;
+	case 9:
+		m_zenvyController.regularizeAttenance();
+		break;
+	case 10:
+		m_zenvyController.updateLeaveRequest();
+		break;
+	case 11:
+		m_zenvyController.registercandidateAsEmployee();
+		break;*/
 	case 12:
 		updateProfile(m_zenvyController);
 		break;
diff --git a/Trenser.Zenvy/Trenser.Zenvy/views/MenuHelper.h b/Trenser.Zenvy/Trenser.Zenvy/views/MenuHelper.h
index 502b9c2..6df1fce 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/views/MenuHelper.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/views/MenuHelper.h
@@ -8,7 +8,7 @@
 #include "ZenvyController.h"
 #include "MenuHelper.h" 
 #include "InputHelper.h"
-#include"OutputHelper.h"
+#include "OutputHelper.h"
 
 inline void updateProfile(std::shared_ptr<ZenvyController> m_zenvyController)
 {
@@ -49,20 +49,22 @@ inline void updateProfile(std::shared_ptr<ZenvyController> m_zenvyController)
 }
 
 
-inline std::map<int, std::shared_ptr<const Employee>> listActiveEmployees(const std::shared_ptr<ZenvyController>& controller)
+inline std::map<int, std::shared_ptr<const Employee>> listEmployees(const std::shared_ptr<ZenvyController>& controller)
 {
     auto employees = controller->getEmployees();
     std::map<int, std::shared_ptr<const Employee>> employeeList;
+    std::cout << std::left
+        << std::setw(5) << "Index"
+        << std::setw(15) << "ID"
+        << std::setw(25) << "Name"
+        << "\n";
     int index = 1;
-    std::cout << "Active Employees:\n";
     for (auto& activeEmployees : employees)
     {
-        std::cout << std::setw(3) << index << ". "
-            << std::setw(10) << "ID: "
-            << std::setw(10) << activeEmployees->getEmployeeId()
-            << " | "
-            << std::setw(10) << "Name: "
-            << std::setw(20) << activeEmployees->getEmployeeName()
+        std::cout << std::left
+            << std::setw(5) << index
+            << std::setw(15) << activeEmployees->getEmployeeId()
+            << std::setw(25) << activeEmployees->getEmployeeName()
             << "\n";
         employeeList[index] = activeEmployees;
         ++index;
@@ -76,12 +78,13 @@ inline std::map<int, std::shared_ptr<const Employee>> listActiveEmployees(const
 
 void deactivateEmployee(const std::shared_ptr<ZenvyController>& controller)
 {
-    auto employeeList = listActiveEmployees(controller);
+    auto employeeList = listEmployees(controller);
     if (employeeList.empty())
     {
         return;
     }
     int choice;
+    util::clear();
     std::cout << "\nEnter the index of the employee to deactivate: ";
     util::read(choice);
     auto iterator = employeeList.find(choice);
@@ -100,6 +103,6 @@ void deactivateEmployee(const std::shared_ptr<ZenvyController>& controller)
     }
     else
     {
-        std::cout << "Invalid selection.\n";
+        std::cout << "Invalid index.\n";
     }
 }