From c0ce41ed2feb8c02bcaeffe76402b2b4d8f6731d Mon Sep 17 00:00:00 2001 From: Thilina Date: Sun, 27 Jun 2021 18:01:09 +0200 Subject: [PATCH] Fix typo --- core/src/Model/BaseModel.php | 2 +- core/src/Reports/Admin/Api/ReportBuilder.php | 2 +- core/src/Reports/Admin/Reports/EmployeeTimeTrackReport.php | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/Model/BaseModel.php b/core/src/Model/BaseModel.php index 6c5db258..7d02b421 100644 --- a/core/src/Model/BaseModel.php +++ b/core/src/Model/BaseModel.php @@ -86,7 +86,7 @@ class BaseModel extends \ADOdb_Active_Record } $permissions = $allowedAccessMatrix === null ? $this->getDefaultAccessLevel() : $allowedAccessMatrix; - ; + foreach ($userRoles as $role) { $userRole = new UserRole(); $userRole->Load('id = ?', [$role]); diff --git a/core/src/Reports/Admin/Api/ReportBuilder.php b/core/src/Reports/Admin/Api/ReportBuilder.php index ae4e3a99..28a98757 100644 --- a/core/src/Reports/Admin/Api/ReportBuilder.php +++ b/core/src/Reports/Admin/Api/ReportBuilder.php @@ -81,7 +81,7 @@ abstract class ReportBuilder $uploadFilesToS3 = SettingsManager::getInstance()->getSetting("Files: Upload Files to S3"); $uploadFilesToS3Key = SettingsManager::getInstance()->getSetting("Files: Amazon S3 Key for File Upload"); - $uploadFilesToS3Secret = SettingsManager::getInstance()->getSetting("Files: Amazone S3 Secret for File Upload"); + $uploadFilesToS3Secret = SettingsManager::getInstance()->getSetting("Files: Amazon S3 Secret for File Upload"); $s3Bucket = SettingsManager::getInstance()->getSetting("Files: S3 Bucket"); $s3WebUrl = SettingsManager::getInstance()->getSetting("Files: S3 Web Url"); diff --git a/core/src/Reports/Admin/Reports/EmployeeTimeTrackReport.php b/core/src/Reports/Admin/Reports/EmployeeTimeTrackReport.php index 8725427d..b5a748af 100644 --- a/core/src/Reports/Admin/Reports/EmployeeTimeTrackReport.php +++ b/core/src/Reports/Admin/Reports/EmployeeTimeTrackReport.php @@ -90,12 +90,11 @@ class EmployeeTimeTrackReport extends ClassBasedReportBuilder implements ReportB "Last Punch-Out Time", "Time in Attendance (Hours)", "Time in Time-sheets (Hours)", - ]; + ]; $reportData[] = ["Employee:",$employeeObject->first_name." ".$employeeObject->last_name,"","",""]; $reportData[] = ["Department:",$company->title,"","",""]; $reportData[] = ["Total Days:","","","",""]; - //Iterate date range $interval = \DateInterval::createFromDateString('1 day');