tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1731 from wilr/open5551

Browse Source 
FIX: Decimal field change detection.
This commit is contained in:
Ingo Schommer 2013-04-06 04:32:27 -07:00
commit 700453b7dc
1 changed files with 54 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
model/fieldtypes/Decimal.php
View File

@ -1,43 +1,67 @@
<?php <?php
/** /**
* Represents a Decimal field. * Represents a Decimal field.
*
* @package framework * @package framework
* @subpackage model * @subpackage model
*/ */
class Decimal extends DBField { class Decimal extends DBField {
protected $wholeSize, $decimalSize, $defaultValue; protected $wholeSize, $decimalSize, $defaultValue;
/** /**
* Create a new Decimal field. * Create a new Decimal field.
*
* @param string $name
* @param int $wholeSize
* @param int $decimalSize
* @param float $defaultValue
*/ */
public function __construct($name = null, $wholeSize = 9, $decimalSize = 2, $defaultValue = 0) { public function __construct($name = null, $wholeSize = 9, $decimalSize = 2, $defaultValue = 0) {
$this->wholeSize = isset($wholeSize) ? $wholeSize : 9; $this->wholeSize = is_int($wholeSize) ? $wholeSize : 9;
$this->decimalSize = isset($decimalSize) ? $decimalSize : 2; $this->decimalSize = is_int($decimalSize) ? $decimalSize : 2;
$this->defaultValue = $defaultValue;
$this->defaultValue = number_format((float) $defaultValue, $decimalSize);;
parent::__construct($name); parent::__construct($name);
} }
/**
* @return float
*/
public function Nice() { public function Nice() {
return number_format($this->value,$this->decimalSize); return number_format($this->value, $this->decimalSize);
} }
/**
* @return int
*/
public function Int() { public function Int() {
return floor( $this->value ); return floor($this->value);
} }
public function requireField() { public function requireField() {
$parts=Array( $parts = array(
'datatype'=>'decimal', 'datatype' => 'decimal',
'precision'=>"$this->wholeSize,$this->decimalSize", 'precision' => "$this->wholeSize,$this->decimalSize",
'default'=>(double)$this->defaultValue, 'default' => $this->defaultValue,
'arrayValue'=>$this->arrayValue); 'arrayValue' => $this->arrayValue
);
$values=Array('type'=>'decimal', 'parts'=>$parts); $values = array(
'type' => 'decimal',
'parts' => $parts
);
DB::requireField($this->tableName, $this->name, $values); DB::requireField($this->tableName, $this->name, $values);
} }
/**
* @param DataObject $dataObject
*/
public function saveInto($dataObject) { public function saveInto($dataObject) {
$fieldName = $this->name; $fieldName = $this->name;
if($fieldName) { if($fieldName) {
$dataObject->$fieldName = (float)preg_replace('/[^0-9.\-\+]/', '', $this->value); $dataObject->$fieldName = (float)preg_replace('/[^0-9.\-\+]/', '', $this->value);
} else { } else {
@ -45,31 +69,42 @@ class Decimal extends DBField {
} }
} }
/**
* @param string $title
* @param array $params
*
* @return NumericField
*/
public function scaffoldFormField($title = null, $params = null) { public function scaffoldFormField($title = null, $params = null) {
return new NumericField($this->name, $title); return new NumericField($this->name, $title);
} }
/**
* @return float
*/
public function nullValue() { public function nullValue() {
return "0.00"; return "0.00";
} }
/** /**
* Return an encoding of the given value suitable for inclusion in a SQL statement. * Return an encoding of the given value suitable for inclusion in a SQL
* If necessary, this should include quotes. * statement. If necessary, this should include quotes.
*
* @param float $value
*
* @return mixed
*/ */
public function prepValueForDB($value) { public function prepValueForDB($value) {
if($value === true) { if($value === true) {
return 1; return 1;
} if(!$value || !is_numeric($value)) { } if(!$value || !is_numeric($value)) {
if(strpos($value, '[')===false) if(strpos($value, '[') === false) {
return '0'; return '0';
else } else {
return Convert::raw2sql($value); return Convert::raw2sql($value);
}
} else { } else {
return Convert::raw2sql($value); return Convert::raw2sql($value);
} }
} }
} }