react loan module and salary module

core/admin/jobs/index.php

@@ -28,20 +28,23 @@ 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,

core/admin/loans/index.php

@@ -5,15 +5,16 @@
  */
 
 use Classes\PermissionManager;
-use CompanyLoans\Common\Model\CompanyLoan;
+use Loans\Common\Model\CompanyLoan;
-use CompanyLoans\Common\Model\EmployeeCompanyLoan;
+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>
@@ -22,20 +23,15 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 
 	<div class="tab-content">
 		<div class="tab-pane active" id="tabPageCompanyLoan">
-			<div id="CompanyLoan" class="reviewBlock" data-content="List" style="padding-left:5px;">
+		<div id="CompanyLoanTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-
+            <div id="CompanyLoanForm"></div>
-			</div>
+            <div id="CompanyLoanFilterForm"></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="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>
+            <div id="EmployeeCompanyLoanFilterForm"></div>
-			<div id="EmployeeCompanyLoanForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
-
-			</div>
 		</div>
 	</div>
 
@@ -52,22 +48,7 @@ $moduleData = [
 ?>
 
 <script>
-var modJsList = [];
+  initAdminLoan(<?=json_encode($moduleData)?>);
-  var data = <?= json_encode($moduleData) ?>;
+</script>
-  modJsList['tabCompanyLoan'] = new ProjectAdapter('Company Loan', 'Company Loan');
-  modJsList.tabCompanyLoan.setObjectTypeName('CompanyLoan');
-  modJsList.tabCompanyLoan.setAccess(data.permissions.CompanyLoan);
-  modJsList.tabCompanyLoan.setDataPipe(new IceDataPipe(modJsList.tabCompanyLoan));
-  modJsList.tabCompanyLoan.setRemoteTable(true);
 
-  modJsList['tabEmployeeCompanyLoan'] = new EmployeeCompanyLoanAdapter('EmployeeCompanyLoan', 'EmployeeCompanyLoan');
-
-
-  modJsList.tabEmployeeCompanyLoan.setObjectTypeName('Employee Company Loan');
-  modJsList.tabEmployeeCompanyLoan.setAccess(data.permissions.EmployeeCompanyLoan);
-  modJsList.tabEmployeeCompanyLoan.setDataPipe(new IceDataPipe(modJsList.tabEmployeeCompanyLoan));
-  modJsList.tabEmployeeCompanyLoan.setRemoteTable(true);
-
-  var modJs = modJsList['tabCompanyLoan'];
-  
 <?php include APP_BASE_PATH.'footer.php';?>

core/admin/salary/index.php

@@ -1,4 +1,9 @@
 <?php
+use Classes\PermissionManager;
+use Salary\Common\Model\SalaryComponentType;
+use Salary\Common\Model\SalaryComponent;
+use Salary\Common\Model\EmployeeSalary;
+
 
 $moduleName = 'salary';
 $moduleGroup = 'admin';
@@ -6,7 +11,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
@@ -21,4 +26,55 @@ $moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
 
 echo \Classes\UIManager::getInstance()->renderModule($moduleBuilder);
 
-include APP_BASE_PATH.'footer.php';
+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';?>

core/modules/loans/index.php

@@ -4,6 +4,9 @@
  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__));
@@ -17,26 +20,27 @@ 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>
+			<div id="EmployeeCompanyLoanTable" 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 id="EmployeeCompanyLoanForm"></div>
-
+            <div id="EmployeeCompanyLoanFilterForm"></div>
-			</div>
 		</div>
 	</div>
-
 </div>
+	
+
+
+<?php
+$moduleData = [
+    'user_level' => $user->user_level,
+    'permissions' => [
+        'EmployeeCompanyLoan' => PermissionManager::checkGeneralAccess(new EmployeeCompanyLoan()),
+    ]
+];
+?>
+
 <script>
-var modJsList = new Array();
+  initAdminLoan(<?=json_encode($moduleData)?>);
-
-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';?>

core/modules/salary/index.php

@@ -4,6 +4,9 @@
  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__));
@@ -17,32 +20,25 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 
 	<div class="tab-content">
 		<div class="tab-pane active" id="tabPageEmployeeSalary">
