diff --git a/core/admin/company_structure/meta.json b/core/admin/company_structure/meta.json
index b386cbbb..537954fd 100644
--- a/core/admin/company_structure/meta.json
+++ b/core/admin/company_structure/meta.json
@@ -2,7 +2,7 @@
"label":"Company Structure",
"menu":"Admin",
"order":"2",
- "icon":"fa-building-o",
+ "icon":"fa-building",
"user_levels":["Admin","Manager"],
"dashboardPosition":2,
diff --git a/core/admin/dashboard/index.php b/core/admin/dashboard/index.php
index dbdbc8f9..76cc8e34 100644
--- a/core/admin/dashboard/index.php
+++ b/core/admin/dashboard/index.php
@@ -5,6 +5,7 @@
*/
$moduleName = 'dashboard';
+$moduleGroup = 'admin';
define('MODULE_PATH',dirname(__FILE__));
include APP_BASE_PATH.'header.php';
include APP_BASE_PATH.'modulejslibs.inc.php';
diff --git a/core/admin/data/index.php b/core/admin/data/index.php
index 1feb2dce..6297f26e 100644
--- a/core/admin/data/index.php
+++ b/core/admin/data/index.php
@@ -1,6 +1,7 @@
+
+
-
-
diff --git a/core/admin/employees/index.php b/core/admin/employees/index.php
index 40b6944e..e5dd440a 100644
--- a/core/admin/employees/index.php
+++ b/core/admin/employees/index.php
@@ -1,6 +1,7 @@
.
-
-------------------------------------------------------------------
-
-Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]
-Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
- */
-
$moduleName = 'metadata';
+$moduleGroup = 'admin';
define('MODULE_PATH',dirname(__FILE__));
include APP_BASE_PATH.'header.php';
include APP_BASE_PATH.'modulejslibs.inc.php';
diff --git a/core/admin/metadata/meta.json b/core/admin/metadata/meta.json
index ace37611..029050b3 100644
--- a/core/admin/metadata/meta.json
+++ b/core/admin/metadata/meta.json
@@ -2,11 +2,11 @@
"label": "Manage Metadata",
"menu": "System",
"order": "6",
- "icon": "fa-sort-alpha-asc",
+ "icon": "fa-microchip",
"user_levels": [
"Admin"
],
"permissions": [],
"model_namespace": "\\Metadata\\Common\\Model",
"manager": "\\Metadata\\Admin\\Api\\MetadataAdminManager"
-}
\ No newline at end of file
+}
diff --git a/core/admin/modules/index.php b/core/admin/modules/index.php
index a5f0556d..a2cda953 100644
--- a/core/admin/modules/index.php
+++ b/core/admin/modules/index.php
@@ -4,7 +4,8 @@
Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
*/
-$moduleName = 'Modules';
+$moduleName = 'modules';
+$moduleGroup = 'admin';
define('MODULE_PATH',dirname(__FILE__));
include APP_BASE_PATH.'header.php';
include APP_BASE_PATH.'modulejslibs.inc.php';
diff --git a/core/admin/overtime/index.php b/core/admin/overtime/index.php
index 49709ba3..a6b8d18f 100644
--- a/core/admin/overtime/index.php
+++ b/core/admin/overtime/index.php
@@ -5,6 +5,7 @@
*/
$moduleName = 'overtime';
+$moduleGroup = 'admin';
define('MODULE_PATH',dirname(__FILE__));
include APP_BASE_PATH.'header.php';
include APP_BASE_PATH.'modulejslibs.inc.php';
diff --git a/core/admin/payroll/index.php b/core/admin/payroll/index.php
index 2f5d348f..603d8df1 100644
--- a/core/admin/payroll/index.php
+++ b/core/admin/payroll/index.php
@@ -1,6 +1,7 @@
generateCsrf('User');
?>
-
+
@@ -24,14 +24,14 @@ $csrf = \Classes\BaseService::getInstance()->generateCsrf('User');
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
-
+
@@ -40,4 +41,4 @@ modJsList['tabReport'].setShowAddNew(false);
var modJs = modJsList['tabUserReport'];
-
+
diff --git a/core/modules/reports/meta.json b/core/modules/reports/meta.json
index e7aecb1c..6d8a50ae 100644
--- a/core/modules/reports/meta.json
+++ b/core/modules/reports/meta.json
@@ -2,7 +2,7 @@
"label": "Reports",
"menu": "User Reports",
"order": "1",
- "icon": "fa-file-o",
+ "icon": "fa-window-maximize",
"user_levels": [
"Admin",
"Manager",
@@ -12,4 +12,4 @@
"permissions": [],
"model_namespace": "\\Reports\\Common\\Model",
"manager": "\\Reports\\User\\Api\\ReportsModulesManager"
-}
\ No newline at end of file
+}
diff --git a/core/modules/salary/index.php b/core/modules/salary/index.php
index 26591181..fc568baf 100644
--- a/core/modules/salary/index.php
+++ b/core/modules/salary/index.php
@@ -5,6 +5,7 @@
*/
$moduleName = 'salary';
+$moduleGroup = 'modules';
define('MODULE_PATH',dirname(__FILE__));
include APP_BASE_PATH.'header.php';
include APP_BASE_PATH.'modulejslibs.inc.php';
diff --git a/core/modules/staffdirectory/index.php b/core/modules/staffdirectory/index.php
index c02cedad..6826f734 100644
--- a/core/modules/staffdirectory/index.php
+++ b/core/modules/staffdirectory/index.php
@@ -4,7 +4,8 @@
Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
*/
-$moduleName = 'salary';
+$moduleName = 'staffdirectory';
+$moduleGroup = 'modules';
define('MODULE_PATH',dirname(__FILE__));
include APP_BASE_PATH.'header.php';
include APP_BASE_PATH.'modulejslibs.inc.php';
diff --git a/core/modules/time_sheets/index.php b/core/modules/time_sheets/index.php
index 053e1151..306b1d11 100644
--- a/core/modules/time_sheets/index.php
+++ b/core/modules/time_sheets/index.php
@@ -4,7 +4,8 @@
Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
*/
-$moduleName = 'employee_TimeSheet';
+$moduleName = 'time_sheets';
+$moduleGroup = 'modules';
define('MODULE_PATH',dirname(__FILE__));
include APP_BASE_PATH.'header.php';
include APP_BASE_PATH.'modulejslibs.inc.php';
@@ -97,7 +98,7 @@ modJsList['tabSubEmployeeTimeSheetAll'].setNeedStartEndTime(getSetting('Api: REST Api Enabled')
if (defined('SYM_CLIENT')) {
define('REST_API_PATH', '/'.SYM_CLIENT.'/');
- } else {
+ } else if (!defined('REST_API_PATH')){
define('REST_API_PATH', '/');
}
diff --git a/core/service.php b/core/service.php
index 61fb154b..a03d2f84 100644
--- a/core/service.php
+++ b/core/service.php
@@ -1,25 +1,4 @@
.
-
-------------------------------------------------------------------
-
-Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]
-Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
- */
define('CLIENT_PATH',dirname(__FILE__));
include ("config.base.php");
include ("include.common.php");
diff --git a/core/src/Attendance/Rest/AttendanceRestEndPoint.php b/core/src/Attendance/Rest/AttendanceRestEndPoint.php
index ddbbb491..731856f6 100644
--- a/core/src/Attendance/Rest/AttendanceRestEndPoint.php
+++ b/core/src/Attendance/Rest/AttendanceRestEndPoint.php
@@ -9,9 +9,11 @@ use Classes\IceResponse;
use Classes\LanguageManager;
use Classes\PermissionManager;
use Classes\RestEndPoint;
+use Classes\SettingsManager;
use Employees\Common\Model\Employee;
use Users\Common\Model\User;
use Utils\LogManager;
+use Utils\NetworkUtils;
class AttendanceRestEndPoint extends RestEndPoint
{
@@ -163,7 +165,7 @@ class AttendanceRestEndPoint extends RestEndPoint
$openPunch = $this->getOpenPunch($user, $body['employee'], $body['in_time']);
- if ($openPunch->getStatus() === IceResponse::SUCCESS && !empty($openPunch->getData()['attendnace'])) {
+ if ($openPunch->getStatus() === IceResponse::SUCCESS && !empty($openPunch->getData()['attendance'])) {
return new IceResponse(IceResponse::ERROR, 'User has already punched in for the day ', 400);
}
@@ -172,7 +174,17 @@ class AttendanceRestEndPoint extends RestEndPoint
return $permissionResponse;
}
- $response = BaseService::getInstance()->addElement(self::ELEMENT_NAME, $body);
+ $response = $this->savePunch(
+ $body['employee'],
+ $body['in_time'],
+ $body['note'],
+ null,
+ null,
+ $body['latitude'],
+ $body['longitude'],
+ NetworkUtils::getClientIp()
+ );
+
if ($response->getStatus() === IceResponse::SUCCESS) {
$attendance = $this->cleanObject($response->getData());
$response->setData($attendance);
@@ -211,7 +223,10 @@ class AttendanceRestEndPoint extends RestEndPoint
$attendance->in_time,
$body['note'],
$body['out_time'],
- $attendance->id
+ $attendance->id,
+ $body['latitude'],
+ $body['longitude'],
+ NetworkUtils::getClientIp()
);
if ($response->getStatus() === IceResponse::SUCCESS) {
@@ -262,7 +277,7 @@ class AttendanceRestEndPoint extends RestEndPoint
}
}
- protected function savePunch($employeeId, $inDateTime, $note = null, $outDateTime = null, $id = null)
+ protected function savePunch($employeeId, $inDateTime, $note = null, $outDateTime = null, $id = null, $latitude = null, $longitude = null, $ip = null)
{
$employee = BaseService::getInstance()->getElement(
'Employee',
@@ -339,8 +354,16 @@ class AttendanceRestEndPoint extends RestEndPoint
$attendance->in_time = $inDateTime;
if (empty($outDateTime)) {
$attendance->out_time = null;
+ $attendance->map_lat = $latitude;
+ $attendance->map_lng = $longitude;
+ $attendance->map_snapshot = $this->generateMapLocationImage($latitude, $longitude);
+ $attendance->in_ip = $ip;
} else {
$attendance->out_time = $outDateTime;
+ $attendance->map_out_lat = $latitude;
+ $attendance->map_out_lng = $longitude;
+ $attendance->map_out_snapshot = $this->generateMapLocationImage($latitude, $longitude);
+ $attendance->out_ip = $ip;
}
$attendance->employee = $employeeId;
@@ -352,4 +375,34 @@ class AttendanceRestEndPoint extends RestEndPoint
}
return new IceResponse(IceResponse::SUCCESS, $attendance);
}
+
+ protected function generateMapLocationImage($latitude, $longitude)
+ {
+ if (empty(SettingsManager::getInstance()->getSetting('System: Google Maps Api Key'))
+ || empty($latitude)
+ || empty($longitude)
+ ) {
+ return null;
+ }
+
+ $location = sprintf('%s,%s', $latitude, $longitude);
+
+ $url = "https://maps.googleapis.com/maps/api/staticmap?&zoom=15&size=210x175&maptype=roadmap
+&markers=color:blue%7Clabel:S%7C$location&markers=color:green%7Clabel:G%7C$location
+&markers=color:red%7Clabel:C%7C$location
+&key=".SettingsManager::getInstance()->getSetting('System: Google Maps Api Key');
+
+ LogManager::getInstance()->info('Url:'.$url);
+
+ $data = file_get_contents($url);
+
+ //LogManager::getInstance()->info('Data:'.$data);
+ if (!empty($data)) {
+ //LogManager::getInstance()->info('Data Base64:'.base64_encode($data));
+ return'data:image/png;base64,' . base64_encode($data);
+ }
+
+ return null;
+
+ }
}
diff --git a/core/src/Attendance/User/Api/AttendanceActionManager.php b/core/src/Attendance/User/Api/AttendanceActionManager.php
index 07407134..9a13a15d 100644
--- a/core/src/Attendance/User/Api/AttendanceActionManager.php
+++ b/core/src/Attendance/User/Api/AttendanceActionManager.php
@@ -17,6 +17,7 @@ use Classes\SettingsManager;
use Classes\SubActionManager;
use TimeSheets\Common\Model\EmployeeTimeSheet;
use Utils\LogManager;
+use Utils\NetworkUtils;
class AttendanceActionManager extends SubActionManager
{
@@ -132,6 +133,7 @@ class AttendanceActionManager extends SubActionManager
$openPunch->out_time = $dateTime;
$openPunch->note = $req->note;
$openPunch->image_out = $req->image;
+ $openPunch->out_ip = NetworkUtils::getClientIp();
$this->baseService->audit(IceConstants::AUDIT_ACTION, "Punch Out \ time:".$openPunch->out_time);
} else {
$openPunch->in_time = $dateTime;
@@ -139,6 +141,7 @@ class AttendanceActionManager extends SubActionManager
$openPunch->note = $req->note;
$openPunch->image_in = $req->image;
$openPunch->employee = $employee->id;
+ $openPunch->in_ip = NetworkUtils::getClientIp();
$this->baseService->audit(IceConstants::AUDIT_ACTION, "Punch In \ time:".$openPunch->in_time);
}
$ok = $openPunch->Save();
diff --git a/core/src/Classes/AbstractInitialize.php b/core/src/Classes/AbstractInitialize.php
index e0e24921..da2da717 100644
--- a/core/src/Classes/AbstractInitialize.php
+++ b/core/src/Classes/AbstractInitialize.php
@@ -1,25 +1,4 @@
.
-
-------------------------------------------------------------------
-
-Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]
-Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
- */
namespace Classes;
abstract class AbstractInitialize
diff --git a/core/src/Classes/BaseService.php b/core/src/Classes/BaseService.php
index b4e84b08..c818e3fc 100644
--- a/core/src/Classes/BaseService.php
+++ b/core/src/Classes/BaseService.php
@@ -1,27 +1,5 @@
.
-
-------------------------------------------------------------------
-
-Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]
-Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
- */
-
/**
* BaseService class serves as the core logic for managing the application and for handling most
* of the tasks related to retriving and saving data. This can be referred within any module using
@@ -74,6 +52,8 @@ class BaseService
public $modelClassMap = array();
public $currentProfileId = false;
+ protected $pro = null;
+
private static $me = null;
private function __construct()
@@ -1098,6 +1078,42 @@ class BaseService
return $obj;
}
+ public function cleanUpIgnoreKeys($obj)
+ {
+ unset($obj->keysToIgnore);
+
+ return $obj;
+ }
+
+ public function cleanUpApprovalModelParameters($obj)
+ {
+ unset($obj->notificationModuleName);
+ unset($obj->notificationUnitName);
+ unset($obj->notificationUnitPrefix);
+ unset($obj->notificationUnitAdminUrl);
+ unset($obj->preApproveSettingName);
+
+ return $obj;
+ }
+
+ public function cleanUpAll($obj)
+ {
+ $obj = $this->cleanUpAdoDB($obj);
+ $obj = $this->cleanUpIgnoreKeys($obj);
+
+ return $obj;
+ }
+
+ public function cleanUpUser($obj)
+ {
+ $obj = $this->cleanUpAdoDB($obj);
+ unset($obj->password);
+ unset($obj->login_hash);
+ unset($obj->googleUserData);
+
+ return $obj;
+ }
+
public function setDB($db)
{
$this->db = $db;
@@ -1529,6 +1545,26 @@ class BaseService
return call_user_func_array(array(new $class(), $ch->method), $parameters);
}
+ public function initializePro()
+ {
+ $this->pro = null;
+ if (class_exists('\\Classes\\ProVersion')) {
+ $pro = new ProVersion();
+ if (method_exists($pro, 'isModuleEnabled')) {
+ $this->pro = $pro;
+ }
+ }
+ }
+
+ public function isModuleEnabled($type, $name)
+ {
+ if ($this->pro === null) {
+ return true;
+ }
+
+ return $this->pro->isModuleEnabled($type, $name);
+ }
+
public function cleanNonUTFChar($obj)
{
$regex = <<<'END'
diff --git a/core/src/Classes/FileService.php b/core/src/Classes/FileService.php
index 3e7f4987..492a8549 100644
--- a/core/src/Classes/FileService.php
+++ b/core/src/Classes/FileService.php
@@ -1,25 +1,4 @@
.
-
-------------------------------------------------------------------
-
-Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]
-Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
- */
namespace Classes;
use Model\File;
diff --git a/core/src/Classes/Migration/MigrationManager.php b/core/src/Classes/Migration/MigrationManager.php
index e4862fd3..44d38e57 100644
--- a/core/src/Classes/Migration/MigrationManager.php
+++ b/core/src/Classes/Migration/MigrationManager.php
@@ -228,7 +228,7 @@ class MigrationManager
if (count($migrationList) > 0 && (empty($migration->id) || $migrationList[0].".php" != $migration->file)) {
LogManager::getInstance()->info("ensureMigrations - execute migrations");
$this->queueMigrations();
- $this->runPendingMigrations();
}
+ $this->runPendingMigrations();
}
}
diff --git a/core/src/Classes/RestEndPoint.php b/core/src/Classes/RestEndPoint.php
index 50119c1d..41e57477 100644
--- a/core/src/Classes/RestEndPoint.php
+++ b/core/src/Classes/RestEndPoint.php
@@ -3,6 +3,7 @@ namespace Classes;
use Classes\Data\DataReader;
use Classes\Data\Query\DataQuery;
+use Classes\Upload\Uploader;
use Employees\Common\Model\Employee;
use Users\Common\Model\User;
use Utils\SessionUtils;
@@ -327,4 +328,26 @@ class RestEndPoint
$inputJSON = file_get_contents('php://input');
return json_decode($inputJSON, true);
}
+
+ protected function getFile()
+ {
+ return $_FILES;
+ }
+
+ public function uploadFile(User $user)
+ {
+ $fileData = $this->getFile();
+ $postData = [
+ 'file_name' => '_NEW_',
+ 'user' => $user->employee,
+ 'file_group' => static::ELEMENT_NAME
+ ];
+
+ $fileResponse = Uploader::upload($postData, $fileData);
+ if ($fileResponse->getStatus() === IceResponse::SUCCESS) {
+ return new IceResponse(IceResponse::SUCCESS, ['data' => $fileResponse->getData()], 201);
+ }
+
+ return $fileResponse;
+ }
}
diff --git a/core/src/Classes/SubActionManager.php b/core/src/Classes/SubActionManager.php
index 654eef94..3114c6ff 100644
--- a/core/src/Classes/SubActionManager.php
+++ b/core/src/Classes/SubActionManager.php
@@ -1,25 +1,4 @@
.
-
-------------------------------------------------------------------
-
-Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]
-Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
- */
namespace Classes;
abstract class SubActionManager
@@ -56,16 +35,19 @@ abstract class SubActionManager
$this->emailTemplates = $emailTemplates;
}
- public function getEmailTemplate($name)
+ public function getEmailTemplate($name, $modulePath = null)
{
+ if ($modulePath == null) {
+ $modulePath = MODULE_PATH;
+ }
//Read module email templates
if ($this->emailTemplates == null) {
$this->emailTemplates = array();
- if (is_dir(MODULE_PATH.'/emailTemplates/')) {
- $ams = scandir(MODULE_PATH.'/emailTemplates/');
+ if (is_dir($modulePath.'/emailTemplates/')) {
+ $ams = scandir($modulePath.'/emailTemplates/');
foreach ($ams as $am) {
- if (!is_dir(MODULE_PATH.'/emailTemplates/'.$am) && $am != '.' && $am != '..') {
- $this->emailTemplates[$am] = file_get_contents(MODULE_PATH.'/emailTemplates/'.$am);
+ if (!is_dir($modulePath.'/emailTemplates/'.$am) && $am != '.' && $am != '..') {
+ $this->emailTemplates[$am] = file_get_contents($modulePath.'/emailTemplates/'.$am);
}
}
}
diff --git a/core/src/Classes/UIManager.php b/core/src/Classes/UIManager.php
index b7dee9ad..992388e1 100644
--- a/core/src/Classes/UIManager.php
+++ b/core/src/Classes/UIManager.php
@@ -87,37 +87,43 @@ class UIManager
$this->currentProfileBlock = array(
"profileImage"=>$profileCurrent->image,
"firstName"=>$profileCurrent->first_name,
- "lastName"=>$profileCurrent->last_name
+ "lastName"=>$profileCurrent->last_name,
+ "profile_url"=>CLIENT_BASE_URL.'?g=admin&n=employees&m=admin_Employees',
);
$this->switchedProfileBlock = array(
"profileImage"=>$profileSwitched->image,
"firstName"=>$profileSwitched->first_name,
- "lastName"=>$profileSwitched->last_name
+ "lastName"=>$profileSwitched->last_name,
+ "profile_url"=>CLIENT_BASE_URL.'?g=modules&n=employees&m=module_Personal_Information',
);
} elseif (!empty($profileCurrent)) {
$this->currentProfileBlock = array(
"profileImage"=>$profileCurrent->image,
"firstName"=>$profileCurrent->first_name,
- "lastName"=>$profileCurrent->last_name
+ "lastName"=>$profileCurrent->last_name,
+ "profile_url"=>CLIENT_BASE_URL.'?g=modules&n=employees&m=module_Personal_Information',
);
} elseif (!empty($profileSwitched)) {
$this->currentProfileBlock = array(
"profileImage"=>BASE_URL."images/user_male.png",
"firstName"=>$this->user->username,
- "lastName"=>""
+ "lastName"=>"",
+ "profile_url"=>CLIENT_BASE_URL.'?g=admin&n=employees&m=admin_Employees',
);
$this->switchedProfileBlock = array(
"profileImage"=>$profileSwitched->image,
"firstName"=>$profileSwitched->first_name,
- "lastName"=>$profileSwitched->last_name
+ "lastName"=>$profileSwitched->last_name,
+ "profile_url"=>CLIENT_BASE_URL.'?g=modules&n=employees&m=module_Personal_Information',
);
} else {
$this->currentProfileBlock = array(
"profileImage"=>BASE_URL."images/user_male.png",
"firstName"=>$this->user->username,
- "lastName"=>""
+ "lastName"=>"",
+ "profile_url"=>CLIENT_BASE_URL.'?g=admin&n=employees&m=admin_Employees',
);
}
}
diff --git a/core/src/Company/Common/Model/Timezone.php b/core/src/Company/Common/Model/Timezone.php
index d3bfe523..74703eac 100644
--- a/core/src/Company/Common/Model/Timezone.php
+++ b/core/src/Company/Common/Model/Timezone.php
@@ -21,4 +21,43 @@ class Timezone extends BaseModel
{
return array("get","element");
}
+
+ public function getTimezonesWithOffset()
+ {
+ $tz = new Timezone();
+ $tzs = $tz->Find("1 = 1");
+ $modifiedTimeZones = [];
+ foreach ($tzs as $tz) {
+ try {
+ $z = new \DateTimeZone($tz->name);
+ $c = new \DateTime(null, $z);
+ $tz->details = sprintf("(%s) %s", $this->formatOffset($z->getOffset($c)), $tz->name);
+ $modifiedTimeZones[] = $tz;
+ } catch (\Exception $e) {
+ }
+
+ }
+
+ usort($modifiedTimeZones, function ($a, $b) { return strcmp($a->details, $b->details); });
+ return $modifiedTimeZones;
+ }
+
+ public function formatOffset($offset) {
+ $hours = $offset / 3600;
+ $remainder = $offset % 3600;
+ $sign = $hours > 0 ? '+' : '-';
+ $hour = (int) abs($hours);
+ $minutes = (int) abs($remainder / 60);
+
+ if ($hour == 0 AND $minutes == 0) {
+ $sign = ' ';
+ }
+ return 'GMT' . $sign . str_pad($hour, 2, '0', STR_PAD_LEFT)
+ .':'. str_pad($minutes,2, '0');
+ }
+
+ public function fieldValueMethods()
+ {
+ return ['getTimezonesWithOffset'];
+ }
}
diff --git a/core/src/Metadata/Rest/MetadataRestEndPoint.php b/core/src/Metadata/Rest/MetadataRestEndPoint.php
index b7a96321..d323f565 100644
--- a/core/src/Metadata/Rest/MetadataRestEndPoint.php
+++ b/core/src/Metadata/Rest/MetadataRestEndPoint.php
@@ -1,6 +1,7 @@
Find('name = ? and mod_group = ? and status = ?', [$name, 'user', 'Enabled']);
- return count($modules) > 0;
+ BaseService::getInstance()->initializePro();
+
+ return count($modules) > 0 && BaseService::getInstance()->isModuleEnabled('modules', $name);
}
}
diff --git a/core/src/Model/Cron.php b/core/src/Model/Cron.php
index 89cfa31f..ec37a11d 100644
--- a/core/src/Model/Cron.php
+++ b/core/src/Model/Cron.php
@@ -8,6 +8,18 @@
namespace Model;
+/**
+ * Class Cron
+ * @package Model
+ *
+ * @property int $id
+ * @property string $name
+ * @property string $class
+ * @property int $frequency
+ * @property int $time
+ * @property string $type
+ * @property string $status
+ */
class Cron extends BaseModel
{
public $table = 'Crons';
diff --git a/core/src/Model/Setting.php b/core/src/Model/Setting.php
index c9132c52..c8f39274 100644
--- a/core/src/Model/Setting.php
+++ b/core/src/Model/Setting.php
@@ -9,6 +9,7 @@
namespace Model;
use Classes\BaseService;
+use Classes\IceResponse;
use Classes\RestApiManager;
use Users\Common\Model\User;
@@ -41,10 +42,10 @@ class Setting extends BaseModel
return $obj;
}
- public function executePostSaveActions($obj)
+ public function validateSave($obj)
{
if (!defined('WEB_ADMIN_BASE_URL')) {
- return;
+ return new IceResponse(IceResponse::SUCCESS, "");
}
if ($obj->name == 'Company: Country') {
@@ -57,12 +58,42 @@ class Setting extends BaseModel
$updateInvUrl = WEB_ADMIN_BASE_URL.'/app/update_instance.php?client='
.CLIENT_NAME.'&vatId='.$obj->value.'&key='.ADMIN_SEC_KEY;
$response = file_get_contents($updateInvUrl);
+ $response = json_decode($response, true);
+ if ($response['status'] === IceResponse::ERROR) {
+ return new IceResponse(IceResponse::ERROR, $response['data']);
+ }
}
+ return new IceResponse(IceResponse::SUCCESS, "");
+ }
+
+ public function executePreSaveActions($obj)
+ {
+ if ($obj->name == 'Leave: Select Leave Period from Employee Department Country') {
+ $oldSetting = new Setting();
+ $oldSetting->Load('name = ?', ['Leave: Select Leave Period from Employee Department Country']);
+ if (class_exists('\Leaves\Common\Model\EmployeeLeave')) {
+ $employeeLeave = new \Leaves\Common\Model\EmployeeLeave();
+ $employeeLeaves = $employeeLeave->Find("1 = 1 limit 1", []);
+ if (count($employeeLeaves) === 1) {
+ $obj->value = $oldSetting->value;
+ }
+ }
+ }
+
+ return new IceResponse(IceResponse::SUCCESS, $obj);
+ }
+
+ public function executePreUpdateActions($obj)
+ {
+ return $this->executePreSaveActions($obj);
+ }
+
+ public function executePostSaveActions($obj)
+ {
}
public function executePostUpdateActions($obj)
{
- $this->executePostSaveActions($obj);
}
public $table = 'Settings';
diff --git a/core/src/Projects/Common/Model/Project.php b/core/src/Projects/Common/Model/Project.php
index 21728620..f515f94a 100644
--- a/core/src/Projects/Common/Model/Project.php
+++ b/core/src/Projects/Common/Model/Project.php
@@ -82,4 +82,9 @@ class Project extends BaseModel
return $employeeProjects;
}
+
+ public function fieldValueMethods()
+ {
+ return ['getEmployeeProjects'];
+ }
}
diff --git a/core/src/Settings/Admin/Api/SettingsAdminManager.php b/core/src/Settings/Admin/Api/SettingsAdminManager.php
index a3c60409..a6797efc 100644
--- a/core/src/Settings/Admin/Api/SettingsAdminManager.php
+++ b/core/src/Settings/Admin/Api/SettingsAdminManager.php
@@ -9,6 +9,7 @@
namespace Settings\Admin\Api;
use Classes\AbstractModuleManager;
+use Settings\Rest\SettingsRestEndPoint;
class SettingsAdminManager extends AbstractModuleManager
{
@@ -35,4 +36,12 @@ class SettingsAdminManager extends AbstractModuleManager
{
return new SettingsInitialize();
}
+
+ public function setupRestEndPoints()
+ {
+ \Classes\Macaw::get(REST_API_PATH.'settings', function () {
+ $restEndPoint = new SettingsRestEndPoint();
+ $restEndPoint->process('getMobileSettings', []);
+ });
+ }
}
diff --git a/core/src/TimeSheets/User/Api/TimeSheetsActionManager.php b/core/src/TimeSheets/User/Api/TimeSheetsActionManager.php
index bb42e97a..ee1d3bad 100644
--- a/core/src/TimeSheets/User/Api/TimeSheetsActionManager.php
+++ b/core/src/TimeSheets/User/Api/TimeSheetsActionManager.php
@@ -301,10 +301,10 @@ class TimeSheetsActionManager extends SubActionManager
$project = new $rowTable();
if (SettingsManager::getInstance()->getSetting("Projects: Make All Projects Available to Employees") == "1") {
- $projectList = $project->Find("1 = 1");
+ $projectList = $project->Find("1 = 1 order by name");
} else {
$projectList = $project->Find(
- "id in (select project from EmployeeProjects where employee = ?)",
+ "id in (select project from EmployeeProjects where employee = ?) order by name",
array(BaseService::getInstance()->getCurrentProfileId())
);
}
diff --git a/core/src/Users/Admin/Api/UsersEmailSender.php b/core/src/Users/Admin/Api/UsersEmailSender.php
index 2385c816..e40e922a 100644
--- a/core/src/Users/Admin/Api/UsersEmailSender.php
+++ b/core/src/Users/Admin/Api/UsersEmailSender.php
@@ -47,7 +47,7 @@ class UsersEmailSender
} else {
LogManager::getInstance()->info("[sendWelcomeUserEmail] email is empty");
}
-
+
return false;
}
}
diff --git a/core/src/Users/Common/Model/User.php b/core/src/Users/Common/Model/User.php
index 895fd83a..3223c5bf 100644
--- a/core/src/Users/Common/Model/User.php
+++ b/core/src/Users/Common/Model/User.php
@@ -8,7 +8,6 @@ namespace Users\Common\Model;
use Classes\BaseService;
use Model\BaseModel;
use Classes\IceResponse;
-use Modules\Common\Model\Module;
class User extends BaseModel
{
@@ -57,23 +56,6 @@ class User extends BaseModel
}
}
- //Check if the user have rights to the default module
- if (!empty($obj->default_module)) {
- $module = new Module();
- $module->Load("id = ?", array($obj->default_module));
- if ($module->mod_group == "user") {
- $module->mod_group = "modules";
- }
- $moduleManager = BaseService::getInstance()->getModuleManager($module->mod_group, $module->name);
- if (!BaseService::getInstance()->isModuleAllowedForGivenUser($moduleManager, $obj)) {
- return new IceResponse(
- IceResponse::ERROR,
- "This module can not be set as the default module for
- the user since the user do not have access to this module"
- );
- }
- }
-
return new IceResponse(IceResponse::SUCCESS, "");
}
diff --git a/core/src/Utils/CalendarTools.php b/core/src/Utils/CalendarTools.php
index f9766990..b8f6ce4f 100644
--- a/core/src/Utils/CalendarTools.php
+++ b/core/src/Utils/CalendarTools.php
@@ -65,11 +65,28 @@ class CalendarTools
return $time->format($format);
}
- public static function getNumberOfDaysBetweenDates($first, $second)
+ public static function getNumberOfDaysBetweenDates($later, $earlier)
{
- $timeFirst = new \DateTime($first);
- $timeSecond = new \DateTime($second);
+ $timeFirst = new \DateTime($later);
+ $timeSecond = new \DateTime($earlier);
$interval = $timeSecond->diff($timeFirst);
- return intval($interval->format('%a'));
+ return intval($interval->format('%a')) + 1;
+ }
+
+ public static function getNumberOfMonthsBetweenDates($date1, $date2)
+ {
+ $begin = new \DateTime($date1);
+ $end = new \DateTime($date2);
+ $end = $end->modify('+1 day');
+
+ $interval = \DateInterval::createFromDateString('1 month');
+
+ $period = new \DatePeriod($begin, $interval, $end);
+ $counter = 0;
+ foreach ($period as $dt) {
+ $counter++;
+ }
+
+ return $counter;
}
}
diff --git a/core/src/Utils/NetworkUtils.php b/core/src/Utils/NetworkUtils.php
new file mode 100644
index 00000000..b61e3b4d
--- /dev/null
+++ b/core/src/Utils/NetworkUtils.php
@@ -0,0 +1,26 @@
+
\ No newline at end of file
+
diff --git a/core/templates/app/switched_profile_info.html b/core/templates/app/switched_profile_info.html
index 54520a8d..ed636210 100644
--- a/core/templates/app/switched_profile_info.html
+++ b/core/templates/app/switched_profile_info.html
@@ -1,11 +1,11 @@
-
+
- 
+
-
-
+
-
'),a=this.showDelete?a.replace("_delete_",'
'):a.replace("_delete_",""),a=(a=(a=this.showEdit?a.replace("_edit_",'
'):a.replace("_edit_","")).replace(/_id_/g,e)).replace(/_BASE_/g,this.baseUrl)}}]),t}(),d=function(e){function t(){return s(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return u(t,i.default),l(t,[{key:"getDataMapping",value:function(){return["id","employee","status"]}},{key:"getHeaders",value:function(){return[{sTitle:"ID",bVisible:!1},{sTitle:"Employee"},{sTitle:"Clocked In Status"}]}},{key:"getFormFields",value:function(){return[]}},{key:"getFilters",value:function(){return[["employee",{label:"Employee",type:"select2","allow-null":!1,"remote-source":["Employee","id","first_name+last_name"]}]]}},{key:"getActionButtonsHtml",value:function(e,t){var a='';return a=a.replace(/_BASE_/g,this.baseUrl),"Not Clocked In"==t[2]?a=a.replace(/_COLOR_/g,"gray"):"Clocked Out"==t[2]?a=a.replace(/_COLOR_/g,"yellow"):"Clocked In"==t[2]&&(a=a.replace(/_COLOR_/g,"green")),a}},{key:"isSubProfileTable",value:function(){return"Admin"!==this.user.user_level}}]),t}();t.exports={AttendanceAdapter:c,AttendanceStatusAdapter:d}},{"../../../api/AdapterBase":4,"../../../api/FormValidation":5}],3:[function(e,t,a){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var l=function(){function e(e,t){for(var a=0;a
'):a.replace("_clone_",""),a=this.showDelete?a.replace("_delete_",'
'),a=this.showDelete?a.replace("_delete_",'
')).replace(/_id_/g,e)).replace(/_status_/g,t[6])).replace(/_BASE_/g,this.baseUrl)}},{key:"get",value:function(e){$("#PayrollData").hide(),$("#PayrollForm").hide(),$("#PayrollDataButtons").hide(),$("#Payroll").show(),modJsList.tabPayrollData.setCurrentPayroll(null),i(t.prototype.__proto__||Object.getPrototypeOf(t.prototype),"get",this).call(this,e)}}]),t}(),h=function(e){function t(e,a,l,i){s(this,t);var n=u(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e,a,l,i));return n.cellDataUpdates={},n.payrollId=null,n}return d(t,o.default),l(t,[{key:"validateCellValue",value:function(e,t,a){return modJs.addCellDataUpdate(e.data("colId"),e.data("rowId"),a),!0}},{key:"setCurrentPayroll",value:function(e){this.payrollId=e}},{key:"addAdditionalRequestData",value:function(e,t){return"updateData"===e?t.payrollId=this.payrollId:"updateAllData"===e?t.payrollId=this.payrollId:"getAllData"===e&&(t.payrollId=this.payrollId),t}},{key:"modifyCSVHeader",value:function(e){return e.unshift(""),e}},{key:"getCSVData",value:function(){for(var e="",t=0;t
