From 47ca953eacc0a227d227342cef9d4a8bb0b0c636 Mon Sep 17 00:00:00 2001 From: Princy Jerin Date: Thu, 16 Apr 2026 12:07:47 +0530 Subject: [PATCH] Implement Review Fixes --- .../Trenser.Zenvy/controllers/ZenvyController.cpp | 9 +++------ .../Trenser.Zenvy/controllers/ZenvyController.h | 3 +-- .../services/PayslipManagementService.cpp | 9 ++++----- .../services/PayslipManagementService.h | 5 ++--- .../Trenser.Zenvy/utilities/Timestamp.cpp | 15 --------------- Trenser.Zenvy/Trenser.Zenvy/utilities/Timestamp.h | 3 --- Trenser.Zenvy/Trenser.Zenvy/views/MenuHelper.h | 6 ++---- 7 files changed, 12 insertions(+), 38 deletions(-) diff --git a/Trenser.Zenvy/Trenser.Zenvy/controllers/ZenvyController.cpp b/Trenser.Zenvy/Trenser.Zenvy/controllers/ZenvyController.cpp index bbf0272..9207108 100644 --- a/Trenser.Zenvy/Trenser.Zenvy/controllers/ZenvyController.cpp +++ b/Trenser.Zenvy/Trenser.Zenvy/controllers/ZenvyController.cpp @@ -77,10 +77,7 @@ void ZenvyController::persistStates() m_payslipManagementService->savePayslips(); } -std::pair, std::shared_ptr> -ZenvyController::getPayslipForMonth(const std::string& employeeId, int year, int month) +std::pair, std::shared_ptr> ZenvyController::getPayslipForMonth(const std::string& employeeId, int year, int month) { - return m_payslipManagementService->getPayslipForMonth(employeeId, month, year); -} - - + return m_payslipManagementService->getPayslipForMonth(employeeId, year, month); +} \ No newline at end of file diff --git a/Trenser.Zenvy/Trenser.Zenvy/controllers/ZenvyController.h b/Trenser.Zenvy/Trenser.Zenvy/controllers/ZenvyController.h index 3d0190e..261cb67 100644 --- a/Trenser.Zenvy/Trenser.Zenvy/controllers/ZenvyController.h +++ b/Trenser.Zenvy/Trenser.Zenvy/controllers/ZenvyController.h @@ -62,8 +62,7 @@ public: //Payslip management void updateSalary(const std::string&, double, double, double, double, double); void generatePayslips(); - std::pair, std::shared_ptr> - getPayslipForMonth(const std::string&, int, int); + std::pair, std::shared_ptr>getPayslipForMonth(const std::string&, int, int); //File Management void loadStates(); diff --git a/Trenser.Zenvy/Trenser.Zenvy/services/PayslipManagementService.cpp b/Trenser.Zenvy/Trenser.Zenvy/services/PayslipManagementService.cpp index c889143..e35937d 100644 --- a/Trenser.Zenvy/Trenser.Zenvy/services/PayslipManagementService.cpp +++ b/Trenser.Zenvy/Trenser.Zenvy/services/PayslipManagementService.cpp @@ -87,8 +87,7 @@ void PayslipManagementService::savePayrolls() payrollFileManager.save(payrolls); } -std::pair, std::shared_ptr> -PayslipManagementService::getPayslipForMonth(const std::string& employeeId, int year, int month) +std::pair, std::shared_ptr> PayslipManagementService::getPayslipForMonth(const std::string& employeeId, int year, int month) { auto& payrolls = m_dataStore.getPayrolls(); auto& payslips = m_dataStore.getPayslips(); @@ -97,10 +96,10 @@ PayslipManagementService::getPayslipForMonth(const std::string& employeeId, int const auto& payroll = payrollsPair.second; if (payroll->getEmployeeId() == employeeId) { - auto iterator = payslips.find(payroll->getId()); - if (iterator != payslips.end()) + auto payslipIterator = payslips.find(payroll->getId()); + if (payslipIterator != payslips.end()) { - const auto& payslip = iterator->second; + const auto& payslip = payslipIterator->second; if (payslip->getTimestamp().getYear() == year && payslip->getTimestamp().getMonth() == month) { return { payroll, payslip }; diff --git a/Trenser.Zenvy/Trenser.Zenvy/services/PayslipManagementService.h b/Trenser.Zenvy/Trenser.Zenvy/services/PayslipManagementService.h index 74ec3b4..843371c 100644 --- a/Trenser.Zenvy/Trenser.Zenvy/services/PayslipManagementService.h +++ b/Trenser.Zenvy/Trenser.Zenvy/services/PayslipManagementService.h @@ -11,10 +11,9 @@ public: PayslipManagementService() : m_dataStore(DataStore::getInstance()) {}; void updateSalary(const std::string&, double, double, double, double, double); void generatePayslips(); + std::pair, std::shared_ptr>getPayslipForMonth(const std::string&, int, int); void loadPayrolls(); void savePayrolls(); void loadPayslips(); void savePayslips(); - std::pair, std::shared_ptr> - getPayslipForMonth(const std::string&, int, int); -}; +}; \ No newline at end of file diff --git a/Trenser.Zenvy/Trenser.Zenvy/utilities/Timestamp.cpp b/Trenser.Zenvy/Trenser.Zenvy/utilities/Timestamp.cpp index fb9dab0..1341da9 100644 --- a/Trenser.Zenvy/Trenser.Zenvy/utilities/Timestamp.cpp +++ b/Trenser.Zenvy/Trenser.Zenvy/utilities/Timestamp.cpp @@ -40,21 +40,6 @@ double util::Timestamp::getDurationInSeconds(const Timestamp& startTimestamp, co return std::difftime(endTimestamp.m_time, startTimestamp.m_time); } -int util::Timestamp::getYear() const -{ - return 0; -} - -int util::Timestamp::getMonth() const -{ - return 0; -} - -int util::Timestamp::getDay() const -{ - return 0; -} - int util::Timestamp::getDateAsInt() const { std::tm timeStruct{}; diff --git a/Trenser.Zenvy/Trenser.Zenvy/utilities/Timestamp.h b/Trenser.Zenvy/Trenser.Zenvy/utilities/Timestamp.h index 4a130a3..8aedc35 100644 --- a/Trenser.Zenvy/Trenser.Zenvy/utilities/Timestamp.h +++ b/Trenser.Zenvy/Trenser.Zenvy/utilities/Timestamp.h @@ -16,9 +16,6 @@ namespace util static double getDurationInHours(const Timestamp&, const Timestamp&); static double getDurationInMinutes(const Timestamp&, const Timestamp&); static double getDurationInSeconds(const Timestamp&, const Timestamp&); - int getYear() const; - int getMonth() const; - int getDay() const; int getDateAsInt() const; int getMonth() const; int getYear() const; diff --git a/Trenser.Zenvy/Trenser.Zenvy/views/MenuHelper.h b/Trenser.Zenvy/Trenser.Zenvy/views/MenuHelper.h index 0e0a129..3261460 100644 --- a/Trenser.Zenvy/Trenser.Zenvy/views/MenuHelper.h +++ b/Trenser.Zenvy/Trenser.Zenvy/views/MenuHelper.h @@ -318,9 +318,7 @@ inline void viewPayslip(std::shared_ptr controller) auto payslip = result.second; if (payroll && payslip) { - std::cout << "\nPayslip for " << employee->getEmployeeName() - << " (" << year << "-" << std::setw(2) << std::setfill('0') << month << ")\n\n"; - + std::cout << "\nPayslip for " << employee->getEmployeeName() << " (" << year << "-" << std::setw(2) << std::setfill('0') << month << ")\n\n"; std::cout << "Basic Salary : " << payroll->getBasicSalary() << "\n"; std::cout << "House Rent Allowance : " << payroll->getHouseRentAllowance() << "\n"; std::cout << "Food Allowance : " << payroll->getFoodAllowance() << "\n"; @@ -335,4 +333,4 @@ inline void viewPayslip(std::shared_ptr controller) std::cout << "Payslip not available for " << year << "-" << month << ".\n"; } util::pressEnter(); -} +} \ No newline at end of file