espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

range fields autonumeric

Browse Source
This commit is contained in:
Yuri Kuznetsov
2023-04-10 15:17:06 +03:00
parent 66a6f70a30
commit a07cb5ef38
9 changed files with 145 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Resources/metadata/fields/rangeCurrency.json
+10 -2
View File
@@ -5,10 +5,18 @@
],
"fields": {
"from": {
"type": "currency"
"type": "currency",
"layoutAvailabilityList": [
"filters",
"massUpdate"
]
},
"to": {
"type": "currency"
"type": "currency",
"layoutAvailabilityList": [
"filters",
"massUpdate"
]
}
},
"naming": "prefix",
application/Espo/Resources/metadata/fields/rangeFloat.json
+10 -2
View File
@@ -5,10 +5,18 @@
],
"fields": {
"from": {
"type": "float"
"type": "float",
"layoutAvailabilityList": [
"filters",
"massUpdate"
]
},
"to": {
"type": "float"
"type": "float",
"layoutAvailabilityList": [
"filters",
"massUpdate"
]
}
},
"naming": "prefix",
application/Espo/Resources/metadata/fields/rangeInt.json
+10 -2
View File
@@ -5,10 +5,18 @@
],
"fields": {
"from": {
"type": "int"
"type": "int",
"layoutAvailabilityList": [
"filters",
"massUpdate"
]
},
"to": {
"type": "int"
"type": "int",
"layoutAvailabilityList": [
"filters",
"massUpdate"
]
}
},
"naming": "prefix",
client/src/views/fields/currency.js
-48
View File
@@ -158,54 +158,6 @@ function (Dep, /** module:ui/select*/Select) {
return this.formatNumberDetail(value);
},
/**
* @todo Remove. Used in range.
*/
formatNumberEdit: function (value) {
let currencyDecimalPlaces = this.decimalPlaces;
if (value !== null) {
var parts = value.toString().split(".");
parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, this.thousandSeparator);
if (parts.length > 1) {
if (
currencyDecimalPlaces &&
parts[1].length < currencyDecimalPlaces
) {
var limit = currencyDecimalPlaces - parts[1].length;
for (var i = 0; i < limit; i++) {
parts[1] += '0';
}
}
if (
this.params.decimal &&
currencyDecimalPlaces &&
parts[1].length > currencyDecimalPlaces
) {
let i = parts[1].length - 1;
while (i >= currencyDecimalPlaces) {
if (parts[1][i] !== '0') {
break;
}
i--;
}
parts[1] = parts[1].substring(0, i + 1);
}
}
return parts.join(this.decimalMark);
}
return '';
},
formatNumberDetail: function (value) {
if (value !== null) {
let currencyDecimalPlaces = this.decimalPlaces;
client/src/views/fields/float.js
-15
View File
@@ -101,21 +101,6 @@ define('views/fields/float', ['views/fields/int'], function (Dep) {
return this.formatNumberDetail(value);
},
/**
* @todo Remove. Used in range.
*/
formatNumberEdit: function (value) {
if (value === null) {
return '';
}
let parts = value.toString().split(".");
parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, this.thousandSeparator);
return parts.join(this.decimalMark);
},
formatNumberDetail: function (value) {
if (value === null) {
return '';
client/src/views/fields/int.js
-15
View File
@@ -203,21 +203,6 @@ define('views/fields/int', ['views/fields/base', 'lib!autonumeric'], function (D
return stringValue;
},
/**
* @todo Remove. Used in range.
*/
formatNumberEdit: function (value) {
if (value === null) {
return '';
}
let stringValue = value.toString();
stringValue = stringValue.replace(/\B(?=(\d{3})+(?!\d))/g, this.thousandSeparator);
return stringValue;
},
setupSearch: function () {
this.events = _.extend({
'change select.search-type': (e) => {
client/src/views/fields/range-currency.js
+44 -15
View File
@@ -26,7 +26,8 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
define('views/fields/range-currency', ['views/fields/range-float'], function (Dep, Float) {
define('views/fields/range-currency',
['views/fields/range-float', 'views/fields/currency', 'ui/select'], function (Dep, Currency, Select) {
return Dep.extend({
@@ -55,46 +56,74 @@ define('views/fields/range-currency', ['views/fields/range-float'], function (De
this.currencyField = this.name + 'Currency';
this.currencyList = this.getConfig().get('currencyList') || ['USD'];
this.decimalPlaces = this.getConfig().get('currencyDecimalPlaces');
},
setupAutoNumericOptions: function () {
this.autoNumericOptions = {
digitGroupSeparator: this.thousandSeparator || '',
decimalCharacter: this.decimalMark,
modifyValueOnWheel: false,
selectOnFocus: false,
decimalPlaces: this.decimalPlaces,
allowDecimalPadding: true,
showWarnings: false,
formulaMode: true,
};
if (this.decimalPlaces === null) {
this.autoNumericOptions.decimalPlaces = this.decimalPlacesRawValue;
this.autoNumericOptions.decimalPlacesRawValue = this.decimalPlacesRawValue;
this.autoNumericOptions.allowDecimalPadding = false;
}
},
afterRender: function () {
Dep.prototype.afterRender.call(this);
if (this.mode === 'edit') {
if (this.mode === this.MODE_EDIT) {
this.$currency = this.$el.find('[data-name="' + this.currencyField + '"]');
Select.init(this.$currency);
}
},
formatNumber: function (value) {
return Currency.prototype.formatNumberDetail.call(this, value);
},
getValueForDisplay: function () {
var fromValue = this.model.get(this.fromField);
var toValue = this.model.get(this.toField);
let fromValue = this.model.get(this.fromField);
let toValue = this.model.get(this.toField);
fromValue = isNaN(fromValue) ? null : fromValue;
toValue = isNaN(toValue) ? null : toValue;
var currencyValue = this.model.get(this.fromCurrencyField) ||
let currencyValue = this.model.get(this.fromCurrencyField) ||
this.model.get(this.toCurrencyField);
let symbol = this.getMetadata().get(['app', 'currency', 'symbolMap', currencyValue]) || currencyValue;
if (fromValue !== null && toValue !== null) {
return this.formatNumber(fromValue) + ' &#8211 ' +
this.formatNumber(toValue) + ' ' + currencyValue + '';
this.formatNumber(toValue) + ' ' + symbol + '';
}
else if (fromValue) {
return '&#62;&#61; ' + this.formatNumber(fromValue) + ' '+currencyValue+'';
if (fromValue) {
return '&#62;&#61; ' + this.formatNumber(fromValue) + ' ' + symbol+'';
}
else if (toValue) {
return '&#60;&#61; ' + this.formatNumber(toValue) + ' '+currencyValue+'';
}
else {
return this.translate('None');
if (toValue) {
return '&#60;&#61; ' + this.formatNumber(toValue) + ' ' + symbol+'';
}
return this.translate('None');
},
fetch: function () {
var data = Dep.prototype.fetch.call(this);
var currencyValue = this.$currency.val();
let currencyValue = this.$currency.val();
if (data[this.fromField] !== null) {
data[this.fromCurrencyField] = currencyValue;
client/src/views/fields/range-float.js
+19 -11
View File
@@ -34,10 +34,26 @@ define('views/fields/range-float', ['views/fields/range-int', 'views/fields/floa
validations: ['required', 'float', 'range', 'order'],
decimalPlacesRawValue: 10,
setupAutoNumericOptions: function () {
this.autoNumericOptions = {
digitGroupSeparator: this.thousandSeparator || '',
decimalCharacter: this.decimalMark,
modifyValueOnWheel: false,
selectOnFocus: false,
decimalPlaces: this.decimalPlacesRawValue,
decimalPlacesRawValue: this.decimalPlacesRawValue,
allowDecimalPadding: false,
showWarnings: false,
formulaMode: true,
};
},
validateFloat: function () {
var validate = (name) => {
let validate = (name) => {
if (isNaN(this.model.get(name))) {
var msg = this.translate('fieldShouldBeFloat', 'messages')
let msg = this.translate('fieldShouldBeFloat', 'messages')
.replace('{field}', this.getLabelText());
this.showValidationMessage(msg, '[data-name="'+name+'"]');
@@ -46,7 +62,7 @@ define('views/fields/range-float', ['views/fields/range-int', 'views/fields/floa
}
};
var result = false;
let result = false;
result = validate(this.fromField) || result;
result = validate(this.toField) || result;
@@ -59,16 +75,8 @@ define('views/fields/range-float', ['views/fields/range-int', 'views/fields/floa
},
formatNumber: function (value) {
return Float.prototype.formatNumber.call(this, value);
},
formatNumberDetail: function (value) {
return Float.prototype.formatNumberDetail.call(this, value);
},
formatNumberEdit: function (value) {
return Float.prototype.formatNumberEdit.call(this, value);
},
});
});
client/src/views/fields/range-int.js
+52 -21
View File
@@ -26,22 +26,21 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
define('views/fields/range-int', ['views/fields/base', 'views/fields/int'], function (Dep, Int) {
define('views/fields/range-int',
['views/fields/base', 'views/fields/int', 'lib!autonumeric'], function (Dep, Int, AutoNumeric) {
return Dep.extend({
type: 'rangeInt',
listTemplate: 'fields/range-int/detail',
detailTemplate: 'fields/range-int/detail',
editTemplate: 'fields/range-int/edit',
validations: ['required', 'int', 'range', 'order'],
data: function () {
var data = Dep.prototype.data.call(this);
let data = Dep.prototype.data.call(this);
data.ucName = Espo.Utils.upperCaseFirst(this.name);
data.fromValue = this.model.get(this.fromField);
@@ -60,8 +59,8 @@ define('views/fields/range-int', ['views/fields/base', 'views/fields/int'], func
},
getValueForDisplay: function () {
var fromValue = this.model.get(this.fromField);
var toValue = this.model.get(this.toField);
let fromValue = this.model.get(this.fromField);
let toValue = this.model.get(this.toField);
fromValue = isNaN(fromValue) ? null : fromValue;
toValue = isNaN(toValue) ? null : toValue;
@@ -100,10 +99,37 @@ define('views/fields/range-int', ['views/fields/base', 'views/fields/int'], func
}
},
setupFinal: function () {
Dep.prototype.setupFinal.call(this);
this.setupAutoNumericOptions();
},
/**
* @protected
*/
setupAutoNumericOptions: function () {
let separator = (!this.disableFormatting ? this.thousandSeparator : null) || '';
let decimalCharacter = '.';
if (separator === '.') {
decimalCharacter = ',';
}
this.autoNumericOptions = {
digitGroupSeparator: separator,
decimalCharacter: decimalCharacter,
modifyValueOnWheel: false,
decimalPlaces: 0,
selectOnFocus: false,
formulaMode: true,
};
},
afterRender: function () {
Dep.prototype.afterRender.call(this);
if (this.mode === 'edit') {
if (this.mode === this.MODE_EDIT) {
this.$from = this.$el.find('[data-name="' + this.fromField + '"]');
this.$to = this.$el.find('[data-name="' + this.toField + '"]');
@@ -114,6 +140,11 @@ define('views/fields/range-int', ['views/fields/base', 'views/fields/int'], func
this.$to.on('change', () => {
this.trigger('change');
});
if (this.autoNumericOptions) {
this.autoNumericInstance1 = new AutoNumeric(this.$from.get(0), this.autoNumericOptions);
this.autoNumericInstance2 = new AutoNumeric(this.$to.get(0), this.autoNumericOptions);
}
}
},
@@ -131,7 +162,7 @@ define('views/fields/range-int', ['views/fields/base', 'views/fields/int'], func
}
};
var result = false;
let result = false;
result = validate(this.fromField) || result;
result = validate(this.toField) || result;
@@ -140,7 +171,7 @@ define('views/fields/range-int', ['views/fields/base', 'views/fields/int'], func
},
validateInt: function () {
var validate = (name) => {
let validate = (name) => {
if (isNaN(this.model.get(name))) {
var msg = this.translate('fieldShouldBeInt', 'messages')
.replace('{field}', this.getLabelText());
@@ -151,7 +182,7 @@ define('views/fields/range-int', ['views/fields/base', 'views/fields/int'], func
}
};
var result = false;
let result = false;
result = validate(this.fromField) || result;
result = validate(this.toField) || result;
@@ -160,7 +191,7 @@ define('views/fields/range-int', ['views/fields/base', 'views/fields/int'], func
},
validateRange: function () {
var validate = (name) => {
let validate = (name) => {
var value = this.model.get(name);
if (value === null) {
@@ -172,7 +203,7 @@ define('views/fields/range-int', ['views/fields/base', 'views/fields/int'], func
if (minValue !== null && maxValue !== null) {
if (value < minValue || value > maxValue ) {
var msg = this.translate('fieldShouldBeBetween', 'messages')
let msg = this.translate('fieldShouldBeBetween', 'messages')
.replace('{field}', this.translate(name, 'fields', this.model.name))
.replace('{min}', minValue)
.replace('{max}', maxValue);
@@ -184,7 +215,7 @@ define('views/fields/range-int', ['views/fields/base', 'views/fields/int'], func
} else {
if (minValue !== null) {
if (value < minValue) {
var msg = this.translate('fieldShouldBeLess', 'messages')
let msg = this.translate('fieldShouldBeLess', 'messages')
.replace('{field}', this.translate(name, 'fields', this.model.name))
.replace('{value}', minValue);
@@ -194,7 +225,7 @@ define('views/fields/range-int', ['views/fields/base', 'views/fields/int'], func
}
} else if (maxValue !== null) {
if (value > maxValue) {
var msg = this.translate('fieldShouldBeGreater', 'messages')
let msg = this.translate('fieldShouldBeGreater', 'messages')
.replace('{field}', this.translate(name, 'fields', this.model.name))
.replace('{value}', maxValue);
@@ -206,7 +237,7 @@ define('views/fields/range-int', ['views/fields/base', 'views/fields/int'], func
}
};
var result = false;
let result = false;
result = validate(this.fromField) || result;
result = validate(this.toField) || result;
@@ -215,12 +246,12 @@ define('views/fields/range-int', ['views/fields/base', 'views/fields/int'], func
},
validateOrder: function () {
var fromValue = this.model.get(this.fromField);
var toValue = this.model.get(this.toField);
let fromValue = this.model.get(this.fromField);
let toValue = this.model.get(this.toField);
if (fromValue !== null && toValue !== null) {
if (fromValue > toValue) {
var msg = this.translate('fieldShouldBeGreater', 'messages')
let msg = this.translate('fieldShouldBeGreater', 'messages')
.replace('{field}', this.translate(this.toField, 'fields', this.model.name))
.replace('{value}', this.translate(this.fromField, 'fields', this.model.name));
@@ -241,11 +272,11 @@ define('views/fields/range-int', ['views/fields/base', 'views/fields/int'], func
},
formatNumber: function (value) {
return value;
return Int.prototype.formatNumberDetail.call(this, value);
},
fetch: function (form) {
var data = {};
fetch: function () {
let data = {};
data[this.fromField] = this.parse(this.$from.val().trim());
data[this.toField] = this.parse(this.$to.val().trim());