Add form field valuator feature

dvlpp · Feb 11, 2016 · ba71344 · ba71344
1 parent c2a3764
commit ba71344
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/src/Dvlpp/Sharp/Config/SharpFormFieldConfig.php b/src/Dvlpp/Sharp/Config/SharpFormFieldConfig.php
@@ -50,6 +50,11 @@ abstract class SharpFormFieldConfig
      */
     protected $formatter;
 
+    /**
+     * @var string
+     */
+    protected $valuator;
+
     /**
      * @param string $label
      * @return $this
@@ -184,4 +189,23 @@ public function formatter()
     {
         return $this->formatter;
     }
+
+    /**
+     * @param string $valuator
+     * @return $this
+     */
+    public function setValuator($valuator)
+    {
+        $this->valuator = $valuator;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function valuator()
+    {
+        return $this->valuator;
+    }
 }
diff --git a/src/Dvlpp/Sharp/Form/Fields/AbstractSharpField.php b/src/Dvlpp/Sharp/Form/Fields/AbstractSharpField.php
@@ -107,12 +107,17 @@ function __construct($field, $attributes, $instance, $listKey)
                 $this->fieldValue = null;
 
             } else {
-                $this->fieldValue = $instance->{$field->key()};
+                if($field->valuator()) {
+                    // There's a field valuator, which override the model attribute
+                    $this->fieldValue = app($field->valuator())->valuateField($instance, $field);
+
+                } else {
+                    $this->fieldValue = $instance->{$field->key()};
+                }
 
                 if(strlen($this->fieldValue) && $field->formatter()) {
                     // There's a field formatter (for value display in form)
-                    $formatter = app($field->formatter());
-                    $this->fieldValue = $formatter->fieldValue($this->fieldValue);
+                    $this->fieldValue = app($field->formatter())->formatFieldValue($this->fieldValue);
                 }
             }
         }