Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot[bot]
37583bad35 Bump browserslist from 4.11.1 to 4.16.6
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.11.1 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.11.1...4.16.6)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-26 11:00:30 +00:00
28 changed files with 34252 additions and 398718 deletions

View File

@@ -19,9 +19,6 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
<div class="tab-pane active" id="tabPageEmployeeFieldName">
<div id="EmployeeFieldName" class="reviewBlock" data-content="List" style="padding-left:5px;">
</div>
<div id="EmployeeFieldNameForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
</div>
</div>
</div>

View File

@@ -28,23 +28,20 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
<div id="JobTitleForm"></div>
<div id="JobTitleFilterForm"></div>
</div>
<div class="tab-pane" id="tabPagePayGrades">
<div id="PayGradeTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
<div id="PayGradeForm"></div>
<div id="PayGradeFilterForm"></div>
</div>
<div class="tab-pane" id="tabPageEmploymentStatus">
<div id="EmploymentStatusTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
<div id="EmploymentStatusForm"></div>
<div id="EmploymentStatusFilterForm"></div>
</div>
</div>
</div>
<div id="dataGroup"></div>
<?php
$moduleData = [
'user_level' => $user->user_level,

View File

@@ -4,17 +4,12 @@
Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
*/
use Classes\PermissionManager;
use Loans\Common\Model\CompanyLoan;
use Loans\Common\Model\EmployeeCompanyLoan;
$moduleName = 'loans';
$moduleGroup = 'admin';
define('MODULE_PATH',dirname(__FILE__));
include APP_BASE_PATH.'header.php';
include APP_BASE_PATH.'modulejslibs.inc.php';
?>
<div class="span9">
?><div class="span9">
<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
<li class="active"><a id="tabCompanyLoan" href="#tabPageCompanyLoan"><?=t('Loan Types')?></a></li>
@@ -23,32 +18,31 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
<div class="tab-content">
<div class="tab-pane active" id="tabPageCompanyLoan">
<div id="CompanyLoanTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
<div id="CompanyLoanForm"></div>
<div id="CompanyLoanFilterForm"></div>
<div id="CompanyLoan" class="reviewBlock" data-content="List" style="padding-left:5px;">
</div>
<div id="CompanyLoanForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
</div>
</div>
<div class="tab-pane" id="tabPageEmployeeCompanyLoan">
<div id="EmployeeCompanyLoanTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
<div id="EmployeeCompanyLoanForm"></div>
<div id="EmployeeCompanyLoanFilterForm"></div>
<div id="EmployeeCompanyLoan" class="reviewBlock" data-content="List" style="padding-left:5px;">
</div>
<div id="EmployeeCompanyLoanForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
</div>
</div>
</div>
</div>
<?php
$moduleData = [
'user_level' => $user->user_level,
'permissions' => [
'CompanyLoan' => PermissionManager::checkGeneralAccess(new CompanyLoan()),
'EmployeeCompanyLoan' => PermissionManager::checkGeneralAccess(new EmployeeCompanyLoan()),
]
];
?>
<script>
initAdminLoan(<?=json_encode($moduleData)?>);
</script>
var modJsList = new Array();
modJsList['tabCompanyLoan'] = new CompanyLoanAdapter('CompanyLoan','CompanyLoan');
modJsList['tabEmployeeCompanyLoan'] = new EmployeeCompanyLoanAdapter('EmployeeCompanyLoan','EmployeeCompanyLoan');
var modJs = modJsList['tabCompanyLoan'];
</script>
<?php include APP_BASE_PATH.'footer.php';?>

View File

@@ -1,9 +1,4 @@
<?php
use Classes\PermissionManager;
use Salary\Common\Model\SalaryComponentType;
use Salary\Common\Model\SalaryComponent;
use Salary\Common\Model\EmployeeSalary;
$moduleName = 'salary';
$moduleGroup = 'admin';
@@ -11,7 +6,7 @@ define('MODULE_PATH',dirname(__FILE__));
include APP_BASE_PATH.'header.php';
include APP_BASE_PATH.'modulejslibs.inc.php';
/*$moduleBuilder = new \Classes\ModuleBuilder\ModuleBuilder();
$moduleBuilder = new \Classes\ModuleBuilder\ModuleBuilder();
$moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
'SalaryComponentType','SalaryComponentType','Salary Component Types','SalaryComponentTypeAdapter','','',true
@@ -26,55 +21,4 @@ $moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
echo \Classes\UIManager::getInstance()->renderModule($moduleBuilder);
include APP_BASE_PATH.'footer.php';*/
?><div class="span9">
<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
<li class="active"><a id="tabSalaryComponentType" href="#tabSalaryComponentType"><?=t('Salary Component Types')?></a></li>
<li><a id="tabSalaryComponent" href="#tabPageSalaryComponent"><?=t('Salary Components')?></a></li>
<li><a id="tabEmployeeSalary" href="#tabPageEmployeeSalary"><?=t('Employee Salary Components')?></a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="tabPageSalaryComponentType">
<div id="SalaryComponentTypeTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
<div id="SalaryComponentTypeForm"></div>
<div id="SalaryComponentTypeFilterForm"></div>
</div>
<div class="tab-pane" id="tabPageSalaryComponent">
<div id="SalaryComponentTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
<div id="SalaryComponentForm"></div>
<div id="SalaryComponentFilterForm"></div>
</div>
<div class="tab-pane" id="tabPageEmployeeSalary">
<div id="EmployeeSalaryTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
<div id="EmployeeSalaryForm"></div>
<div id="EmployeeSalaryFilterForm"></div>
</div>
</div>
</div>
<?php
$moduleData = [
'user_level' => $user->user_level,
'permissions' => [
'SalaryComponentType' => PermissionManager::checkGeneralAccess(new SalaryComponentType()),
'SalaryComponent' => PermissionManager::checkGeneralAccess(new SalaryComponent()),
'EmployeeSalary' => PermissionManager::checkGeneralAccess(new EmployeeSalary()),
]
];
?>
<script>
initAdminSalary(<?=json_encode($moduleData)?>);
</script>
<?php include APP_BASE_PATH.'footer.php';?>
include APP_BASE_PATH.'footer.php';

View File

@@ -4,9 +4,6 @@
Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
*/
use Classes\PermissionManager;
use Loans\Common\Model\EmployeeCompanyLoan;
$moduleName = 'loans';
$moduleGroup = 'modules';
define('MODULE_PATH',dirname(__FILE__));
@@ -20,27 +17,26 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
<div class="tab-content">
<div class="tab-pane active" id="tabPageEmployeeCompanyLoan">
<div id="EmployeeCompanyLoan" class="reviewBlock" data-content="List" style="padding-left:5px;">
<div id="EmployeeCompanyLoanTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
<div id="EmployeeCompanyLoanForm"></div>
<div id="EmployeeCompanyLoanFilterForm"></div>
</div>
<div id="EmployeeCompanyLoanForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
</div>
</div>
</div>
</div>
<?php
$moduleData = [
'user_level' => $user->user_level,
'permissions' => [
'EmployeeCompanyLoan' => PermissionManager::checkGeneralAccess(new EmployeeCompanyLoan()),
]
];
?>
<script>
initAdminLoan(<?=json_encode($moduleData)?>);
</script>
var modJsList = new Array();
modJsList['tabEmployeeCompanyLoan'] = new EmployeeCompanyLoanAdapter('EmployeeCompanyLoan','EmployeeCompanyLoan');
modJsList['tabEmployeeCompanyLoan'].setShowAddNew(false);
modJsList['tabEmployeeCompanyLoan'].setShowSave(false);
modJsList['tabEmployeeCompanyLoan'].setShowDelete(false);
modJsList['tabEmployeeCompanyLoan'].setShowEdit(true);
var modJs = modJsList['tabEmployeeCompanyLoan'];
</script>
<?php include APP_BASE_PATH.'footer.php';?>

View File

@@ -4,9 +4,6 @@
Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
*/
use Classes\PermissionManager;
use Salary\Common\Model\EmployeeSalary;
$moduleName = 'salary';
$moduleGroup = 'modules';
define('MODULE_PATH',dirname(__FILE__));
@@ -20,25 +17,32 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
<div class="tab-content">
<div class="tab-pane active" id="tabPageEmployeeSalary">
<div id="EmployeeSalaryTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
<div id="EmployeeSalaryForm"></div>
<div id="EmployeeSalaryFilterForm"></div>
<div id="EmployeeSalary" class="reviewBlock" data-content="List" style="padding-left:5px;">
</div>
<div id="EmployeeSalaryForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
</div>
</div>
</div>
</div>
<?php
$moduleData = [
'user_level' => $user->user_level,
'permissions' => [
'EmployeeSalary' => PermissionManager::checkGeneralAccess(new EmployeeSalary()),
]
];
?>
<script>
initAdminSalary(<?=json_encode($moduleData)?>);
var modJsList = new Array();
modJsList['tabEmployeeSalary'] = new EmployeeSalaryAdapter('EmployeeSalary');
<?php if(isset($modulePermissions['perm']['Add Salary']) && $modulePermissions['perm']['Add Salary'] == "No"){?>
modJsList['tabEmployeeSalary'].setShowAddNew(false);
<?php }?>
<?php if(isset($modulePermissions['perm']['Delete Salary']) && $modulePermissions['perm']['Delete Salary'] == "No"){?>
modJsList['tabEmployeeSalary'].setShowDelete(false);
<?php }?>
<?php if(isset($modulePermissions['perm']['Edit Salary']) && $modulePermissions['perm']['Edit Salary'] == "No"){?>
modJsList['tabEmployeeSalary'].setShowEdit(false);
<?php }?>
var modJs = modJsList['tabEmployeeSalary'];
</script>
<?php include APP_BASE_PATH.'footer.php';?>

125
package-lock.json generated
View File

@@ -2233,15 +2233,36 @@
}
},
"browserslist": {
"version": "4.11.1",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.11.1.tgz",
"integrity": "sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g==",
"version": "4.16.6",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
"integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
"dev": true,
"requires": {
"caniuse-lite": "^1.0.30001038",
"electron-to-chromium": "^1.3.390",
"node-releases": "^1.1.53",
"pkg-up": "^2.0.0"
"caniuse-lite": "^1.0.30001219",
"colorette": "^1.2.2",
"electron-to-chromium": "^1.3.723",
"escalade": "^3.1.1",
"node-releases": "^1.1.71"
},
"dependencies": {
"caniuse-lite": {
"version": "1.0.30001230",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz",
"integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==",
"dev": true
},
"electron-to-chromium": {
"version": "1.3.739",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz",
"integrity": "sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A==",
"dev": true
},
"node-releases": {
"version": "1.1.72",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz",
"integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==",
"dev": true
}
}
},
"buffer": {
@@ -2347,12 +2368,6 @@
}
}
},
"caniuse-lite": {
"version": "1.0.30001124",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001124.tgz",
"integrity": "sha512-zQW8V3CdND7GHRH6rxm6s59Ww4g/qGWTheoboW9nfeMg7sUoopIfKCcNZUjwYRCOrvereh3kwDpZj4VLQ7zGtA==",
"dev": true
},
"caseless": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@@ -2612,6 +2627,12 @@
"integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
"dev": true
},
"colorette": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
"integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
"dev": true
},
"combine-source-map": {
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz",
@@ -3498,12 +3519,6 @@
"safer-buffer": "^2.1.0"
}
},
"electron-to-chromium": {
"version": "1.3.397",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.397.tgz",
"integrity": "sha512-zcUd1p/7yzTSdWkCTrqGvbnEOASy96d0RJL/lc5BDJoO23Z3G/VHd0yIPbguDU9n8QNUTCigLO7oEdtOb7fp2A==",
"dev": true
},
"elliptic": {
"version": "6.5.3",
"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
@@ -3625,6 +3640,12 @@
"es6-symbol": "^3.1.1"
}
},
"escalade": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
"dev": true
},
"escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -3824,7 +3845,7 @@
},
"doctrine": {
"version": "1.5.0",
"resolved": "http://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
"integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
"dev": true,
"requires": {
@@ -6988,7 +7009,7 @@
},
"is-accessor-descriptor": {
"version": "0.1.6",
"resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
"dev": true,
"requires": {
@@ -7034,7 +7055,7 @@
},
"is-data-descriptor": {
"version": "0.1.4",
"resolved": "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
"dev": true,
"requires": {
@@ -8504,12 +8525,6 @@
}
}
},
"node-releases": {
"version": "1.1.53",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz",
"integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==",
"dev": true
},
"normalize-package-data": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -9097,60 +9112,6 @@
}
}
},
"pkg-up": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
"integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
"dev": true,
"requires": {
"find-up": "^2.1.0"
},
"dependencies": {
"find-up": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
"dev": true,
"requires": {
"locate-path": "^2.0.0"
}
},
"locate-path": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
"dev": true,
"requires": {
"p-locate": "^2.0.0",
"path-exists": "^3.0.0"
}
},
"p-limit": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
"integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
"dev": true,
"requires": {
"p-try": "^1.0.0"
}
},
"p-locate": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
"dev": true,
"requires": {
"p-limit": "^1.1.0"
}
},
"p-try": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
"dev": true
}
}
},
"plugin-error": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",

