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

Fix for mysql 5.7 strict date issue

Browse Source
This commit is contained in:
gamonoid
2017-09-04 05:50:37 +02:00
parent 385747dea4
commit 737b392d0a
5 changed files with 277 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Employees/Common/Model/Employee.php
View File

@@ -98,7 +98,7 @@ class Employee extends BaseModel
continue;
}
if (empty($obj->$k) && ($oldObjOrig->$k = '0000-00-00' || empty($oldObjOrig->$k))) {
if (empty($obj->$k) && $oldObjOrig->$k == '0000-00-00') {
continue;
}

16
src/Reports/Admin/Reports/ActiveEmployeeReport.php
View File

@@ -8,7 +8,7 @@ use Utils\LogManager;
class ActiveEmployeeReport extends CSVReportBuilder implements CSVReportBuilderInterface
{
public function getMainQuery()
{
$query = "Select id, employee_id as 'Employee ID',
@@ -41,15 +41,15 @@ confirmation_date as 'Confirmation Date',
(SELECT title from CompanyStructures where id = department) as 'Department',
(SELECT concat(`first_name`,' ',`middle_name`,' ', `last_name`,' [Employee ID:',`employee_id`,']') from Employees e1 where e1.id = e.supervisor) as 'Supervisor', notes as 'Notes'
FROM Employees e";
return $query;
}
public function getWhereQuery($request)
{
$query = "";
$params = array();
if (empty($request['department']) || $request['department'] == "NULL") {
$params = array();
$query = "where ((termination_date is NULL or termination_date = '0001-01-01 00:00:00' or termination_date = '0000-00-00 00:00:00') and joined_date < NOW()) or (termination_date > NOW() and joined_date < NOW())";
@@ -57,11 +57,11 @@ FROM Employees e";
$depts = $this->getChildCompanyStuctures($request['department']);
$query = "where department in (".implode(",", $depts).") and (((termination_date is NULL or termination_date = '0001-01-01 00:00:00' or termination_date = '0000-00-00 00:00:00') and joined_date < NOW()) or (termination_date > NOW() and joined_date < NOW()))";
}
return array($query, $params);
}
public function getChildCompanyStuctures($companyStructId)
{
$childIds = array();
@@ -86,7 +86,7 @@ FROM Employees e";
$nodeIdsAtLastLevel[] = $item->id;
}
} while (count($list) > 0 && $count < 10);
return $childIds;
}
}