From d1226152a75b81c2b4ca67838a00584b8718c61b Mon Sep 17 00:00:00 2001 From: roshelrao Date: Fri, 25 Jun 2021 15:48:01 +0530 Subject: [PATCH] removed the button in loans module --- web/admin/src/salary/index.js | 2 +- web/admin/src/salary/lib.js | 7 ------- web/dist/admin-bundle.js | 17 +---------------- web/dist/modules-bundle.js | 14 ++++++-------- web/modules/src/loans/index.js | 6 ++++-- web/modules/src/loans/lib.js | 5 ----- 6 files changed, 12 insertions(+), 39 deletions(-) diff --git a/web/admin/src/salary/index.js b/web/admin/src/salary/index.js index 616ea4f3..28a3620c 100644 --- a/web/admin/src/salary/index.js +++ b/web/admin/src/salary/index.js @@ -16,7 +16,7 @@ function init(data) { 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.tabSalaryComponentType.setAccess(data.permissions.SalaryComponentType); modJsList.tabSalaryComponent = new SalaryComponentAdapter('SalaryComponent', 'SalaryComponent'); modJsList.tabSalaryComponent.setObjectTypeName('Salary components'); diff --git a/web/admin/src/salary/lib.js b/web/admin/src/salary/lib.js index 3ecaa537..b8c94be8 100644 --- a/web/admin/src/salary/lib.js +++ b/web/admin/src/salary/lib.js @@ -51,13 +51,6 @@ class SalaryComponentTypeAdapter extends ReactModalAdapterBase { } 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: '' }], diff --git a/web/dist/admin-bundle.js b/web/dist/admin-bundle.js index 99aac4a3..3415ebe6 100644 --- a/web/dist/admin-bundle.js +++ b/web/dist/admin-bundle.js @@ -8721,7 +8721,7 @@ function init(data) { 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.tabSalaryComponentType.setAccess(data.permissions.SalaryComponentType); modJsList.tabSalaryComponent = new _lib.SalaryComponentAdapter('SalaryComponent', 'SalaryComponent'); modJsList.tabSalaryComponent.setObjectTypeName('Salary components'); modJsList.tabSalaryComponent.setDataPipe(new _IceDataPipe["default"](modJsList.tabSalaryComponent)); @@ -8820,21 +8820,6 @@ var SalaryComponentTypeAdapter = /*#__PURE__*/function (_ReactModalAdapterBas) { }, { 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' diff --git a/web/dist/modules-bundle.js b/web/dist/modules-bundle.js index bfcc6577..84a10958 100644 --- a/web/dist/modules-bundle.js +++ b/web/dist/modules-bundle.js @@ -18391,10 +18391,12 @@ var _IceDataPipe = _interopRequireDefault(require("../../../api/IceDataPipe")); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } function init(data) { - var modJsList = {}; //modJsList.tabEmployeeCompanyLoan = new EmployeeCompanyLoanAdapter('EmployeeCompanyLoan',''); - - modJsList.tabEmployeeCompanyLoan = new _lib.EmployeeCompanyLoanAdapter('EmployeeCompanyLoan', 'EmployeeCompanyLoan'); //modJsList.tabEmployeeCompanyLoan.setObjectTypeName('Employee Company Loan'); - + var modJsList = {}; + modJsList.tabEmployeeCompanyLoan = new _lib.EmployeeCompanyLoanAdapter('EmployeeCompanyLoan', 'EmployeeCompanyLoan'); + modJsList.tabEmployeeCompanyLoan.setObjectTypeName('Employee Company Loan'); + modJsList.tabEmployeeCompanyLoan.setShowAddNew(false); + modJsList.tabEmployeeCompanyLoan.setShowEdit(false); + modJsList.tabEmployeeCompanyLoan.setShowDelete(false); modJsList.tabEmployeeCompanyLoan.setDataPipe(new _IceDataPipe["default"](modJsList.tabEmployeeCompanyLoan)); modJsList.tabEmployeeCompanyLoan.setAccess(data.permissions.EmployeeCompanyLoan); window.modJs = modJsList.tabEmployeeCompanyLoan; @@ -18479,10 +18481,6 @@ var EmployeeCompanyLoanAdapter = /*#__PURE__*/function (_ReactModalAdapterBas) { key: "getTableColumns", value: function getTableColumns() { return [{ - title: 'Employee', - dataIndex: 'employee', - sorter: true - }, { title: 'Loan Type', dataIndex: 'loan', sorter: true diff --git a/web/modules/src/loans/index.js b/web/modules/src/loans/index.js index 09e82173..154f5b78 100644 --- a/web/modules/src/loans/index.js +++ b/web/modules/src/loans/index.js @@ -7,9 +7,11 @@ 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.setObjectTypeName('Employee Company Loan'); + modJsList.tabEmployeeCompanyLoan.setShowAddNew(false); + modJsList.tabEmployeeCompanyLoan.setShowEdit(false); + modJsList.tabEmployeeCompanyLoan.setShowDelete(false); modJsList.tabEmployeeCompanyLoan.setDataPipe(new IceDataPipe(modJsList.tabEmployeeCompanyLoan)); modJsList.tabEmployeeCompanyLoan.setAccess(data.permissions.EmployeeCompanyLoan); diff --git a/web/modules/src/loans/lib.js b/web/modules/src/loans/lib.js index f6fb820a..a572c98f 100644 --- a/web/modules/src/loans/lib.js +++ b/web/modules/src/loans/lib.js @@ -40,11 +40,6 @@ class EmployeeCompanyLoanAdapter extends ReactModalAdapterBase { getTableColumns() { return [ - { - title: 'Employee', - dataIndex: 'employee', - sorter: true, - }, { title: 'Loan Type', dataIndex: 'loan',