View File

@@ -1,6 +1,6 @@
# Release Notes IceHrm Open Source
## Release note v29.0.0.OS
##Release note v29.0.0.PRO
### 🧲 New features

View File

@@ -1,3 +1,4 @@
import { FieldNameAdapter } from './lib';
import { FieldNameAdapter, CustomFieldAdapter } from './lib';
window.FieldNameAdapter = FieldNameAdapter;
window.CustomFieldAdapter = CustomFieldAdapter;

View File

@@ -4,6 +4,7 @@
*/
import AdapterBase from '../../../api/AdapterBase';
import CustomFieldAdapter from '../../../api/CustomFieldAdapter';
/**
* FieldNameAdapter
@@ -43,4 +44,4 @@ class FieldNameAdapter extends AdapterBase {
}
module.exports = { FieldNameAdapter };
module.exports = { FieldNameAdapter, CustomFieldAdapter };

View File

@@ -3,24 +3,5 @@ import {
EmployeeCompanyLoanAdapter,
} from './lib';
import IceDataPipe from "../../../api/IceDataPipe";
function init(data) {
const modJsList = {};
modJsList.tabCompanyLoan = new CompanyLoanAdapter('CompanyLoan', 'CompanyLoan');
modJsList.tabCompanyLoan.setObjectTypeName('Company Loan');
modJsList.tabCompanyLoan.setDataPipe(new IceDataPipe(modJsList.tabCompanyLoan));
modJsList.tabCompanyLoan.setAccess(data.permissions.CompanyLoan);
modJsList.tabEmployeeCompanyLoan = new EmployeeCompanyLoanAdapter('EmployeeCompanyLoan', 'EmployeeCompanyLoan');
modJsList.tabEmployeeCompanyLoan.setObjectTypeName('Employee Company Loan');
modJsList.tabEmployeeCompanyLoan.setDataPipe(new IceDataPipe(modJsList.tabEmployeeCompanyLoan));
modJsList.tabEmployeeCompanyLoan.setAccess(data.permissions.EmployeeCompanyLoan);
window.modJs = modJsList.tabCompanyLoan;
window.modJsList = modJsList;
}
window.initAdminLoan = init;
window.CompanyLoanAdapter = CompanyLoanAdapter;
window.EmployeeCompanyLoanAdapter = EmployeeCompanyLoanAdapter;

View File

@@ -2,22 +2,13 @@
Copyright (c) 2018 [Glacies UG, Berlin, Germany] (http://glacies.de)
Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
*/
//import AdapterBase from '../../../api/AdapterBase';
import ReactModalAdapterBase from '../../../api/ReactModalAdapterBase';
import AdapterBase from '../../../api/AdapterBase';
/**
* CompanyLoanAdapter
*/
class CompanyLoanAdapter extends ReactModalAdapterBase {
constructor(endPoint, tab, filter, orderBy) {
super(endPoint, tab, filter, orderBy);
this.fieldNameMap = {};
this.hiddenFields = {};
this.tableFields = {};
this.formOnlyFields = {};
}
class CompanyLoanAdapter extends AdapterBase {
getDataMapping() {
return [
'id',
@@ -34,35 +25,13 @@ class CompanyLoanAdapter extends ReactModalAdapterBase {
];
}
getTableColumns() {
return [
{
title: 'Name',
dataIndex: 'name',
sorter: true,
},
{
title: 'Details',
dataIndex: 'details',
sorter: true,
}
];
}
getFormFields() {
if(this.showSave){
return [
['id', { label: 'ID', type: 'hidden' }],
['name', { label: 'Name', type: 'text', validation: '' }],
['details', { label: 'Details', type: 'textarea', validation: 'none' }],
];
}
return [
['id', { label: 'ID', type: 'hidden' }],
['name', { label: 'Name', type: 'text', validation: '' }],
['details', { label: 'Details', type: 'textarea', validation: 'none' }],
];
}
}
@@ -70,15 +39,7 @@ class CompanyLoanAdapter extends ReactModalAdapterBase {
* EmployeeCompanyLoanAdapter
*/
class EmployeeCompanyLoanAdapter extends ReactModalAdapterBase {
constructor(endPoint, tab, filter, orderBy) {
super(endPoint, tab, filter, orderBy);
this.fieldNameMap = {};
this.hiddenFields = {};
this.tableFields = {};
this.formOnlyFields = {};
}
class EmployeeCompanyLoanAdapter extends AdapterBase {
getDataMapping() {
return [
'id',
@@ -105,46 +66,6 @@ class EmployeeCompanyLoanAdapter extends ReactModalAdapterBase {
];
}
getTableColumns() {
return [
{
title: 'Employee',
dataIndex: 'employee',
sorter: true,
},
{
title: 'Loan Type',
dataIndex: 'loan',
sorter: true,
},
{
title: 'Loan Start Date',
dataIndex: 'start_date',
sorter: true,
},
{
title: 'Loan Period (Months)',
dataIndex: 'period_months',
sorter: true,
},
{
title: 'Currency',
dataIndex: 'currency',
sorter: true,
},
{
title: 'Amount',
dataIndex: 'amount',
sorter: true,
},
{
title: 'Status',
dataIndex: 'status',
sorter: true,
}
];
}
getFormFields() {
return [
['id', { label: 'ID', type: 'hidden' }],
@@ -176,5 +97,5 @@ class EmployeeCompanyLoanAdapter extends ReactModalAdapterBase {
module.exports = {
CompanyLoanAdapter,
EmployeeCompanyLoanAdapter
EmployeeCompanyLoanAdapter,
};

View File

@@ -4,33 +4,6 @@ import {
EmployeeSalaryAdapter,
} from './lib';
/*window.SalaryComponentTypeAdapter = SalaryComponentTypeAdapter;
window.SalaryComponentTypeAdapter = SalaryComponentTypeAdapter;
window.SalaryComponentAdapter = SalaryComponentAdapter;
window.EmployeeSalaryAdapter = EmployeeSalaryAdapter;*/
import IceDataPipe from "../../../api/IceDataPipe";
function init(data) {
const modJsList = [];
modJsList.tabSalaryComponentType = new SalaryComponentTypeAdapter('SalaryComponentType', 'SalaryComponentType');
modJsList.tabSalaryComponentType.setObjectTypeName('Salary Component Types');
modJsList.tabSalaryComponentType.setDataPipe(new IceDataPipe(modJsList.tabSalaryComponentType));
modJsList.tabSalaryComponentType.setAccess(data.permissions.tabSalaryComponentType);
modJsList.tabSalaryComponent = new SalaryComponentAdapter('SalaryComponent', 'SalaryComponent');
modJsList.tabSalaryComponent.setObjectTypeName('Salary components');
modJsList.tabSalaryComponent.setDataPipe(new IceDataPipe(modJsList.tabSalaryComponent));
modJsList.tabSalaryComponent.setAccess(data.permissions.SalaryComponent);
modJsList.tabEmployeeSalary = new EmployeeSalaryAdapter('EmployeeSalary', 'EmployeeSalary');
modJsList.tabEmployeeSalary.setObjectTypeName('Employee Salary');
modJsList.tabEmployeeSalary.setDataPipe(new IceDataPipe(modJsList.tabEmployeeSalary));
modJsList.tabEmployeeSalary.setAccess(data.permissions.EmployeeSalary);
//window.modJs = modJsList.tabEmployeeSalary;
window.modJs = modJsList.tabSalaryComponentType;
window.modJsList = modJsList;
}
window.initAdminSalary = init;
window.EmployeeSalaryAdapter = EmployeeSalaryAdapter;

View File

@@ -3,22 +3,13 @@
Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
*/
//import AdapterBase from '../../../api/AdapterBase';
import ReactModalAdapterBase from '../../../api/ReactModalAdapterBase';
import AdapterBase from '../../../api/AdapterBase';
/**
* SalaryComponentTypeAdapter
*/
class SalaryComponentTypeAdapter extends ReactModalAdapterBase {
constructor(endPoint, tab, filter, orderBy) {
super(endPoint, tab, filter, orderBy);
this.fieldNameMap = {};
this.hiddenFields = {};
this.tableFields = {};
this.formOnlyFields = {};
}
class SalaryComponentTypeAdapter extends AdapterBase {
getDataMapping() {
return [
'id',
@@ -35,29 +26,7 @@ class SalaryComponentTypeAdapter extends ReactModalAdapterBase {
];
}
getTableColumns() {
return [
{
title: 'Code',
dataIndex: 'code',
sorter: true,
},
{
title: 'Name',
dataIndex: 'name',
sorter: true,
}
];
}
getFormFields() {
if(this.showSave){
return [
['id', { label: 'ID', type: 'hidden' }],
['code', { label: 'Code', type: 'text', validation: '' }],
['name', { label: 'Name', type: 'text', validation: '' }],
];
}
return [
['id', { label: 'ID', type: 'hidden' }],
['code', { label: 'Code', type: 'text', validation: '' }],
@@ -71,15 +40,7 @@ class SalaryComponentTypeAdapter extends ReactModalAdapterBase {
* SalaryComponentAdapter
*/
class SalaryComponentAdapter extends ReactModalAdapterBase {
constructor(endPoint, tab, filter, orderBy) {
super(endPoint, tab, filter, orderBy);
this.fieldNameMap = {};
this.hiddenFields = {};
this.tableFields = {};
this.formOnlyFields = {};
}
class SalaryComponentAdapter extends AdapterBase {
getDataMapping() {
return [
'id',
@@ -98,27 +59,6 @@ class SalaryComponentAdapter extends ReactModalAdapterBase {
];
}
getTableColumns() {
return [
{
title: 'Name',
dataIndex: 'name',
sorter: true,
},
{
title: 'Salary Component Type',
dataIndex: 'componentType',
sorter: true,
},
{
title: 'Details',
dataIndex: 'details',
sorter: true,
}
];
}
getFormFields() {
return [
['id', { label: 'ID', type: 'hidden' }],
@@ -134,15 +74,7 @@ class SalaryComponentAdapter extends ReactModalAdapterBase {
* EmployeeSalaryAdapter
*/
class EmployeeSalaryAdapter extends ReactModalAdapterBase {
constructor(endPoint, tab, filter, orderBy) {
super(endPoint, tab, filter, orderBy);
this.fieldNameMap = {};
this.hiddenFields = {};
this.tableFields = {};
this.formOnlyFields = {};
}
class EmployeeSalaryAdapter extends AdapterBase {
getDataMapping() {
return [
'id',
@@ -163,31 +95,6 @@ class EmployeeSalaryAdapter extends ReactModalAdapterBase {
];
}
getTableColumns() {
return [
{
title: 'Employee',
dataIndex: 'employee',
sorter: true,
},
{
title: 'Salary Component',
dataIndex: 'component',
sorter: true,
},
{
title: 'Amount',
dataIndex: 'amount',
sorter: true,
},
{
title: 'Details',
dataIndex: 'details',
sorter: true,
}
];
}
getFormFields() {
return [
['id', { label: 'ID', type: 'hidden' }],

46940
web/dist/admin-bundle.js vendored

File diff suppressed because one or more lines are too long

532
web/dist/common.js vendored

File diff suppressed because one or more lines are too long

10483
web/dist/login.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

68174
web/dist/third-party.js vendored

File diff suppressed because one or more lines are too long

91755
web/dist/vendorAntd.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

92738
web/dist/vendorAntv.js vendored

File diff suppressed because one or more lines are too long

15466
web/dist/vendorOther.js vendored

File diff suppressed because one or more lines are too long

28928
web/dist/vendorReact.js vendored

File diff suppressed because one or more lines are too long

View File

@@ -2,19 +2,4 @@ import {
EmployeeCompanyLoanAdapter,
} from './lib';
import IceDataPipe from "../../../api/IceDataPipe";
function init(data) {
const modJsList = {};
//modJsList.tabEmployeeCompanyLoan = new EmployeeCompanyLoanAdapter('EmployeeCompanyLoan','');
modJsList.tabEmployeeCompanyLoan = new EmployeeCompanyLoanAdapter('EmployeeCompanyLoan', 'EmployeeCompanyLoan');
//modJsList.tabEmployeeCompanyLoan.setObjectTypeName('Employee Company Loan');
modJsList.tabEmployeeCompanyLoan.setDataPipe(new IceDataPipe(modJsList.tabEmployeeCompanyLoan));
modJsList.tabEmployeeCompanyLoan.setAccess(data.permissions.EmployeeCompanyLoan);
window.modJs = modJsList.tabEmployeeCompanyLoan;
window.modJsList = modJsList;
}
window.initAdminLoan = init;
window.EmployeeCompanyLoanAdapter = EmployeeCompanyLoanAdapter;

View File

@@ -2,18 +2,9 @@
Copyright (c) 2018 [Glacies UG, Berlin, Germany] (http://glacies.de)
Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
*/
//import AdapterBase from '../../../api/AdapterBase';
import ReactModalAdapterBase from '../../../api/ReactModalAdapterBase';
class EmployeeCompanyLoanAdapter extends ReactModalAdapterBase {
constructor(endPoint, tab, filter, orderBy) {
super(endPoint, tab, filter, orderBy);
this.fieldNameMap = {};
this.hiddenFields = {};
this.tableFields = {};
this.formOnlyFields = {};
}
import AdapterBase from '../../../api/AdapterBase';
class EmployeeCompanyLoanAdapter extends AdapterBase {
getDataMapping() {
return [
'id',
@@ -38,46 +29,6 @@ class EmployeeCompanyLoanAdapter extends ReactModalAdapterBase {
];
}
getTableColumns() {
return [
{
title: 'Employee',
dataIndex: 'employee',
sorter: true,
},
{
title: 'Loan Type',
dataIndex: 'loan',
sorter: true,
},
{
title: 'Loan Start Date',
dataIndex: 'start_date',
sorter: true,
},
{
title: 'Loan Period (Months)',
dataIndex: 'period_months',
sorter: true,
},
{
title: 'Currency',
dataIndex: 'currency',
sorter: true,
},
{
title: 'Amount',
dataIndex: 'amount',
sorter: true,
},
{
title: 'Status',
dataIndex: 'status',
sorter: true,
}
];
}
getFormFields() {
return [
['id', { label: 'ID', type: 'hidden' }],

View File

@@ -2,18 +2,4 @@ import {
EmployeeSalaryAdapter,
} from './lib';
import IceDataPipe from "../../../api/IceDataPipe";
function init(data) {
const modJsList = {};
modJsList.tabEmployeeSalary = new EmployeeSalaryAdapter('EmployeeSalary', 'EmployeeSalary');
modJsList.tabEmployeeSalary.setObjectTypeName('Employee Salary');
modJsList.tabEmployeeSalary.setDataPipe(new IceDataPipe(modJsList.tabEmployeeSalary));
modJsList.tabEmployeeSalary.setAccess(data.permissions.EmployeeSalary);
window.modJs = modJsList.tabEmployeeSalary;
window.modJsList = modJsList;
}
window.initAdminSalary = init;
window.EmployeeSalaryAdapter = EmployeeSalaryAdapter;

View File

@@ -2,18 +2,9 @@
Copyright (c) 2018 [Glacies UG, Berlin, Germany] (http://glacies.de)
Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
*/
//import AdapterBase from '../../../api/AdapterBase';
import ReactModalAdapterBase from '../../../api/ReactModalAdapterBase';
class EmployeeSalaryAdapter extends ReactModalAdapterBase {
constructor(endPoint, tab, filter, orderBy) {
super(endPoint, tab, filter, orderBy);
this.fieldNameMap = {};
this.hiddenFields = {};
this.tableFields = {};
this.formOnlyFields = {};
}
import AdapterBase from '../../../api/AdapterBase';
class EmployeeSalaryAdapter extends AdapterBase {
getDataMapping() {
return [
'id',
@@ -32,27 +23,6 @@ class EmployeeSalaryAdapter extends ReactModalAdapterBase {
];
}
getTableColumns() {
return [
{
title: 'Salary Component',
dataIndex: 'component',
sorter: true,
},
{
title: 'Amount',
dataIndex: 'amount',
sorter: true,
},
{
title: 'Details',
dataIndex: 'details',
sorter: true,
}
];
}
getFormFields() {
return [
['id', { label: 'ID', type: 'hidden' }],