License updated to GPLv3

🧲 New features
Custom user role permissions
Employee edit form updated
Employee daily task list
Attendance and employee distribution charts on dashboard
Improvements to company structure and company assets module
Improved tables for displaying data in several modules
Faster data loading (specially for employee module)
Initials based profile pictures
Re-designed login page
Re-designed user profile page
Improvements to filtering
New REST endpoints for employee qualifications

🐛 Bug fixes
Fixed, issue with managers being able to create performance reviews for employees who are not their direct reports
Fixed, issues related to using full profile image instead of using smaller version of profile image
Changing third gender to other
Improvements and fixes for internal frontend data caching
This commit is contained in:
Thilina Pituwala
2020-10-31 19:02:37 +01:00
parent 86b8345505
commit b1df0037db
29343 changed files with 867614 additions and 2191082 deletions

View File

@@ -12,7 +12,11 @@ use Classes\AbstractModuleManager;
use Classes\Macaw;
use Classes\UIManager;
use Employees\Common\Model\Employee;
use Employees\Rest\EmployeeCertificationsRestEndPoint;
use Employees\Rest\EmployeeEducationRestEndPoint;
use Employees\Rest\EmployeeLanguageRestEndPoint;
use Employees\Rest\EmployeeRestEndPoint;
use Employees\Rest\EmployeeSkillsRestEndPoint;
class EmployeesAdminManager extends AbstractModuleManager
{
@@ -56,6 +60,30 @@ class EmployeesAdminManager extends AbstractModuleManager
$empRestEndPoint = new EmployeeRestEndPoint();
$empRestEndPoint->process('delete', $pathParams);
});
// Employee skills
Macaw::get(REST_API_PATH.'employees/(:num)/skills', function ($pathParams) {
$empRestEndPoint = new EmployeeSkillsRestEndPoint();
$empRestEndPoint->process('listAll', $pathParams);
});
// Employee education
Macaw::get(REST_API_PATH.'employees/(:num)/educations', function ($pathParams) {
$empRestEndPoint = new EmployeeEducationRestEndpoint();
$empRestEndPoint->process('listAll', $pathParams);
});
// Employee certifications
Macaw::get(REST_API_PATH.'employees/(:num)/certifications', function ($pathParams) {
$empRestEndPoint = new EmployeeCertificationsRestEndpoint();
$empRestEndPoint->process('listAll', $pathParams);
});
// Employee languages
Macaw::get(REST_API_PATH.'employees/(:num)/languages', function ($pathParams) {
$empRestEndPoint = new EmployeeLanguageRestEndpoint();
$empRestEndPoint->process('listAll', $pathParams);
});
}
public function initializeDatabaseErrorMappings()

View File

@@ -0,0 +1,53 @@
<?php
namespace Employees\Rest;
use Classes\Data\Query\DataQuery;
use Classes\Data\Query\Filter;
use Classes\RestEndPoint;
use Qualifications\Common\Model\EmployeeCertification;
use Qualifications\Common\Model\EmployeeEducation;
use Users\Common\Model\User;
class EmployeeCertificationsRestEndpoint extends RestEndPoint
{
public function getModelObject($id)
{
$obj = new EmployeeCertification();
$obj->Load("id = ?", array($id));
return $obj;
}
public function listAll(User $user, $parameter = null)
{
$query = new DataQuery('EmployeeCertification');
$query->addFilter(new Filter('employee', $parameter));
$mapping = <<<JSON
{
"certification_id": [ "Certification", "id", "name" ],
"employee": [ "Employee", "id", "first_name+last_name" ]
}
JSON;
$query->setFieldMapping($mapping);
$limit = self::DEFAULT_LIMIT;
if (isset($_GET['limit']) && intval($_GET['limit']) > 0) {
$limit = intval($_GET['limit']);
}
$query->setLength($limit);
if (!empty($_GET['filters'])) {
$query->setFilters($_GET['filters']);
}
if (isset($_GET['sortField']) && !empty($_GET['sortField'])) {
$query->setSortColumn($_GET['sortField']);
$query->setSortingEnabled(true);
$query->setSortOrder(
empty($_GET['sortOrder']) || $_GET['sortOrder'] === 'ascend' ? 'ASC' : 'DESC'
);
}
return $this->listByQuery($query);
}
}

View File

@@ -0,0 +1,52 @@
<?php
namespace Employees\Rest;
use Classes\Data\Query\DataQuery;
use Classes\Data\Query\Filter;
use Classes\RestEndPoint;
use Qualifications\Common\Model\EmployeeEducation;
use Users\Common\Model\User;
class EmployeeEducationRestEndpoint extends RestEndPoint
{
public function getModelObject($id)
{
$obj = new EmployeeEducation();
$obj->Load("id = ?", array($id));
return $obj;
}
public function listAll(User $user, $parameter = null)
{
$query = new DataQuery('EmployeeEducation');
$query->addFilter(new Filter('employee', $parameter));
$mapping = <<<JSON
{
"education_id": [ "Education", "id", "name" ],
"employee": [ "Employee", "id", "first_name+last_name" ]
}
JSON;
$query->setFieldMapping($mapping);
$limit = self::DEFAULT_LIMIT;
if (isset($_GET['limit']) && intval($_GET['limit']) > 0) {
$limit = intval($_GET['limit']);
}
$query->setLength($limit);
if (!empty($_GET['filters'])) {
$query->setFilters($_GET['filters']);
}
if (isset($_GET['sortField']) && !empty($_GET['sortField'])) {
$query->setSortColumn($_GET['sortField']);
$query->setSortingEnabled(true);
$query->setSortOrder(
empty($_GET['sortOrder']) || $_GET['sortOrder'] === 'ascend' ? 'ASC' : 'DESC'
);
}
return $this->listByQuery($query);
}
}

