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

@@ -4,11 +4,17 @@ namespace Attendance\Admin\Api;
use Attendance\Common\Model\Attendance;
use Attendance\Rest\AttendanceRestEndPoint;
use Classes\AbstractModuleManager;
use Classes\SystemTasks\SystemTasksService;
use Classes\UIManager;
class AttendanceAdminManager extends AbstractModuleManager
{
public function initialize()
{
SystemTasksService::getInstance()->registerTaskCreator((new AttendanceTaskCreator()));
}
public function initializeUserClasses()
{
}

View File

@@ -0,0 +1,66 @@
<?php
namespace Attendance\Admin\Api;
use Attendance\Rest\AttendanceRestEndPoint;
use Classes\BaseService;
use Classes\SystemTasks\DTO\Task;
use Classes\SystemTasks\TaskCreator;
class AttendanceTaskCreator implements TaskCreator
{
public function getTasksCreators()
{
$taskCreators = [];
$taskCreators[1] = function () {
if (!$this->isUserCheckedIn()) {
return (new Task(Task::PRIORITY_ERROR, 'You are currently not checked-in'))
->setLink(
CLIENT_BASE_URL.'?g=modules&n=attendance&m=module_Time_Management',
'Visit Attendance'
);
}
return null;
};
$taskCreators[2] = function () {
if ($this->userNeedToCheckOut()) {
return (new Task(Task::PRIORITY_INFO, 'Remember to checkout after finishing work'))
->setLink(
CLIENT_BASE_URL.'?g=modules&n=attendance&m=module_Time_Management',
'Visit Attendance'
)->setDetails('You have checked in for the day and, should checkout, after finishing work');
}
return null;
};
return $taskCreators;
}
protected function isUserCheckedIn()
{
$attendanceRest = new AttendanceRestEndPoint();
$employeeId = BaseService::getInstance()->getCurrentUserProfileId();
if (!$employeeId) {
return true;
}
$attendance = $attendanceRest->findAttendance($employeeId, 'today');
return $attendance->id !== null;
}
protected function userNeedToCheckOut()
{
$attendanceRest = new AttendanceRestEndPoint();
$employeeId = BaseService::getInstance()->getCurrentUserProfileId();
if (!$employeeId) {
return true;
}
$attendance = $attendanceRest->findAttendance($employeeId, 'today');
return $attendance->in_time && empty($attendance->out_time);
}
}

View File

@@ -61,7 +61,7 @@ class AttendanceStatus extends BaseModel
return array_values($employees);
}
// @codingStandardsIgnoreStart
public function Find($whereOrderBy, $bindarr = false, $pkeysArr = false, $extra = array())
public function Find($whereOrderBy, $bindarr = false, $cache = false, $pkeysArr = false, $extra = array())
{
// @codingStandardsIgnoreEnd
$shift = intval(SettingsManager::getInstance()->getSetting("Attendance: Shift (Minutes)"));

View File

@@ -26,7 +26,7 @@ class AttendanceRestEndPoint extends RestEndPoint
return $obj;
}
public function listAll(User $user)
public function listAll(User $user, $parameter = null)
{
$query = new DataQuery('Attendance');
$query->addColumn('id');
@@ -237,8 +237,12 @@ class AttendanceRestEndPoint extends RestEndPoint
return new IceResponse(IceResponse::ERROR, $response->getData(), 400);
}
protected function findAttendance($employeeId, $date)
public function findAttendance($employeeId, $date)
{
if ($date === 'today') {
$date = explode(' ', $this->getServerTime())[0];
}
if (strpos($date, ' ')) {
$date = explode(' ', $date)[0];
}