mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-15 19:24:28 +02:00
Code Issues Releases Wiki Activity

Update InputfieldFloat with option to better support string value decimal numbers

Browse Source
This commit is contained in:
Ryan Cramer
2021-01-22 14:15:53 -05:00
parent 9271e8d846
commit 76128e4855
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wire/modules/Fieldtype/FieldtypeFloat.module
View File

@@ -18,7 +18,7 @@ class FieldtypeFloat extends Fieldtype {
public static function getModuleInfo() {
return array(
'title' => __('Float', __FILE__),
'summary' => __('Field that stores a floating point (decimal) number', __FILE__),
'summary' => __('Field that stores a floating point number', __FILE__),
'version' => 106,
'permanent' => true,
);

16
wire/modules/Inputfield/InputfieldFloat.module
View File

@@ -6,7 +6,8 @@
* ProcessWire 3.x, Copyright 2020 by Ryan Cramer
* https://processwire.com
*
* @property int $precision
* @property int $precision Decimals precision
* @property int $digits Total digits, for when used in decimal mode (default=0)
* @property string $inputType Input type to use, one of "text" or "number"
* @property int|float $min
* @property int|float $max
@@ -35,6 +36,7 @@ class InputfieldFloat extends InputfieldInteger {
*/
public function __construct() {
$this->set('precision', 2);
$this->set('digits', 0);
parent::__construct();
}
@@ -69,7 +71,9 @@ class InputfieldFloat extends InputfieldInteger {
*/
protected function sanitizeValue($value) {
if(!strlen("$value")) return '';
if(!is_float($value) && !is_int($value)) {
if($this->digits > 0) {
return is_numeric("$value") ? (string) $value : '';
} else if(!is_float($value) && !is_int($value)) {
$value = $this->wire()->sanitizer->float($value, array('blankValue' => ''));
if(!strlen("$value")) return '';
}
@@ -92,7 +96,7 @@ class InputfieldFloat extends InputfieldInteger {
}
/**
* Override method from Inputfield to convert local specific decimals for input[type=number]
* Override method from Inputfield to convert locale specific decimals for input[type=number]
*
* @param array $attributes
* @return string
@@ -101,12 +105,14 @@ class InputfieldFloat extends InputfieldInteger {
public function getAttributesString(array $attributes = null) {
if($attributes && $attributes['type'] === 'number') {
$value = isset($attributes['value']) ? $attributes['value'] : null;
if(is_float($value) && strlen("$value") && !ctype_digit(str_replace('.', '', $value))) {
if(is_float($value) || is_string($value)) {
if(strlen("$value") && !ctype_digit(str_replace('.', '', ltrim($value, '-')))) {
// float value is using a non "." as decimal point, needs conversion because
// the HTML5 number input type requires "." as the decimal
$attributes['value'] = $this->localeConvertValue($value);
}
}
}
return parent::getAttributesString($attributes);
}
@@ -119,7 +125,7 @@ class InputfieldFloat extends InputfieldInteger {
*/
protected function localeConvertValue($value) {
if(!strlen("$value")) return $value;
if(ctype_digit(str_replace('.', '', $value))) return $value;
if(ctype_digit(str_replace('.', '', ltrim($value, '-')))) return $value;
$locale = localeconv();
$decimal = $locale['decimal_point'];
if($decimal === '.' || strpos($value, $decimal) === false) return $value;