From 744a56f7c6631955256794ef38b31feef65526bb Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Sat, 8 Feb 2020 16:42:27 +0300
Subject: [PATCH] feat(form-plugin): add several new fields #360

---
 .../form/app/Controllers/FormController.php   | 38 +++++++------------
 .../form/templates/fields/hidden/field.html   |  1 +
 .../fields/select-template/field.html         | 11 ++++++
 .../fields/select-visibility/field.html       | 11 ++++++
 4 files changed, 37 insertions(+), 24 deletions(-)
 create mode 100644 site/plugins/form/templates/fields/hidden/field.html
 create mode 100644 site/plugins/form/templates/fields/select-template/field.html
 create mode 100644 site/plugins/form/templates/fields/select-visibility/field.html

diff --git a/site/plugins/form/app/Controllers/FormController.php b/site/plugins/form/app/Controllers/FormController.php
index 04f76169..8033949f 100644
--- a/site/plugins/form/app/Controllers/FormController.php
+++ b/site/plugins/form/app/Controllers/FormController.php
@@ -303,9 +303,10 @@ class FormController extends Controller
         $size  = isset($properties['size'])  ? $this->sizes[$properties['size']] : $this->sizes['12'];
         $help  = isset($properties['help'])  ? $properties['help'] : '';
 
-        $attributes = isset($properties['attributes']) ? $properties['attributes'] : [];
-        $attributes['id'] = isset($attributes['id']) ? $attributes['id'] : $field_id;
-        $attributes['class'] = isset($attributes['class']) ? $attributes['class'] : $this->field_class . ' js-select';
+        $id      = isset($properties['id'])    ? $properties['id'] : $field_id;
+        $class   = isset($properties['class']) ? $properties['class'] . $this->field_class : $this->field_class;
+        $name    = isset($properties['name'])  ? $properties['name'] : $field_name;
+        $current_value   = isset($properties['value']) ? $properties['value'] : $field_value;
 
         $_templates_list = $this->flextype['themes']->getTemplates($this->flextype['registry']->get('settings.theme'));
 
@@ -321,13 +322,7 @@ class FormController extends Controller
             }
         }
 
-        $field  = '<div class="form-group ' . $size . '">';
-        $field .= ($title ? Form::label($field_id, __($title)) : '');
-        $field .= Form::select($field_name, $options, $field_value, $attributes);
-        $field .= ($help ? '<small class="form-text text-muted">' . __($help) . '</small>' : '');
-        $field .= '</div>';
-
-        return $field;
+        return $this->flextype['view']->fetch('plugins/form/templates/fields/select-template/field.html', ['title' => $title, 'size' => $size, 'name' => $name, 'id' => $id, 'class' => $class, 'help' => $help , 'options' => $options, 'current_value' => $current_value]);
     }
 
     /**
@@ -442,10 +437,11 @@ class FormController extends Controller
      */
     protected function hiddenField(string $field_id, string $field_name, $field_value, array $properties) : string
     {
-        $attributes = isset($properties['attributes']) ? $properties['attributes'] : [];
-        $attributes['id'] = isset($attributes['id']) ? $attributes['id'] : $field_id;
+        $id    = isset($properties['field_name'])  ? $properties['field_name'] : $field_id;
+        $name  = isset($properties['field_name'])  ? $properties['field_name'] : $field_name;
+        $value = isset($properties['field_value']) ? $properties['field_value'] : $field_value;
 
-        return Form::hidden($field_name, $field_value, $attributes);
+        return $this->flextype['view']->fetch('plugins/form/templates/fields/hidden/field.html', ['id' => $id, 'name' => $name, 'value' => $value]);
     }
 
     /**
@@ -491,18 +487,12 @@ class FormController extends Controller
         $size  = isset($properties['size'])  ? $this->sizes[$properties['size']] : $this->sizes['12'];
         $help  = isset($properties['help'])  ? $properties['help'] : '';
         $options = ['draft' => __('admin_entries_draft'), 'visible' => __('admin_entries_visible'), 'hidden' => __('admin_entries_hidden')];
+        $id      = isset($properties['id'])    ? $properties['id'] : $field_id;
+        $class   = isset($properties['class']) ? $properties['class'] . $this->field_class : $this->field_class;
+        $name    = isset($properties['name'])  ? $properties['name'] : $field_name;
+        $current_value   = isset($properties['value']) ? $properties['value'] : $field_value;
 
-        $attributes = isset($properties['attributes']) ? $properties['attributes'] : [];
-        $attributes['id'] = isset($attributes['id']) ? $attributes['id'] : $field_id;
-        $attributes['class'] = isset($attributes['class']) ? $attributes['class'] : $this->field_class . ' js-select';
-
-        $field  = '<div class="form-group ' . $size . '">';
-        $field .= ($title ? Form::label($field_id, __($title)) : '');
-        $field .= Form::select($field_name, $options, (! empty($field_value) ? $field_value : 'visible'), $attributes);
-        $field .= ($help ? '<small class="form-text text-muted">' . __($help) . '</small>' : '');
-        $field .= '</div>';
-
-        return $field;
+        return $this->flextype['view']->fetch('plugins/form/templates/fields/select-visibility/field.html', ['title' => $title, 'size' => $size, 'name' => $name, 'id' => $id, 'class' => $class, 'help' => $help , 'options' => $options, 'current_value' => $current_value]);
     }
 
     /**
diff --git a/site/plugins/form/templates/fields/hidden/field.html b/site/plugins/form/templates/fields/hidden/field.html
new file mode 100644
index 00000000..ceb9c1fb
--- /dev/null
+++ b/site/plugins/form/templates/fields/hidden/field.html
@@ -0,0 +1 @@
+<input type="hidden" name="{{ name }}" id="{{ id }}" value="{{ value }}">
\ No newline at end of file
diff --git a/site/plugins/form/templates/fields/select-template/field.html b/site/plugins/form/templates/fields/select-template/field.html
new file mode 100644
index 00000000..9b7603c8
--- /dev/null
+++ b/site/plugins/form/templates/fields/select-template/field.html
@@ -0,0 +1,11 @@
+<div class="form-group {{ size }}">
+    <label for="{{ id }}" class="form-control-title">{{ tr(title) }}</label>
+    <select class="{{ class }} js-select" name="{{ name }}">
+        {% for key, value in options %}
+            <option value="{{ key }}" {% if key == current_value %} selected="selected" {% endif %}>{{ value }}</option>
+        {% endfor %}
+    </select>
+    {% if help %}
+        <small>{{ help }}</small>
+    {% endif %}
+</div>
\ No newline at end of file
diff --git a/site/plugins/form/templates/fields/select-visibility/field.html b/site/plugins/form/templates/fields/select-visibility/field.html
new file mode 100644
index 00000000..9b7603c8
--- /dev/null
+++ b/site/plugins/form/templates/fields/select-visibility/field.html
@@ -0,0 +1,11 @@
+<div class="form-group {{ size }}">
+    <label for="{{ id }}" class="form-control-title">{{ tr(title) }}</label>
+    <select class="{{ class }} js-select" name="{{ name }}">
+        {% for key, value in options %}
+            <option value="{{ key }}" {% if key == current_value %} selected="selected" {% endif %}>{{ value }}</option>
+        {% endfor %}
+    </select>
+    {% if help %}
+        <small>{{ help }}</small>
+    {% endif %}
+</div>
\ No newline at end of file