Sync changes v29.0.0 from IceHrmPro (https://icehrm.com/purchase-icehrmpro)
This commit is contained in:
@@ -3,13 +3,21 @@
|
||||
Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
|
||||
*/
|
||||
|
||||
import AdapterBase from '../../../api/AdapterBase';
|
||||
import ReactModalAdapterBase from '../../../api/ReactModalAdapterBase';
|
||||
|
||||
/**
|
||||
* ClientAdapter
|
||||
*/
|
||||
|
||||
class ClientAdapter extends AdapterBase {
|
||||
class ClientAdapter extends ReactModalAdapterBase {
|
||||
constructor(endPoint, tab, filter, orderBy) {
|
||||
super(endPoint, tab, filter, orderBy);
|
||||
this.fieldNameMap = {};
|
||||
this.hiddenFields = {};
|
||||
this.tableFields = {};
|
||||
this.formOnlyFields = {};
|
||||
}
|
||||
|
||||
getDataMapping() {
|
||||
return [
|
||||
'id',
|
||||
@@ -30,6 +38,32 @@ class ClientAdapter extends AdapterBase {
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
getTableColumns() {
|
||||
return [
|
||||
{
|
||||
title: 'Name',
|
||||
dataIndex: 'name',
|
||||
sorter: true,
|
||||
},
|
||||
{
|
||||
title: 'Details',
|
||||
dataIndex: 'details',
|
||||
sorter: true,
|
||||
},
|
||||
{
|
||||
title: 'Address',
|
||||
dataIndex: 'address',
|
||||
sorter: true,
|
||||
},
|
||||
{
|
||||
title: 'Contact Number',
|
||||
dataIndex: 'contact_number',
|
||||
sorter: true,
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
getFormFields() {
|
||||
if (this.showSave) {
|
||||
return [
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { CompanyStructureAdapter, CompanyGraphAdapter } from './lib';
|
||||
import IceDataPipe from "../../../api/IceDataPipe";
|
||||
import CustomFieldAdapter from "../../../api/ReactCustomFieldAdapter";
|
||||
|
||||
|
||||
function init(data) {
|
||||
@@ -9,6 +8,7 @@ function init(data) {
|
||||
modJsList.tabCompanyStructure.setObjectTypeName('Company Structure');
|
||||
modJsList.tabCompanyStructure.setDataPipe(new IceDataPipe(modJsList.tabCompanyStructure));
|
||||
modJsList.tabCompanyStructure.setAccess(data.permissions.CompanyStructure);
|
||||
modJsList.tabCompanyStructure.setCustomFields(data.customFields);
|
||||
|
||||
modJsList.tabCompanyGraph = new CompanyGraphAdapter('CompanyStructure');
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ class CompanyStructureAdapter extends ReactModalAdapterBase {
|
||||
}
|
||||
|
||||
getFormFields() {
|
||||
return [
|
||||
return this.addCustomFields([
|
||||
['id', { label: 'ID', type: 'hidden', validation: '' }],
|
||||
['title', { label: 'Name', type: 'text', validation: '' }],
|
||||
['description', { label: 'Details', type: 'textarea', validation: '' }],
|
||||
@@ -80,7 +80,7 @@ class CompanyStructureAdapter extends ReactModalAdapterBase {
|
||||
['heads', {
|
||||
label: 'Heads', type: 'select2multi', 'allow-null': true, 'remote-source': ['Employee', 'id', 'first_name+last_name'],
|
||||
}],
|
||||
];
|
||||
]);
|
||||
}
|
||||
|
||||
postRenderForm(object, $tempDomObj) {
|
||||
|
||||
18
web/admin/src/custom_fields/index.js
Normal file
18
web/admin/src/custom_fields/index.js
Normal file
@@ -0,0 +1,18 @@
|
||||
import { CommonCustomFieldAdapter } from './lib';
|
||||
import IceDataPipe from '../../../api/IceDataPipe';
|
||||
|
||||
function init(data) {
|
||||
const modJsList = {};
|
||||
|
||||
modJsList.tabCustomField = new CommonCustomFieldAdapter('CustomField', 'CustomField', {}, '');
|
||||
modJsList.tabCustomField.setRemoteTable(true);
|
||||
modJsList.tabCustomField.setObjectTypeName('Custom Field');
|
||||
modJsList.tabCustomField.setDataPipe(new IceDataPipe(modJsList.tabCustomField));
|
||||
modJsList.tabCustomField.setAccess(data.permissions.CustomField);
|
||||
modJsList.tabCustomField.setTypes(data.types);
|
||||
|
||||
window.modJs = modJsList.tabCustomField;
|
||||
window.modJsList = modJsList;
|
||||
}
|
||||
|
||||
window.initAdminCustomFields = init;
|
||||
166
web/admin/src/custom_fields/lib.js
Normal file
166
web/admin/src/custom_fields/lib.js
Normal file
@@ -0,0 +1,166 @@
|
||||
/**
|
||||
* Author: Thilina Hasantha
|
||||
*/
|
||||
import ReactCustomFieldAdapter from '../../../api/ReactCustomFieldAdapter';
|
||||
|
||||
/**
|
||||
* AssetTypeAdapter
|
||||
*/
|
||||
|
||||
class CommonCustomFieldAdapter extends ReactCustomFieldAdapter {
|
||||
getDataMapping() {
|
||||
return [
|
||||
'id',
|
||||
'name',
|
||||
'type',
|
||||
'field_type',
|
||||
'field_label',
|
||||
'display',
|
||||
'display_order',
|
||||
];
|
||||
}
|
||||
|
||||
getHeaders() {
|
||||
return [
|
||||
{ sTitle: 'ID', bVisible: false },
|
||||
{ sTitle: 'Name' },
|
||||
{ sTitle: 'Object Type' },
|
||||
{ sTitle: 'Field Type' },
|
||||
{ sTitle: 'Field Label' },
|
||||
{ sTitle: 'Display Status' },
|
||||
{ sTitle: 'Priority' },
|
||||
];
|
||||
}
|
||||
|
||||
getTableColumns() {
|
||||
return [
|
||||
{
|
||||
title: 'Name',
|
||||
dataIndex: 'name',
|
||||
sorter: true,
|
||||
},
|
||||
{
|
||||
title: 'Object Type',
|
||||
dataIndex: 'type',
|
||||
sorter: true,
|
||||
},
|
||||
{
|
||||
title: 'Field Label',
|
||||
dataIndex: 'field_label',
|
||||
},
|
||||
{
|
||||
title: 'Field Type',
|
||||
dataIndex: 'field_type',
|
||||
},
|
||||
{
|
||||
title: 'Display Status',
|
||||
dataIndex: 'display',
|
||||
sorter: true,
|
||||
},
|
||||
{
|
||||
title: 'Priority',
|
||||
dataIndex: 'display_order',
|
||||
sorter: true,
|
||||
},
|
||||
];
|
||||
}
|
||||
|
||||
setTypes(tables) {
|
||||
this.types = tables;
|
||||
}
|
||||
|
||||
getFormFields() {
|
||||
return [
|
||||
['id', { label: 'ID', type: 'hidden' }],
|
||||
['field_label', { label: 'Field Label', type: 'text', validation: '' }],
|
||||
['type',
|
||||
{
|
||||
label: 'Object Type',
|
||||
type: 'select2',
|
||||
source: this.types,
|
||||
},
|
||||
],
|
||||
['field_type', { label: 'Field Type', type: 'select', source: [['text', 'Text Field'], ['textarea', 'Text Area'], ['select', 'Select'], ['select2', 'Select2'], ['select2multi', 'Multi Select'], ['fileupload', 'File Upload'], ['date', 'Date'], ['datetime', 'Date Time'], ['time', 'Time'], ['signature', 'Signature']] }],
|
||||
['field_validation', {
|
||||
label: 'Validation', type: 'select2', validation: 'none', sort: 'none', 'null-label': 'Required', 'allow-null': true, source: [['none', 'None'], ['number', 'Number'], ['numberOrEmpty', 'Number or Empty'], ['float', 'Decimal'], ['email', 'Email'], ['emailOrEmpty', 'Email or Empty']],
|
||||
}],
|
||||
['field_options', {
|
||||
label: 'Field Options',
|
||||
type: 'datagroup',
|
||||
form: [
|
||||
['label', { label: 'Label', type: 'text', validation: '' }],
|
||||
['value', { label: 'Value', type: 'text', validation: 'none' }],
|
||||
],
|
||||
html: '<div id="#_id_#" class="panel panel-default"><div class="panel-body">#_delete_##_edit_#<span style="color:#999;font-size:13px;font-weight:bold">#_label_#</span>:#_value_#</div></div>',
|
||||
columns: [
|
||||
{
|
||||
title: 'Label',
|
||||
dataIndex: 'label',
|
||||
key: 'label',
|
||||
},
|
||||
{
|
||||
title: 'Option Value',
|
||||
dataIndex: 'value',
|
||||
key: 'value',
|
||||
},
|
||||
],
|
||||
validation: 'none',
|
||||
}],
|
||||
['display_order', { label: 'Priority', type: 'text', validation: 'none' }],
|
||||
];
|
||||
}
|
||||
|
||||
getFilters() {
|
||||
return [
|
||||
['type',
|
||||
{
|
||||
label: 'Object Type',
|
||||
type: 'select2',
|
||||
'allow-null': true,
|
||||
source: this.types,
|
||||
},
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
forceInjectValuesBeforeSave(params) {
|
||||
const data = ['', {}];
|
||||
const options = [];
|
||||
let optionsData;
|
||||
|
||||
data[1].label = params.field_label;
|
||||
data[1].type = params.field_type;
|
||||
data[1].validation = params.field_validation;
|
||||
if (['select', 'select2', 'select2multi'].indexOf(params.field_type) >= 0) {
|
||||
optionsData = (params.field_options === '' || params.field_options === undefined)
|
||||
? [] : JSON.parse(params.field_options);
|
||||
for (const index in optionsData) {
|
||||
options.push([optionsData[index].value, optionsData[index].label]);
|
||||
}
|
||||
data[1].source = options;
|
||||
}
|
||||
if (params.field_validation == null || params.field_validation === undefined) {
|
||||
params.field_validation = '';
|
||||
}
|
||||
if (this.currentElement == null || this.currentElement.name == null || this.currentElement.name === '') {
|
||||
params.name = this.getNameFromFieldName(params.field_label);
|
||||
} else {
|
||||
params.name = this.currentElement.name;
|
||||
}
|
||||
|
||||
data[0] = params.name;
|
||||
params.data = JSON.stringify(data);
|
||||
|
||||
params.display = 'Form';
|
||||
|
||||
params.display_order = parseInt(params.display_order);
|
||||
if (!Number.isInteger(params.display_order)) {
|
||||
params.display_order = 1;
|
||||
}
|
||||
|
||||
return params;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
module.exports = { CommonCustomFieldAdapter };
|
||||
@@ -98,6 +98,7 @@ class DashboardAdapter extends AdapterBase {
|
||||
}
|
||||
|
||||
drawEmployeeDistributionChart() {
|
||||
const that = this;
|
||||
document.getElementById('EmployeeDistributionChart').style.display = 'none';
|
||||
ReactDOM.render(
|
||||
this.getSpinner(),
|
||||
@@ -115,7 +116,7 @@ class DashboardAdapter extends AdapterBase {
|
||||
forceFit: true,
|
||||
title: {
|
||||
visible: true,
|
||||
text: 'Employee Distribution',
|
||||
text: that.gt('Employee Distribution'),
|
||||
},
|
||||
description: {
|
||||
visible: false,
|
||||
@@ -125,7 +126,7 @@ class DashboardAdapter extends AdapterBase {
|
||||
visible: true,
|
||||
content: {
|
||||
value: chartData.reduce((acc, item) => acc + item.value, 0),
|
||||
name: 'Total',
|
||||
name: that.gt('Total'),
|
||||
},
|
||||
},
|
||||
legend: {
|
||||
@@ -151,6 +152,7 @@ class DashboardAdapter extends AdapterBase {
|
||||
}
|
||||
|
||||
drawOnlineOfflineEmployeeChart() {
|
||||
const that = this;
|
||||
document.getElementById('EmployeeOnlineOfflineChart').style.display = 'none';
|
||||
ReactDOM.render(
|
||||
this.getSpinner(),
|
||||
@@ -168,7 +170,7 @@ class DashboardAdapter extends AdapterBase {
|
||||
forceFit: true,
|
||||
title: {
|
||||
visible: true,
|
||||
text: 'Employee Check-Ins',
|
||||
text: that.gt('Employee Check-Ins'),
|
||||
},
|
||||
description: {
|
||||
visible: false,
|
||||
@@ -178,7 +180,7 @@ class DashboardAdapter extends AdapterBase {
|
||||
visible: true,
|
||||
content: {
|
||||
value: chartData.reduce((acc, item) => acc + item.value, 0),
|
||||
name: 'Total',
|
||||
name: that.gt('Total'),
|
||||
},
|
||||
},
|
||||
legend: {
|
||||
@@ -199,6 +201,7 @@ class DashboardAdapter extends AdapterBase {
|
||||
}
|
||||
|
||||
drawCompanyLeaveEntitlementChart() {
|
||||
const that = this;
|
||||
document.getElementById('CompanyLeaveEntitlementChart').style.display = 'none';
|
||||
ReactDOM.render(
|
||||
this.getSpinner(),
|
||||
@@ -216,7 +219,7 @@ class DashboardAdapter extends AdapterBase {
|
||||
forceFit: true,
|
||||
title: {
|
||||
visible: true,
|
||||
text: 'Company Vacation Usage',
|
||||
text: that.gt('Company Vacation Usage'),
|
||||
},
|
||||
description: {
|
||||
visible: false,
|
||||
@@ -226,7 +229,7 @@ class DashboardAdapter extends AdapterBase {
|
||||
visible: true,
|
||||
content: {
|
||||
value: chartData.reduce((acc, item) => acc + item.value, 0),
|
||||
name: 'Total',
|
||||
name: that.gt('Total'),
|
||||
},
|
||||
},
|
||||
legend: {
|
||||
|
||||
@@ -34,6 +34,8 @@ class DocumentAdapter extends AdapterBase {
|
||||
['expire_notification_month', { label: 'Notify Expiry Before One Month', type: 'select', source: [['Yes', 'Yes'], ['No', 'No']] }],
|
||||
['expire_notification_week', { label: 'Notify Expiry Before One Week', type: 'select', source: [['Yes', 'Yes'], ['No', 'No']] }],
|
||||
['expire_notification_day', { label: 'Notify Expiry Before One Day', type: 'select', source: [['Yes', 'Yes'], ['No', 'No']] }],
|
||||
['share_with_employee', { label: 'Share with Employee', type: 'select', source: [['Yes', 'Yes'], ['No', 'No']] }],
|
||||
// [ "sign", {"label":"Require Signature","type":"select","source":[["Yes","Yes"],["No","No"]]}],
|
||||
// [ "sign", {"label":"Require Signature","type":"select","source":[["Yes","Yes"],["No","No"]]}],
|
||||
// [ "sign_label", {"label":"Signature Description","type":"textarea","validation":"none"}],
|
||||
['details', { label: 'Details', type: 'textarea', validation: 'none' }],
|
||||
@@ -146,6 +148,7 @@ class EmployeeDocumentAdapter extends AdapterBase {
|
||||
['date_added', { label: 'Date Added', type: 'date', validation: '' }],
|
||||
['valid_until', { label: 'Valid Until', type: 'date', validation: 'none' }],
|
||||
['status', { label: 'Status', type: 'select', source: [['Active', 'Active'], ['Inactive', 'Inactive'], ['Draft', 'Draft']] }],
|
||||
['visible_to', { label: 'Visible To', type: 'select', source: [['Owner', 'Owner'], ['Manager', 'Manager'], ['Admin', 'Admin']] }],
|
||||
['details', { label: 'Details', type: 'textarea', validation: 'none' }],
|
||||
['attachment', { label: 'Attachment', type: 'fileupload', validation: '' }],
|
||||
];
|
||||
|
||||
@@ -363,28 +363,7 @@ class EmployeeAdapter extends ReactModalAdapterBase {
|
||||
});
|
||||
}
|
||||
|
||||
return this.addActualFields(steps, fields);
|
||||
}
|
||||
|
||||
addActualFields(steps, fields) {
|
||||
return steps.map((item) => {
|
||||
item.fields = item.fields.reduce((acc, fieldName) => {
|
||||
const field = fields.find(([name]) => name === fieldName);
|
||||
if (field) {
|
||||
acc.push(field);
|
||||
}
|
||||
return acc;
|
||||
}, []);
|
||||
|
||||
return item;
|
||||
});
|
||||
}
|
||||
|
||||
getFormOptions() {
|
||||
return {
|
||||
width: 1024,
|
||||
twoColumnLayout: false,
|
||||
};
|
||||
return this.addActualFieldsForStepModal(steps, fields);
|
||||
}
|
||||
|
||||
getFilters() {
|
||||
|
||||
@@ -344,7 +344,7 @@ class PayrollColumnAdapter extends AdapterBase {
|
||||
['enabled', { label: 'Enabled', type: 'select', source: [['Yes', 'Yes'], ['No', 'No']] }],
|
||||
['default_value', { label: 'Default Value', type: 'text', validation: '' }],
|
||||
fucntionColumnList,
|
||||
['function_type', { label: 'Function Type', type: 'select', source: [['Advanced', 'Advanced'], ['Simple', 'Simple']] }],
|
||||
['function_type', { label: 'Function Type', type: 'select', source: [['Simple', 'Simple']] }],
|
||||
['calculation_function', { label: 'Function', type: 'code', validation: 'none' }],
|
||||
];
|
||||
}
|
||||
|
||||
@@ -3,13 +3,21 @@
|
||||
Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
|
||||
*/
|
||||
|
||||
import AdapterBase from '../../../api/AdapterBase';
|
||||
import ReactModalAdapterBase from '../../../api/ReactModalAdapterBase';
|
||||
|
||||
/**
|
||||
* ProjectAdapter
|
||||
*/
|
||||
|
||||
class ProjectAdapter extends AdapterBase {
|
||||
class ProjectAdapter extends ReactModalAdapterBase {
|
||||
constructor(endPoint, tab, filter, orderBy) {
|
||||
super(endPoint, tab, filter, orderBy);
|
||||
this.fieldNameMap = {};
|
||||
this.hiddenFields = {};
|
||||
this.tableFields = {};
|
||||
this.formOnlyFields = {};
|
||||
}
|
||||
|
||||
getDataMapping() {
|
||||
return [
|
||||
'id',
|
||||
@@ -26,6 +34,21 @@ class ProjectAdapter extends AdapterBase {
|
||||
];
|
||||
}
|
||||
|
||||
getTableColumns() {
|
||||
return [
|
||||
{
|
||||
title: 'Name',
|
||||
dataIndex: 'name',
|
||||
sorter: true,
|
||||
},
|
||||
{
|
||||
title: 'Client',
|
||||
dataIndex: 'client',
|
||||
sorter: true,
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
getFormFields() {
|
||||
if (this.showSave) {
|
||||
return [
|
||||
@@ -60,7 +83,15 @@ class ProjectAdapter extends AdapterBase {
|
||||
*/
|
||||
|
||||
|
||||
class EmployeeProjectAdapter extends AdapterBase {
|
||||
class EmployeeProjectAdapter extends ReactModalAdapterBase {
|
||||
constructor(endPoint, tab, filter, orderBy) {
|
||||
super(endPoint, tab, filter, orderBy);
|
||||
this.fieldNameMap = {};
|
||||
this.hiddenFields = {};
|
||||
this.tableFields = {};
|
||||
this.formOnlyFields = {};
|
||||
}
|
||||
|
||||
getDataMapping() {
|
||||
return [
|
||||
'id',
|
||||
@@ -77,6 +108,22 @@ class EmployeeProjectAdapter extends AdapterBase {
|
||||
];
|
||||
}
|
||||
|
||||
getTableColumns() {
|
||||
return [
|
||||
{
|
||||
title: 'Employee',
|
||||
dataIndex: 'employee',
|
||||
sorter: true,
|
||||
},
|
||||
{
|
||||
title: 'Project',
|
||||
dataIndex: 'project',
|
||||
sorter: true,
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
getFormFields() {
|
||||
return [
|
||||
['id', { label: 'ID', type: 'hidden' }],
|
||||
|
||||
Reference in New Issue
Block a user