Merge pull request #7 from vint47/master

Skip empty string in form values; Add element datetime;

Author: codeator

src/Form.php

@@ -134,6 +134,20 @@ public function addElementText($name, $validators = '')
         return $this->elements[$name];
     }
 
+    /**
+     * @param $name
+     * @param string $validators
+     * @return \Merkeleon\Form\Form\Element\DateTime
+     */
+    public function addElementDateTime($name, $validators = '')
+    {
+        $element = new Element\DateTime($name, $validators);
+        $element->setTheme($this->theme);
+
+        $this->elements[$name] = $element;
+        return $this->elements[$name];
+    }
+
     /**
      * @param $name
      * @param string $validators
@@ -375,12 +389,15 @@ public function errors()
         return $this->errors;
     }
 
-    public function values()
+    public function values($skipEmptyString = false)
     {
         $data = [];
         foreach ($this->elements as $name => $element) {
             if(!$element->isIgnored()) {
-                array_set($data, $name, $element->value());
+                $value = $element->value();
+                if (!$skipEmptyString || $skipEmptyString && $value !== '') {
+                    array_set($data, $name, $value);
+                }
             }
         }
 

src/Form/Element/Date.php

@@ -19,8 +19,7 @@ public function value()
         if ($this->value === '') {
             $value = null;
         } else {
-            $value = Carbon::parse($this->value, current_timezone())
-                  ->setTimezone('UTC');
+            $value = Carbon::parse($this->value);
         }
 
         return $value;
@@ -30,17 +29,15 @@ public function setValue($value, $force = false)
     {
         if ($force || !$this->hasOldValue)
         {
-            $this->value = Carbon::parse($value, 'UTC')
-                                 ->setTimezone(current_timezone());
+            $this->value = Carbon::parse($value);
         }
 
         return $this;
     }
 
-
     public function view()
     {
-        $this->addAttributes(['data-toggle' => 'datetimepicker']);
+        $this->addAttributes(['data-toggle' => 'datepicker']);
 
         return view('form::' . $this->theme . '.element.text', [
             'name'        => $this->name,

src/Form/Element/DateTime.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace Merkeleon\Form\Form\Element;
+
+use Carbon\Carbon;
+use Merkeleon\Form\Form\Element;
+
+class DateTime extends Element
+{
+
+    public function value()
+    {
+        if ($this->value === '') {
+            $value = null;
+        } else {
+            $value = Carbon::parse($this->value, current_timezone())
+                  ->setTimezone('UTC');
+        }
+
+        return $value;
+    }
+
+    public function setValue($value, $force = false)
+    {
+        if ($force || !$this->hasOldValue)
+        {
+            $this->value = Carbon::parse($value, 'UTC')
+                                 ->setTimezone(current_timezone());
+        }
+
+        return $this;
+    }
+
+
+    public function view()
+    {
+        $this->addAttributes(['data-toggle' => 'datetimepicker']);
+
+        return view('form::' . $this->theme . '.element.text', [
+            'name'        => $this->name,
+            'elementName' => $this->elementName,
+            'error'       => $this->error,
+            'label'       => $this->label,
+            'value'       => $this->value,
+            'placeholder' => $this->placeholder,
+            'postfix'     => $this->postfix,
+            'class'       => $this->class,
+            'attributes'  => $this->attributes
+        ]);
+    }
+
+}