galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix typo

Browse Source
This commit is contained in:
Thilina
2021-06-27 18:01:09 +02:00
parent 944d5f1f88
commit c0ce41ed2f
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/Model/BaseModel.php
View File

@@ -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]);

2
core/src/Reports/Admin/Api/ReportBuilder.php
View File

@@ -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");

3
core/src/Reports/Admin/Reports/EmployeeTimeTrackReport.php
View File

@@ -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');