Merge branch 'feature-admin-management-adm007' into feature-admin-management
This commit is contained in:
+13
-1
@@ -1,4 +1,5 @@
|
||||
#include "Controller.h"
|
||||
#include "ComboPackage.h"
|
||||
#include "User.h"
|
||||
|
||||
bool Controller::login(const std::string& username, const std::string& password)
|
||||
@@ -41,7 +42,17 @@ util::Map<std::string, const Service*> Controller::getServices()
|
||||
|
||||
util::Map<std::string, const ComboPackage*> Controller::getComboPackages()
|
||||
{
|
||||
return util::Map<std::string, const ComboPackage*>();
|
||||
util::Map<std::string, ComboPackage*> currentAvailableComboPackages = m_serviceManagementService.getComboPackages();
|
||||
util::Map<std::string, const ComboPackage*> readOnlyComboPackages;
|
||||
for (int iterator = 0; iterator < currentAvailableComboPackages.getSize(); iterator++)
|
||||
{
|
||||
ComboPackage* currentComboPackage = currentAvailableComboPackages.getValueAt(iterator);
|
||||
if (currentComboPackage)
|
||||
{
|
||||
readOnlyComboPackages.insert(currentComboPackage->getId(), currentComboPackage);
|
||||
}
|
||||
}
|
||||
return readOnlyComboPackages;
|
||||
}
|
||||
|
||||
void Controller::purchaseService(const util::Vector<std::string>& serviceIDs, const std::string& vehicleNumber, const std::string& vehicleBrand, const std::string& vehicleModel)
|
||||
@@ -136,6 +147,7 @@ void Controller::createComboPackage(const std::string& name, const util::Vector<
|
||||
|
||||
void Controller::removeComboPackage(const std::string& comboPackageID)
|
||||
{
|
||||
m_serviceManagementService.removeComboPackage(comboPackageID);
|
||||
}
|
||||
|
||||
util::Map<std::string, const Invoice*> Controller::getInvoicesByUser()
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
#include "Map.h"
|
||||
#include <string>
|
||||
#include "Map.h"
|
||||
#include "Enums.h"
|
||||
#include "UserManagementService.h"
|
||||
#include "ServiceManagementService.h"
|
||||
|
||||
+25
@@ -161,3 +161,28 @@ void ServiceManagementService::createComboPackage(const std::string& packageName
|
||||
ComboPackage* newComboPackage = Factory::getObject<ComboPackage>(packageName, discountPercentage, selectedServices);
|
||||
comboPackageMap.insert(newComboPackage->getId(), newComboPackage);
|
||||
}
|
||||
|
||||
util::Map<std::string, ComboPackage*> ServiceManagementService::getComboPackages()
|
||||
{
|
||||
return m_dataStore.getComboPackages();
|
||||
}
|
||||
|
||||
void ServiceManagementService::removeComboPackage(const std::string& comboPackageID)
|
||||
{
|
||||
bool removed = false;
|
||||
util::Map<std::string, ComboPackage*>& currentComboPackages = m_dataStore.getComboPackages();
|
||||
for (int iterator = 0; iterator < currentComboPackages.getSize(); iterator++)
|
||||
{
|
||||
ComboPackage* currentComboPackage = currentComboPackages.getValueAt(iterator);
|
||||
if (currentComboPackage && currentComboPackage->getId() == comboPackageID)
|
||||
{
|
||||
currentComboPackage->setState(util::State::INACTIVE);
|
||||
removed = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!removed)
|
||||
{
|
||||
throw std::runtime_error("Combo package with ID '" + comboPackageID + "' not found.");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#include <iostream>
|
||||
#include <iomanip>
|
||||
#include "AdminMenu.h"
|
||||
#include "InputHelper.h"
|
||||
@@ -6,6 +7,8 @@
|
||||
#include "Validator.h"
|
||||
#include "Service.h"
|
||||
#include "Utility.h"
|
||||
#include "ComboPackage.h"
|
||||
#include "Enums.h"
|
||||
|
||||
void AdminMenu::showMenu()
|
||||
{
|
||||
@@ -279,8 +282,84 @@ void AdminMenu::createComboPackages()
|
||||
util::pressEnter();
|
||||
}
|
||||
|
||||
static void displayComboPackagesWithIndex(util::Map<int, const ComboPackage*>& currentComboPackageIndexMap)
|
||||
{
|
||||
for (int iterator = 0; iterator < currentComboPackageIndexMap.getSize(); iterator++)
|
||||
{
|
||||
const ComboPackage* currentComboPackage = currentComboPackageIndexMap.getValueAt(iterator);
|
||||
if (currentComboPackage == nullptr)
|
||||
{
|
||||
throw std::runtime_error("Error accessing the combopackage.\n");
|
||||
}
|
||||
if (iterator == 0)
|
||||
{
|
||||
std::cout << std::left
|
||||
<< std::setw(8) << "Index"
|
||||
<< std::setw(10) << "ID"
|
||||
<< std::setw(20) << "Package Name"
|
||||
<< std::setw(15) << "Discount (%)"
|
||||
<< "\n";
|
||||
}
|
||||
std::cout << std::left
|
||||
<< std::setw(8) << currentComboPackageIndexMap.getKeyAt(iterator)
|
||||
<< std::setw(10) << currentComboPackage->getId()
|
||||
<< std::setw(20) << currentComboPackage->getPackageName()
|
||||
<< std::setw(15) << currentComboPackage->getDiscountPercentage()
|
||||
<< "\n";
|
||||
}
|
||||
}
|
||||
|
||||
static std::string selectComboPackage(util::Map<std::string, const ComboPackage*>& currentComboPackages)
|
||||
{
|
||||
util::Map<int, const ComboPackage*> currentComboPackageIndexMap;
|
||||
if (currentComboPackages.getSize() == 0)
|
||||
{
|
||||
throw std::runtime_error("No combo packages are available.\n");
|
||||
}
|
||||
int currentIndex = 1, choice, selectedIndex;
|
||||
for (int iterator = 0; iterator < currentComboPackages.getSize(); iterator++)
|
||||
{
|
||||
if (currentComboPackages.getValueAt(iterator)->getState() == util::State::INACTIVE)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
currentComboPackageIndexMap.insert(currentIndex++, currentComboPackages.getValueAt(iterator));
|
||||
}
|
||||
if (currentComboPackageIndexMap.getSize() == 0)
|
||||
{
|
||||
throw std::runtime_error("No combo packages currently active.");
|
||||
}
|
||||
displayComboPackagesWithIndex(currentComboPackageIndexMap);
|
||||
std::cout << "Enter your choice(Index): ";
|
||||
util::read(choice);
|
||||
selectedIndex = currentComboPackageIndexMap.find(choice);
|
||||
if (selectedIndex != -1)
|
||||
{
|
||||
std::string selectedComboPackageID = currentComboPackageIndexMap.getValueAt(selectedIndex)->getId();
|
||||
return selectedComboPackageID;
|
||||
}
|
||||
else
|
||||
{
|
||||
std::cout << "Enter a valid choice.\n";
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
void AdminMenu::removeComboPackage()
|
||||
{
|
||||
util::clear();
|
||||
util::Map<std::string, const ComboPackage*> currentComboPackages = m_controller.getComboPackages();
|
||||
std::string selectedComboPackageID = selectComboPackage(currentComboPackages);
|
||||
if (selectedComboPackageID != "")
|
||||
{
|
||||
m_controller.removeComboPackage(selectedComboPackageID);
|
||||
std::cout << "Combo Package removed successfully.\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
std::cout << "Combo package removal failed.\n";
|
||||
}
|
||||
util::pressEnter();
|
||||
}
|
||||
|
||||
void AdminMenu::viewNotifications()
|
||||
|
||||
Reference in New Issue
Block a user