View File

@@ -0,0 +1,56 @@
<?php
namespace Employees\Rest;
use Classes\Data\Query\DataQuery;
use Classes\Data\Query\Filter;
use Classes\RestEndPoint;
use Qualifications\Common\Model\Certification;
use Qualifications\Common\Model\EmployeeCertification;
use Qualifications\Common\Model\EmployeeEducation;
use Qualifications\Common\Model\EmployeeLanguage;
use Qualifications\Common\Model\Language;
use Users\Common\Model\User;
class EmployeeLanguageRestEndpoint extends RestEndPoint
{
public function getModelObject($id)
{
$obj = new EmployeeLanguage();
$obj->Load("id = ?", array($id));
return $obj;
}
public function listAll(User $user, $parameter = null)
{
$query = new DataQuery('EmployeeLanguage');
$query->addFilter(new Filter('employee', $parameter));
$mapping = <<<JSON
{
"language_id": [ "Language", "id", "description" ],
"employee": [ "Employee", "id", "first_name+last_name" ]
}
JSON;
$query->setFieldMapping($mapping);
$limit = self::DEFAULT_LIMIT;
if (isset($_GET['limit']) && intval($_GET['limit']) > 0) {
$limit = intval($_GET['limit']);
}
$query->setLength($limit);
if (!empty($_GET['filters'])) {
$query->setFilters($_GET['filters']);
}
if (isset($_GET['sortField']) && !empty($_GET['sortField'])) {
$query->setSortColumn($_GET['sortField']);
$query->setSortingEnabled(true);
$query->setSortOrder(
empty($_GET['sortOrder']) || $_GET['sortOrder'] === 'ascend' ? 'ASC' : 'DESC'
);
}
return $this->listByQuery($query);
}
}

View File

@@ -3,6 +3,7 @@ namespace Employees\Rest;
use Classes\BaseService;
use Classes\Data\Query\DataQuery;
use Classes\Data\Query\Filter;
use Classes\IceResponse;
use Classes\PermissionManager;
use Classes\RestEndPoint;
@@ -20,10 +21,10 @@ class EmployeeRestEndPoint extends RestEndPoint
return $obj;
}
public function listAll(User $user)
public function listAll(User $user, $parameter = null)
{
$query = new DataQuery('Employee');
$query->addFilter(new Filter('employee', $parameter));
$mapping = <<<JSON
{
"job_title": [ "JobTitle", "id", "name" ],

View File

@@ -0,0 +1,52 @@
<?php
namespace Employees\Rest;
use Classes\Data\Query\DataQuery;
use Classes\Data\Query\Filter;
use Classes\RestEndPoint;
use Qualifications\Common\Model\EmployeeSkill;
use Users\Common\Model\User;
class EmployeeSkillsRestEndPoint extends RestEndPoint
{
public function getModelObject($id)
{
$obj = new EmployeeSkill();
$obj->Load("id = ?", array($id));
return $obj;
}
public function listAll(User $user, $parameter = null)
{
$query = new DataQuery('EmployeeSkill');
$query->addFilter(new Filter('employee', $parameter));
$mapping = <<<JSON
{
"skill_id": [ "Skill", "id", "name" ],
"employee": [ "Employee", "id", "first_name+last_name" ]
}
JSON;
$query->setFieldMapping($mapping);
$limit = self::DEFAULT_LIMIT;
if (isset($_GET['limit']) && intval($_GET['limit']) > 0) {
$limit = intval($_GET['limit']);
}
$query->setLength($limit);
if (!empty($_GET['filters'])) {
$query->setFilters($_GET['filters']);
}
if (isset($_GET['sortField']) && !empty($_GET['sortField'])) {
$query->setSortColumn($_GET['sortField']);
$query->setSortingEnabled(true);
$query->setSortOrder(
empty($_GET['sortOrder']) || $_GET['sortOrder'] === 'ascend' ? 'ASC' : 'DESC'
);
}
return $this->listByQuery($query);
}
}

View File

@@ -0,0 +1,15 @@
<?php
namespace Employees\Services;
use Employees\Common\Model\Employee;
class EmployeesService
{
public function getDirectReports($employeeId)
{
$sub = new Employee();
$subordinates = $sub->Find("supervisor = ?", array($employeeId));
return $subordinates;
}
}

View File

@@ -88,7 +88,7 @@ class EmployeesActionManager extends SubActionManager
$employee->subordinates = $subordinates;
$fs = FileService::getInstance();
$employee = $fs->updateProfileImage($employee);
$employee = $fs->updateSmallProfileImage($employee);
if (!empty($employee->birthday)) {
$employee->birthday = date("F jS, Y", strtotime($employee->birthday));