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

Release note v16.0

Browse Source 
------------------
### Features
 * Advanced Employee Management Module is now included in IceHrm Open Source Edition
 * LDAP Module which was only available in IceHrm Enterprise is now included in open source also
 * Initial implementation of icehrm REST Api for reading employee details
 * Improvements to data filtering
 * Multiple tabs for settings module
 * Overtime reports - now its possible to calculate overtime for employees.compatible with US overtime rules
 * Logout the user if tried accessing an unauthorized module
 * Setting for updating module names

### Fixes
 * Fix issue: classes should be loaded even the module is disabled
 * Deleting the only Admin user is not allowed
 * Fixes for handling non UTF-8
 * Fix for non-mandatory select boxes are shown as mandatory
This commit is contained in:
Thilina Hasantha
2016-04-15 20:24:39 +05:30
parent 301ea64832
commit 31bb455d6f
71 changed files with 7322 additions and 2813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
ext/admin/metadata/api/MetadataAdminManager.php
View File

@@ -22,6 +22,7 @@ if (!class_exists('MetadataAdminManager')) {
$this->addModelClass('Nationality');
$this->addModelClass('ImmigrationStatus');
$this->addModelClass('Ethnicity');
$this->addModelClass('CalculationHook');
}
}
@@ -42,6 +43,20 @@ if (!class_exists('Country')) {
public function getAnonymousAccess(){
return array("get","element");
}
function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array()){
$allowedCountriesStr = SettingsManager::getInstance()->getSetting('System: Allowed Countries');
$allowedCountries = array();
if(!empty($allowedCountriesStr)){
$allowedCountries = json_decode($allowedCountriesStr,true);
}
if(!empty($allowedCountries)){
return parent::Find("id in (".implode(",",$allowedCountries).")" , array());
}
return parent::Find($whereOrderBy, $bindarr, $pkeysArr, $extra);
}
}
}
@@ -79,6 +94,20 @@ if (!class_exists('CurrencyType')) {
public function getAnonymousAccess(){
return array("get","element");
}
function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array()){
$allowedCountriesStr = SettingsManager::getInstance()->getSetting('System: Allowed Currencies');
$allowedCountries = array();
if(!empty($allowedCountriesStr)){
$allowedCountries = json_decode($allowedCountriesStr,true);
}
if(!empty($allowedCountries)){
return parent::Find("id in (".implode(",",$allowedCountries).")" , array());
}
return parent::Find($whereOrderBy, $bindarr, $pkeysArr, $extra);
}
}
}
@@ -98,6 +127,22 @@ if (!class_exists('Nationality')) {
public function getAnonymousAccess(){
return array("get","element");
}
function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array()){
$allowedCountriesStr = SettingsManager::getInstance()->getSetting('System: Allowed Nationality');
$allowedCountries = array();
if(!empty($allowedCountriesStr)){
$allowedCountries = json_decode($allowedCountriesStr,true);
}
if(!empty($allowedCountries)){
return parent::Find("id in (".implode(",",$allowedCountries).")" , array());
}
return parent::Find($whereOrderBy, $bindarr, $pkeysArr, $extra);
}
}
}
@@ -139,6 +184,32 @@ if (!class_exists('Ethnicity')) {
}
}
if (!class_exists('CalculationHook')) {
class CalculationHook extends ICEHRM_Record {
var $_table = 'CalculationHooks';
public function getAdminAccess(){
return array("get","element","save","delete");
}
public function getUserAccess(){
return array();
}
public function getAnonymousAccess(){
return array("get","element");
}
function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array()){
return BaseService::getInstance()->getCalculationHooks();
}
function Load($where=null,$bindarr=false){
return BaseService::getInstance()->getCalculationHook($bindarr[0]);
}
}
}