From b71c1330285e2aad44b36743e0d1add4716ffc26 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Wed, 12 Feb 2020 12:06:36 +0300
Subject: [PATCH] feat(form-plugin): add datetimepicker field

---
 .../form/app/Controllers/FormController.php   | 27 ++++++-------------
 .../fields/datetimepicker/field.html          |  7 +++++
 2 files changed, 15 insertions(+), 19 deletions(-)
 create mode 100644 site/plugins/form/templates/fields/datetimepicker/field.html

diff --git a/site/plugins/form/app/Controllers/FormController.php b/site/plugins/form/app/Controllers/FormController.php
index 02d3b994..dbe169cf 100644
--- a/site/plugins/form/app/Controllers/FormController.php
+++ b/site/plugins/form/app/Controllers/FormController.php
@@ -546,7 +546,6 @@ class FormController extends Controller
         $current_value   = isset($properties['value']) ? $properties['value'] : $field_value;
 
         return $this->flextype['view']->fetch('plugins/form/templates/fields/tags/field.html', ['title' => $title, 'size' => $size, 'name' => $name, 'id' => $id, 'class' => $class, 'help' => $help , 'options' => $options, 'current_value' => $current_value]);
-
     }
 
     /**
@@ -563,26 +562,16 @@ class FormController extends Controller
      */
     protected function dateField(string $field_id, string $field_name, $field_value, array $properties) : string
     {
-        /*
-        $title = isset($properties['title']) ? $properties['title'] : '';
-        $size  = isset($properties['size'])  ? $this->sizes[$properties['size']] : $this->sizes['12'];
-        $help  = isset($properties['help'])  ? $properties['help'] : '';
 
-        $field  = '<div class="form-group ' . $size . '">';
-        $field .= ($title ? Form::label($field_id, __($title)) : '');
-        $field .= '<div class="input-group date" id="datetimepicker" data-target-input="nearest">';
-        $field .= '<input name="' . $field_name . '" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker" value="' . date($this->flextype->registry->get('settings.date_format'), strtotime($field_value)) . '" />
-                   <div class="input-group-append" data-target="#datetimepicker" data-toggle="datetimepicker">
-                      <div class="input-group-text"><i class="far fa-calendar-alt"></i></div>
-                   </div>';
-        $field .= ($help ? '<small class="form-text text-muted">' . __($help) . '</small>' : '');
-        $field .= '</div>';
-        $field .= '</div>';
+        $title  = isset($properties['title']) ? $properties['title'] : '';
+        $size   = isset($properties['size'])  ? $this->sizes[$properties['size']] : $this->sizes['12'];
+        $help   = isset($properties['help'])  ? $properties['help'] : '';
+        $id     = isset($properties['id'])    ? $properties['id'] : $field_id;
+        $name   = isset($properties['name'])  ? $properties['name'] : $field_name;
+        $class  = isset($properties['class']) ? $properties['class'] : $this->field_class;
+        $value  = isset($properties['value'])  ? $properties['value'] : $field_value;
 
-        return $field;
-        */
-
-        return '';
+        return $this->flextype['view']->fetch('plugins/form/templates/fields/datetimepicker/field.html', ['title' => $title, 'size' => $size, 'name' => $name, 'id' => $id, 'class' => $class, 'help' => $help, 'value' => $value]);
     }
 
     /**
diff --git a/site/plugins/form/templates/fields/datetimepicker/field.html b/site/plugins/form/templates/fields/datetimepicker/field.html
new file mode 100644
index 00000000..cc029c5d
--- /dev/null
+++ b/site/plugins/form/templates/fields/datetimepicker/field.html
@@ -0,0 +1,7 @@
+<div class="form-group {{ size }}">
+    <label for="{{ id }}" class="form-control-title">{{ tr(title) }}</label>
+    <input type="text" id="{{ id }}" name="{{ id }}" value="{{ value }}" class="js-datetimepicker {{ class }}">
+    {% if help %}
+        <small>{{ help }}</small>
+    {% endif %}
+</div>
\ No newline at end of file