-			<div id="EmployeeSalary" class="reviewBlock" data-content="List" style="padding-left:5px;">
+		<div id="EmployeeSalaryTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-
+            <div id="EmployeeSalaryForm"></div>
-			</div>
+            <div id="EmployeeSalaryFilterForm"></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>
-var modJsList = new Array();
+  initAdminSalary(<?=json_encode($moduleData)?>);
-
-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';?>

web/admin/src/loans/index.js

@@ -3,5 +3,24 @@ import {
   EmployeeCompanyLoanAdapter,
 } from './lib';
 
-window.CompanyLoanAdapter = CompanyLoanAdapter;
+
-window.EmployeeCompanyLoanAdapter = EmployeeCompanyLoanAdapter;
+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;

web/admin/src/loans/lib.js

@@ -176,5 +176,5 @@ class EmployeeCompanyLoanAdapter extends ReactModalAdapterBase {
 
 module.exports = {
   CompanyLoanAdapter,
-  EmployeeCompanyLoanAdapter,
+  EmployeeCompanyLoanAdapter
 };

web/admin/src/salary/index.js

@@ -4,6 +4,33 @@ import {
   EmployeeSalaryAdapter,
 } from './lib';
 
-window.SalaryComponentTypeAdapter = SalaryComponentTypeAdapter;
+/*window.SalaryComponentTypeAdapter = SalaryComponentTypeAdapter;
 window.SalaryComponentAdapter = SalaryComponentAdapter;
-window.EmployeeSalaryAdapter = EmployeeSalaryAdapter;
+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;

web/admin/src/salary/lib.js

@@ -3,13 +3,22 @@
  Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
  */
 
-import AdapterBase from '../../../api/AdapterBase';
+//import AdapterBase from '../../../api/AdapterBase';
+import ReactModalAdapterBase from '../../../api/ReactModalAdapterBase';
 
 /**
  * SalaryComponentTypeAdapter
  */
 
-class SalaryComponentTypeAdapter extends AdapterBase {
+class SalaryComponentTypeAdapter extends ReactModalAdapterBase {
+  constructor(endPoint, tab, filter, orderBy) {
+    super(endPoint, tab, filter, orderBy);
+    this.fieldNameMap = {};
+    this.hiddenFields = {};
+    this.tableFields = {};
+    this.formOnlyFields = {};
+  }
+
   getDataMapping() {
     return [
       'id',
@@ -26,7 +35,29 @@ class SalaryComponentTypeAdapter extends AdapterBase {
     ];
   }
 
+  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: '' }],
@@ -40,7 +71,15 @@ class SalaryComponentTypeAdapter extends AdapterBase {
  * SalaryComponentAdapter
  */
 
-class SalaryComponentAdapter extends AdapterBase {
+class SalaryComponentAdapter extends ReactModalAdapterBase {
+  constructor(endPoint, tab, filter, orderBy) {
+    super(endPoint, tab, filter, orderBy);
+    this.fieldNameMap = {};
+    this.hiddenFields = {};
+    this.tableFields = {};
+    this.formOnlyFields = {};
+  }
+
   getDataMapping() {
     return [
       'id',
@@ -59,6 +98,27 @@ class SalaryComponentAdapter extends AdapterBase {
     ];
   }
 
+  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' }],
@@ -74,7 +134,15 @@ class SalaryComponentAdapter extends AdapterBase {
  * EmployeeSalaryAdapter
  */
 
-class EmployeeSalaryAdapter extends AdapterBase {
+class EmployeeSalaryAdapter extends ReactModalAdapterBase {
+  constructor(endPoint, tab, filter, orderBy) {
+    super(endPoint, tab, filter, orderBy);
+    this.fieldNameMap = {};
+    this.hiddenFields = {};
+    this.tableFields = {};
+    this.formOnlyFields = {};
+  }
+
   getDataMapping() {
     return [
       'id',
@@ -95,6 +163,31 @@ class EmployeeSalaryAdapter extends AdapterBase {
     ];
   }
 
+  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' }],

web/dist/admin-bundle.js

@@ -5158,15 +5158,12 @@ module.exports = {
 var _lib = require("./lib");
 
 window.FieldNameAdapter = _lib.FieldNameAdapter;
-window.CustomFieldAdapter = _lib.CustomFieldAdapter;
 
 },{"./lib":22}],22:[function(require,module,exports){
 "use strict";
 
 var _AdapterBase2 = _interopRequireDefault(require("../../../api/AdapterBase"));
 
-var _CustomFieldAdapter = _interopRequireDefault(require("../../../api/CustomFieldAdapter"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
@@ -5260,11 +5257,10 @@ var FieldNameAdapter = /*#__PURE__*/function (_AdapterBase) {
 }(_AdapterBase2["default"]);
 
 module.exports = {
-  FieldNameAdapter: FieldNameAdapter,
+  FieldNameAdapter: FieldNameAdapter
-  CustomFieldAdapter: _CustomFieldAdapter["default"]
 };
 
-},{"../../../api/AdapterBase":52,"../../../api/CustomFieldAdapter":55}],23:[function(require,module,exports){
+},{"../../../api/AdapterBase":52}],23:[function(require,module,exports){
 "use strict";
 
 var _lib = require("./lib");
@@ -5559,10 +5555,27 @@ module.exports = {
 
 var _lib = require("./lib");
 
-window.CompanyLoanAdapter = _lib.CompanyLoanAdapter;
+var _IceDataPipe = _interopRequireDefault(require("../../../api/IceDataPipe"));
-window.EmployeeCompanyLoanAdapter = _lib.EmployeeCompanyLoanAdapter;
 
-},{"./lib":26}],26:[function(require,module,exports){
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function init(data) {
+  var modJsList = {};
+  modJsList.tabCompanyLoan = new _lib.CompanyLoanAdapter('CompanyLoan', 'CompanyLoan');
+  modJsList.tabCompanyLoan.setObjectTypeName('Company Loan');
+  modJsList.tabCompanyLoan.setDataPipe(new _IceDataPipe["default"](modJsList.tabCompanyLoan));
+  modJsList.tabCompanyLoan.setAccess(data.permissions.CompanyLoan);
+  modJsList.tabEmployeeCompanyLoan = new _lib.EmployeeCompanyLoanAdapter('EmployeeCompanyLoan', 'EmployeeCompanyLoan');
+  modJsList.tabEmployeeCompanyLoan.setObjectTypeName('Employee Company Loan');
+  modJsList.tabEmployeeCompanyLoan.setDataPipe(new _IceDataPipe["default"](modJsList.tabEmployeeCompanyLoan));
+  modJsList.tabEmployeeCompanyLoan.setAccess(data.permissions.EmployeeCompanyLoan);
+  window.modJs = modJsList.tabCompanyLoan;
+  window.modJsList = modJsList;
+}
+
+window.initAdminLoan = init;
+
+},{"../../../api/IceDataPipe":58,"./lib":26}],26:[function(require,module,exports){
 "use strict";
 
 var _ReactModalAdapterBase = _interopRequireDefault(require("../../../api/ReactModalAdapterBase"));
@@ -8696,14 +8709,38 @@ module.exports = {
 
 var _lib = require("./lib");
 
-window.SalaryComponentTypeAdapter = _lib.SalaryComponentTypeAdapter;
+var _IceDataPipe = _interopRequireDefault(require("../../../api/IceDataPipe"));
-window.SalaryComponentAdapter = _lib.SalaryComponentAdapter;
-window.EmployeeSalaryAdapter = _lib.EmployeeSalaryAdapter;
 
-},{"./lib":44}],44:[function(require,module,exports){
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+/*window.SalaryComponentTypeAdapter = SalaryComponentTypeAdapter;
+window.SalaryComponentAdapter = SalaryComponentAdapter;
+window.EmployeeSalaryAdapter = EmployeeSalaryAdapter;*/
+function init(data) {
+  var modJsList = [];
+  modJsList.tabSalaryComponentType = new _lib.SalaryComponentTypeAdapter('SalaryComponentType', 'SalaryComponentType');
+  modJsList.tabSalaryComponentType.setObjectTypeName('Salary Component Types');
+  modJsList.tabSalaryComponentType.setDataPipe(new _IceDataPipe["default"](modJsList.tabSalaryComponentType));
+  modJsList.tabSalaryComponentType.setAccess(data.permissions.tabSalaryComponentType);
+  modJsList.tabSalaryComponent = new _lib.SalaryComponentAdapter('SalaryComponent', 'SalaryComponent');
+  modJsList.tabSalaryComponent.setObjectTypeName('Salary components');
+  modJsList.tabSalaryComponent.setDataPipe(new _IceDataPipe["default"](modJsList.tabSalaryComponent));
+  modJsList.tabSalaryComponent.setAccess(data.permissions.SalaryComponent);
+  modJsList.tabEmployeeSalary = new _lib.EmployeeSalaryAdapter('EmployeeSalary', 'EmployeeSalary');
+  modJsList.tabEmployeeSalary.setObjectTypeName('Employee Salary');
+  modJsList.tabEmployeeSalary.setDataPipe(new _IceDataPipe["default"](modJsList.tabEmployeeSalary));
+  modJsList.tabEmployeeSalary.setAccess(data.permissions.EmployeeSalary); //window.modJs = modJsList.tabEmployeeSalary;
+
+  window.modJs = modJsList.tabSalaryComponentType;
+  window.modJsList = modJsList;
+}
+
+window.initAdminSalary = init;
+
+},{"../../../api/IceDataPipe":58,"./lib":44}],44:[function(require,module,exports){
 "use strict";
 
-var _AdapterBase4 = _interopRequireDefault(require("../../../api/AdapterBase"));
+var _ReactModalAdapterBase = _interopRequireDefault(require("../../../api/ReactModalAdapterBase"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -8732,15 +8769,22 @@ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || func
 /**
  * SalaryComponentTypeAdapter
  */
-var SalaryComponentTypeAdapter = /*#__PURE__*/function (_AdapterBase) {
+var SalaryComponentTypeAdapter = /*#__PURE__*/function (_ReactModalAdapterBas) {
-  _inherits(SalaryComponentTypeAdapter, _AdapterBase);
+  _inherits(SalaryComponentTypeAdapter, _ReactModalAdapterBas);
 
   var _super = _createSuper(SalaryComponentTypeAdapter);
 
-  function SalaryComponentTypeAdapter() {
+  function SalaryComponentTypeAdapter(endPoint, tab, filter, orderBy) {
+    var _this;
+
     _classCallCheck(this, SalaryComponentTypeAdapter);
 
-    return _super.apply(this, arguments);
+    _this = _super.call(this, endPoint, tab, filter, orderBy);
+    _this.fieldNameMap = {};
+    _this.hiddenFields = {};
+    _this.tableFields = {};
+    _this.formOnlyFields = {};
+    return _this;
   }
 
   _createClass(SalaryComponentTypeAdapter, [{
@@ -8760,9 +8804,37 @@ var SalaryComponentTypeAdapter = /*#__PURE__*/function (_AdapterBase) {
         sTitle: 'Name'
       }];
     }
+  }, {
+    key: "getTableColumns",
+    value: function getTableColumns() {
+      return [{
+        title: 'Code',
+        dataIndex: 'code',
+        sorter: true
+      }, {
+        title: 'Name',
+        dataIndex: 'name',
+        sorter: true
+      }];
+    }
   }, {
     key: "getFormFields",
     value: function 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'
@@ -8779,21 +8851,28 @@ var SalaryComponentTypeAdapter = /*#__PURE__*/function (_AdapterBase) {
   }]);
 
   return SalaryComponentTypeAdapter;
-}(_AdapterBase4["default"]);
+}(_ReactModalAdapterBase["default"]);
 /**
  * SalaryComponentAdapter
  */
 
 
-var SalaryComponentAdapter = /*#__PURE__*/function (_AdapterBase2) {
+var SalaryComponentAdapter = /*#__PURE__*/function (_ReactModalAdapterBas2) {
-  _inherits(SalaryComponentAdapter, _AdapterBase2);
+  _inherits(SalaryComponentAdapter, _ReactModalAdapterBas2);
 
   var _super2 = _createSuper(SalaryComponentAdapter);
 
-  function SalaryComponentAdapter() {
+  function SalaryComponentAdapter(endPoint, tab, filter, orderBy) {
+    var _this2;
+
     _classCallCheck(this, SalaryComponentAdapter);
 
-    return _super2.apply(this, arguments);
+    _this2 = _super2.call(this, endPoint, tab, filter, orderBy);
+    _this2.fieldNameMap = {};
+    _this2.hiddenFields = {};
+    _this2.tableFields = {};
+    _this2.formOnlyFields = {};
+    return _this2;
   }
 
   _createClass(SalaryComponentAdapter, [{
@@ -8815,6 +8894,23 @@ var SalaryComponentAdapter = /*#__PURE__*/function (_AdapterBase2) {
         sTitle: 'Details'
       }];
     }
+  }, {
+    key: "getTableColumns",
+    value: function getTableColumns() {
+      return [{
+        title: 'Name',
+        dataIndex: 'name',
+        sorter: true
+      }, {
+        title: 'Salary Component Type',
+        dataIndex: 'componentType',
+        sorter: true
+      }, {
+        title: 'Details',
+        dataIndex: 'details',
+        sorter: true
+      }];
+    }
   }, {
     key: "getFormFields",
     value: function getFormFields() {
@@ -8838,21 +8934,28 @@ var SalaryComponentAdapter = /*#__PURE__*/function (_AdapterBase2) {
   }]);
 
   return SalaryComponentAdapter;
-}(_AdapterBase4["default"]);
+}(_ReactModalAdapterBase["default"]);
 /*
  * EmployeeSalaryAdapter
  */
 
 
-var EmployeeSalaryAdapter = /*#__PURE__*/function (_AdapterBase3) {
+var EmployeeSalaryAdapter = /*#__PURE__*/function (_ReactModalAdapterBas3) {
-  _inherits(EmployeeSalaryAdapter, _AdapterBase3);
+  _inherits(EmployeeSalaryAdapter, _ReactModalAdapterBas3);
 
   var _super3 = _createSuper(EmployeeSalaryAdapter);
 
-  function EmployeeSalaryAdapter() {
+  function EmployeeSalaryAdapter(endPoint, tab, filter, orderBy) {
+    var _this3;
+
     _classCallCheck(this, EmployeeSalaryAdapter);
 
-    return _super3.apply(this, arguments);
+    _this3 = _super3.call(this, endPoint, tab, filter, orderBy);
+    _this3.fieldNameMap = {};
+    _this3.hiddenFields = {};
+    _this3.tableFields = {};
+    _this3.formOnlyFields = {};
+    return _this3;
   }
 
   _createClass(EmployeeSalaryAdapter, [{
@@ -8876,6 +8979,27 @@ var EmployeeSalaryAdapter = /*#__PURE__*/function (_AdapterBase3) {
         sTitle: 'Details'
       }];
     }
+  }, {
+    key: "getTableColumns",
+    value: function 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
+      }];
+    }
   }, {
     key: "getFormFields",
     value: function getFormFields() {
@@ -8912,7 +9036,7 @@ var EmployeeSalaryAdapter = /*#__PURE__*/function (_AdapterBase3) {
   }]);
 
   return EmployeeSalaryAdapter;
-}(_AdapterBase4["default"]);
+}(_ReactModalAdapterBase["default"]);
 
 module.exports = {
   SalaryComponentTypeAdapter: SalaryComponentTypeAdapter,
@@ -8920,7 +9044,7 @@ module.exports = {
   EmployeeSalaryAdapter: EmployeeSalaryAdapter
 };
 
-},{"../../../api/AdapterBase":52}],45:[function(require,module,exports){
+},{"../../../api/ReactModalAdapterBase":65}],45:[function(require,module,exports){
 "use strict";
 
 var _lib = require("./lib");

web/modules/src/loans/index.js

@@ -2,4 +2,19 @@ import {
   EmployeeCompanyLoanAdapter,
 } from './lib';
 
-window.EmployeeCompanyLoanAdapter = EmployeeCompanyLoanAdapter;
+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;

web/modules/src/loans/lib.js

@@ -2,9 +2,18 @@
  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 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 = {};
+  }
 
-class EmployeeCompanyLoanAdapter extends AdapterBase {
   getDataMapping() {
     return [
       'id',
@@ -29,6 +38,46 @@ class EmployeeCompanyLoanAdapter extends AdapterBase {
     ];
   }
 
+  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' }],

web/modules/src/salary/index.js

@@ -2,4 +2,18 @@ import {
   EmployeeSalaryAdapter,
 } from './lib';
 
-window.EmployeeSalaryAdapter = EmployeeSalaryAdapter;
+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;

web/modules/src/salary/lib.js

@@ -2,9 +2,18 @@
  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 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 = {};
+  }
 
-class EmployeeSalaryAdapter extends AdapterBase {
   getDataMapping() {
     return [
       'id',
@@ -23,6 +32,27 @@ class EmployeeSalaryAdapter extends AdapterBase {
     ];
   }
 
+  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' }],