diff --git a/src/Expenses/Admin/Api/ExpensesAdminManager.php b/src/Expenses/Admin/Api/ExpensesAdminManager.php index 396b7094..2323a07a 100644 --- a/src/Expenses/Admin/Api/ExpensesAdminManager.php +++ b/src/Expenses/Admin/Api/ExpensesAdminManager.php @@ -1,11 +1,4 @@ addFileFieldMapping('EmployeeExpense', 'attachment1', 'name'); $this->addFileFieldMapping('EmployeeExpense', 'attachment2', 'name'); $this->addFileFieldMapping('EmployeeExpense', 'attachment3', 'name'); @@ -40,4 +32,14 @@ class ExpensesAdminManager extends AbstractModuleManager $this->addModelClass('EmployeeExpense'); $this->addModelClass('EmployeeExpenseApproval'); } + + public function initCalculationHooks() + { + $this->addCalculationHook( + 'ExpensePayrollUtils_getApprovedExpensesTotal', + 'Total Approved Expenses', + ExpensePayrollUtils::class, + 'getApprovedExpensesTotal' + ); + } } diff --git a/src/TimeSheets/Common/Model/EmployeeTimeSheet.php b/src/TimeSheets/Common/Model/EmployeeTimeSheet.php index 15db9227..68ee5315 100644 --- a/src/TimeSheets/Common/Model/EmployeeTimeSheet.php +++ b/src/TimeSheets/Common/Model/EmployeeTimeSheet.php @@ -35,7 +35,7 @@ class EmployeeTimeSheet extends BaseModel return array("element","save","delete"); } - public function getTotalTime() + public function getTotalTimeMinutes() { $start = $this->date_start . " 00:00:00"; @@ -59,11 +59,18 @@ class EmployeeTimeSheet extends BaseModel } $totMinutes = round($seconds / 60); + + return $totMinutes; + } + + public function getTotalTime() + { + $totMinutes = $this->getTotalTimeMinutes(); $minutes = $totMinutes % 60; $hours = ($totMinutes - $minutes) / 60; return CalendarTools::addLeadingZero($hours) - . ":" . CalendarTools::addLeadingZero($minutes); + . ":" . CalendarTools::addLeadingZero($minutes); } public function postProcessGetData($entry) diff --git a/src/TimeSheets/User/Api/TimeSheetsModulesManager.php b/src/TimeSheets/User/Api/TimeSheetsModulesManager.php index 26bb8470..85896734 100644 --- a/src/TimeSheets/User/Api/TimeSheetsModulesManager.php +++ b/src/TimeSheets/User/Api/TimeSheetsModulesManager.php @@ -79,4 +79,14 @@ class TimeSheetsModulesManager extends AbstractModuleManager } return new IceResponse(IceResponse::SUCCESS, $hours.":".$rem); } + + public function initCalculationHooks() + { + $this->addCalculationHook( + 'TimeSheetsPayrollUtils_getApprovedTimeInTimeSheets', + 'Total Hours from Approved Time Sheets', + TimeSheetsPayrollUtils::class, + 'getApprovedTimeInTimeSheets' + ); + } }