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

Fix Create Service Submenu

Browse Source 
- Added heading "Create Service" to submenu for clearer user guidance.
- Ensured console clears before service creation for consistent UI behavior.
- Filtered active inventory items before selection to avoid showing inactive items.
- Updated prompts with improved formatting and spacing (e.g., labour cost input, success message).
- Refactored selectInventoryItems:
  - Added "Select Required Items" heading for clarity.
  - Skipped null or inactive items during listing.
  - Improved empty inventory message ("No Items Present, Inventory empty").
  - Enhanced success and error messages with consistent line breaks.
  - Simplified logic for item selection and exit handling.

Fixes #1747
This commit is contained in:
Jissin Mathew
2026-05-26 16:29:03 +05:30
committed by Joel Thomas
parent 3b82648e45
commit 05499e4890
2 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/AdminMenu.cpp
+5 -3
View File
@@ -386,17 +386,19 @@ Returns:
void AdminMenu::createService() void AdminMenu::createService()
{ {
util::clear(); util::clear();
std::cout << "Create Service\n";
std::string serviceName; std::string serviceName;
double labourCost; double labourCost;
std::cout << "Enter the service name: "; std::cout << "Enter the service name: ";
util::read(serviceName); util::read(serviceName);
util::Map<std::string, const InventoryItem*> currentInventoryItems = m_controller.getInventoryItems(); util::Map<std::string, const InventoryItem*> currentInventoryItems = m_controller.getInventoryItems();
util::Map<std::string, const InventoryItem*> activeInventoryItems = filterActiveItems(currentInventoryItems);
util::Vector<std::string> selectedInventoryItems; util::Vector<std::string> selectedInventoryItems;
selectInventoryItems(currentInventoryItems,selectedInventoryItems); selectInventoryItems(activeInventoryItems,selectedInventoryItems);
std::cout << "Enter the labour cost: "; std::cout << "\nEnter the labour cost: ";
util::read(labourCost); util::read(labourCost);
m_controller.createService(serviceName, selectedInventoryItems, labourCost); m_controller.createService(serviceName, selectedInventoryItems, labourCost);
std::cout << "Service created sucessfully.\n"; std::cout << "\nService created sucessfully.\n\n";
util::pressEnter(); util::pressEnter();
} }
Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/MenuHelper.h
+9 -11
View File
@@ -93,16 +93,17 @@ Returns:
*/ */
inline void selectInventoryItems(util::Map<std::string, const InventoryItem*>& currentInventoryItems, util::Vector<std::string>& selectedInventoryItems) inline void selectInventoryItems(util::Map<std::string, const InventoryItem*>& currentInventoryItems, util::Vector<std::string>& selectedInventoryItems)
{ {
bool doRun = true, hasInventoryItems = false; bool doRun = true;
util::Map<int, const InventoryItem*> currentInventoryMap; util::Map<int, const InventoryItem*> currentInventoryMap;
int currentIndex = 1;
int choice; int choice;
if (currentInventoryItems.getSize() == 0) if (currentInventoryItems.getSize() == 0)
{ {
std::cout << "Inventory empty."; std::cout << "No Items Present, Inventory empty.\n";
return;
} }
while (doRun) while (doRun)
{ {
std::cout << "\nSelect Required Items\n";
bool hasInventoryItems = false; bool hasInventoryItems = false;
int currentIndex = 1; int currentIndex = 1;
currentInventoryMap.clear(); currentInventoryMap.clear();
@@ -116,7 +117,7 @@ inline void selectInventoryItems(util::Map<std::string, const InventoryItem*>& c
for (int iterator = 0; iterator < currentInventoryItems.getSize(); iterator++) for (int iterator = 0; iterator < currentInventoryItems.getSize(); iterator++)
{ {
const InventoryItem* currentInventoryItem = currentInventoryItems.getValueAt(iterator); const InventoryItem* currentInventoryItem = currentInventoryItems.getValueAt(iterator);
if (currentInventoryItem->getState() == util::State::INACTIVE) if (currentInventoryItem == nullptr || currentInventoryItem->getState() == util::State::INACTIVE)
{ {
continue; continue;
} }
@@ -127,14 +128,11 @@ inline void selectInventoryItems(util::Map<std::string, const InventoryItem*>& c
<< std::setw(10) << currentInventoryItem->getPrice() << std::setw(10) << currentInventoryItem->getPrice()
<< std::setw(10) << currentInventoryItem->getQuantity() << std::setw(10) << currentInventoryItem->getQuantity()
<< std::endl; << std::endl;
hasInventoryItems = true;
currentInventoryMap.insert(currentIndex++, currentInventoryItem); currentInventoryMap.insert(currentIndex++, currentInventoryItem);
hasInventoryItems = true;
} }
if (!hasInventoryItems) if (!hasInventoryItems)
{ {
std::cout << "No items present in the inventory." << std::endl;
doRun = false;
break; break;
} }
std::cout << "Select the item (Index) or enter -1 to exit: "; std::cout << "Select the item (Index) or enter -1 to exit: ";
@@ -146,12 +144,12 @@ inline void selectInventoryItems(util::Map<std::string, const InventoryItem*>& c
} }
else if (currentInventoryMap.find(choice) != -1) else if (currentInventoryMap.find(choice) != -1)
{ {
selectedInventoryItems.push_back(currentInventoryMap.getValueAt(choice)->getId()); selectedInventoryItems.push_back(currentInventoryMap.getValueAt(currentInventoryMap.find(choice))->getId());
std::cout << "Item added successfully." << std::endl; std::cout << "Item added successfully.\n" << std::endl;
} }
else else
{ {
std::cout << "Enter a valid integer." << std::endl; std::cout << "Enter a valid integer.\n" << std::endl;
} }
} }
} }