Changed shared pointers to raw pointers in PayslipManagementService.h and PayslipManagementService.cpp
This commit is contained in:
@@ -27,11 +27,11 @@
|
|||||||
#include "Payroll.h"
|
#include "Payroll.h"
|
||||||
#include "Payslip.h"
|
#include "Payslip.h"
|
||||||
|
|
||||||
using employeeMap = std::map<std::string,Employee*>;
|
using employeeMap = std::map<std::string, Employee*>;
|
||||||
using payrollMap = std::map<std::string, std::shared_ptr<Payroll>>;
|
using payrollMap = std::map<std::string, Payroll*>;
|
||||||
using payslipMap = std::map<std::string, std::shared_ptr<Payslip>>;
|
using payslipMap = std::map<std::string, Payslip*>;
|
||||||
using logMap = std::map<util::Timestamp, Log*>;
|
using logMap = std::map<util::Timestamp, Log*>;
|
||||||
using candidateMap = std::map<std::string, std::shared_ptr<Candidate>>;
|
using candidateMap = std::map<std::string, Candidate*>;
|
||||||
|
|
||||||
class DataStore
|
class DataStore
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ void PayslipManagementService::generatePayslips()
|
|||||||
auto payroll = employee->getPayroll();
|
auto payroll = employee->getPayroll();
|
||||||
double salary;
|
double salary;
|
||||||
salary = payroll->getBasicSalary() + payroll->getFoodAllowance() + payroll->getHouseRentAllowance() - payroll->getEmployeePFContribution() - payroll->getEmployerPFContribution();
|
salary = payroll->getBasicSalary() + payroll->getFoodAllowance() + payroll->getHouseRentAllowance() - payroll->getEmployeePFContribution() - payroll->getEmployerPFContribution();
|
||||||
std::shared_ptr<Payslip> payslip = Factory::getObject<Payslip>(salary, employee->getId());
|
Payslip* payslip = Factory::getObject<Payslip>(salary, employee->getId());
|
||||||
employee->addPayslip(payslip);
|
employee->addPayslip(payslip);
|
||||||
payslips.emplace(payslip->getId(), payslip);
|
payslips.emplace(payslip->getId(), payslip);
|
||||||
}
|
}
|
||||||
@@ -93,7 +93,7 @@ void PayslipManagementService::savePayrolls()
|
|||||||
payrollFileManager.save(payrolls);
|
payrollFileManager.save(payrolls);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::pair<std::shared_ptr<Payroll>, std::shared_ptr<Payslip>> PayslipManagementService::getPayslipForMonth(const std::string& employeeId, int year, int month)
|
std::pair<Payroll*, Payslip*> PayslipManagementService::getPayslipForMonth(const std::string& employeeId, int year, int month)
|
||||||
{
|
{
|
||||||
auto& employees = m_dataStore.getEmployees();
|
auto& employees = m_dataStore.getEmployees();
|
||||||
auto employeeIterator = employees.find(employeeId);
|
auto employeeIterator = employees.find(employeeId);
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
#include<stdexcept>
|
#include<stdexcept>
|
||||||
#include"DataStore.h"
|
#include"DataStore.h"
|
||||||
|
|
||||||
using payslipMap = std::map<std::string, std::shared_ptr<Payslip>>;
|
using payslipMap = std::map<std::string, Payslip*>;
|
||||||
|
|
||||||
class PayslipManagementService
|
class PayslipManagementService
|
||||||
{
|
{
|
||||||
@@ -19,7 +19,7 @@ public:
|
|||||||
PayslipManagementService() : m_dataStore(DataStore::getInstance()) {};
|
PayslipManagementService() : m_dataStore(DataStore::getInstance()) {};
|
||||||
void updateSalary(const std::string&, double, double, double, double, double);
|
void updateSalary(const std::string&, double, double, double, double, double);
|
||||||
void generatePayslips();
|
void generatePayslips();
|
||||||
std::pair<std::shared_ptr<Payroll>, std::shared_ptr<Payslip>>getPayslipForMonth(const std::string&, int, int);
|
std::pair<Payroll*, Payslip*>getPayslipForMonth(const std::string&, int, int);
|
||||||
void loadPayrolls();
|
void loadPayrolls();
|
||||||
void savePayrolls();
|
void savePayrolls();
|
||||||
void loadPayslips();
|
void loadPayslips();
|
||||||
|
|||||||
Reference in New Issue
Block a user