Show custom field for email

rougin · Oct 12, 2024 · 018e1e4 · 018e1e4
1 parent 2820af1
commit 018e1e4
Show file tree

Hide file tree

Showing 13 changed files with 67 additions and 23 deletions.
diff --git a/TODO.txt b/TODO.txt
@@ -1,6 +1,5 @@
 add layout in controller if added
 custom field date types
-custom field email
 custom field gender
 multi relations in controller, model
 pagination template if bootstrap
diff --git a/src/Colfield.php b/src/Colfield.php
@@ -86,4 +86,16 @@ public function withClass($class)
 
         return $this;
     }
+
+    /**
+     * @param string $name
+     *
+     * @return self
+     */
+    public function withName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
 }
diff --git a/src/Template/Fields/BooleanField.php b/src/Template/Fields/BooleanField.php
@@ -39,16 +39,4 @@ public function getPlate()
 
         return $lines;
     }
-
-    /**
-     * @param string $name
-     *
-     * @return self
-     */
-    public function withName($name)
-    {
-        $this->name = $name;
-
-        return $this;
-    }
 }
diff --git a/src/Template/Fields/EmailField.php b/src/Template/Fields/EmailField.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Rougin\Combustor\Template\Fields;
+
+use Rougin\Combustor\Colfield;
+
+/**
+ * @package Combustor
+ *
+ * @author Rougin Gutib <[email protected]>
+ */
+class EmailField extends Colfield
+{
+    /**
+     * @return string[]
+     */
+    public function getPlate()
+    {
+        $class = $this->class;
+
+        $field = $this->accessor;
+
+        $name = $this->getName();
+
+        $html = '<?= form_input([\'type\' => \'email\', \'name\' => \'' . $name . '\', \'value\' => set_value(\'' . $name . '\')]) ?>';
+
+        if ($this->edit)
+        {
+            $html = str_replace('set_value(\'' . $name . '\')', 'set_value(\'' . $name . '\', ' . $field . ')', $html);
+        }
+
+        $html = str_replace(')]) ?>', '), \'class\' => \'' . $class . '\']) ?>', $html);
+
+        return array($html);
+    }
+}
diff --git a/src/Template/FormPlate.php b/src/Template/FormPlate.php
@@ -5,6 +5,7 @@
 use Rougin\Combustor\Inflector;
 use Rougin\Combustor\Template\Fields\BooleanField;
 use Rougin\Combustor\Template\Fields\DefaultField;
+use Rougin\Combustor\Template\Fields\EmailField;
 use Rougin\Describe\Column;
 
 /**
@@ -142,15 +143,17 @@ public function make($tab = '')
 
         $result = implode("\n", $lines);
 
-        // Replace all empty class placeholders -------------
+        // Replace all empty class placeholders ------------------
         $result = str_replace(' class=""', '', $result);
 
+        $result = str_replace(', \'class\' => \'\'', '', $result);
+
         $result = str_replace(', \'class=""\'', '', $result);
 
         $search = ', \'\', [\'class\' => \'\']';
 
         return str_replace($search, '', $result);
-        // --------------------------------------------------
+        // -------------------------------------------------------
     }
 
     /**
@@ -205,6 +208,12 @@ protected function getField(Column $column, $tab = '')
         $name = $this->getAccessor($column);
 
         $field = new DefaultField($this->edit, $tab);
+
+        if ($column->getField() === 'email')
+        {
+            $field = new EmailField($this->edit, $tab);
+        }
+
         $field->withName($column->getField());
 
         $class = $this->bootstrap ? 'form-control' : '';

diff --git a/tests/Fixture/Plates/Doctrine/Common/CreateView.php b/tests/Fixture/Plates/Doctrine/Common/CreateView.php
@@ -3,7 +3,7 @@
 <?= form_open('users/create') ?>
   <div>
     <?= form_label('Email') ?>
-    <?= form_input('email', set_value('email')) ?>
+    <?= form_input(['type' => 'email', 'name' => 'email', 'value' => set_value('email')]) ?>
     <?= form_error('email', '<div><span>', '</span></div>') ?>
   </div>
 

diff --git a/tests/Fixture/Plates/Doctrine/Common/EditView.php b/tests/Fixture/Plates/Doctrine/Common/EditView.php
@@ -5,7 +5,7 @@
 
   <div>
     <?= form_label('Email') ?>
-    <?= form_input('email', set_value('email', $item->get_email())) ?>
+    <?= form_input(['type' => 'email', 'name' => 'email', 'value' => set_value('email', $item->get_email())]) ?>
     <?= form_error('email', '<div><span>', '</span></div>') ?>
   </div>
 

diff --git a/tests/Fixture/Plates/Doctrine/Styled/CreateView.php b/tests/Fixture/Plates/Doctrine/Styled/CreateView.php
@@ -3,7 +3,7 @@
 <?= form_open('users/create') ?>
   <div class="mb-3">
     <?= form_label('Email', '', ['class' => 'form-label mb-0']) ?>
-    <?= form_input('email', set_value('email'), 'class="form-control"') ?>
+    <?= form_input(['type' => 'email', 'name' => 'email', 'value' => set_value('email'), 'class' => 'form-control']) ?>
     <?= form_error('email', '<div><span class="text-danger small">', '</span></div>') ?>
   </div>
 

diff --git a/tests/Fixture/Plates/Doctrine/Styled/EditView.php b/tests/Fixture/Plates/Doctrine/Styled/EditView.php
@@ -5,7 +5,7 @@
 
   <div class="mb-3">
     <?= form_label('Email', '', ['class' => 'form-label mb-0']) ?>
-    <?= form_input('email', set_value('email', $item->get_email()), 'class="form-control"') ?>
+    <?= form_input(['type' => 'email', 'name' => 'email', 'value' => set_value('email', $item->get_email()), 'class' => 'form-control']) ?>
     <?= form_error('email', '<div><span class="text-danger small">', '</span></div>') ?>
   </div>
 

diff --git a/tests/Fixture/Plates/Wildfire/Common/CreateView.php b/tests/Fixture/Plates/Wildfire/Common/CreateView.php
@@ -3,7 +3,7 @@
 <?= form_open('users/create') ?>
   <div>
     <?= form_label('Email') ?>
-    <?= form_input('email', set_value('email')) ?>
+    <?= form_input(['type' => 'email', 'name' => 'email', 'value' => set_value('email')]) ?>
     <?= form_error('email', '<div><span>', '</span></div>') ?>
   </div>
 

diff --git a/tests/Fixture/Plates/Wildfire/Common/EditView.php b/tests/Fixture/Plates/Wildfire/Common/EditView.php
@@ -5,7 +5,7 @@
 
   <div>
     <?= form_label('Email') ?>
-    <?= form_input('email', set_value('email', $item->email)) ?>
+    <?= form_input(['type' => 'email', 'name' => 'email', 'value' => set_value('email', $item->email)]) ?>
     <?= form_error('email', '<div><span>', '</span></div>') ?>
   </div>
 

diff --git a/tests/Fixture/Plates/Wildfire/Styled/CreateView.php b/tests/Fixture/Plates/Wildfire/Styled/CreateView.php
@@ -3,7 +3,7 @@
 <?= form_open('users/create') ?>
   <div class="mb-3">
     <?= form_label('Email', '', ['class' => 'form-label mb-0']) ?>
-    <?= form_input('email', set_value('email'), 'class="form-control"') ?>
+    <?= form_input(['type' => 'email', 'name' => 'email', 'value' => set_value('email'), 'class' => 'form-control']) ?>
     <?= form_error('email', '<div><span class="text-danger small">', '</span></div>') ?>
   </div>
 

diff --git a/tests/Fixture/Plates/Wildfire/Styled/EditView.php b/tests/Fixture/Plates/Wildfire/Styled/EditView.php
@@ -5,7 +5,7 @@
 
   <div class="mb-3">
     <?= form_label('Email', '', ['class' => 'form-label mb-0']) ?>
-    <?= form_input('email', set_value('email', $item->email), 'class="form-control"') ?>
+    <?= form_input(['type' => 'email', 'name' => 'email', 'value' => set_value('email', $item->email), 'class' => 'form-control']) ?>
     <?= form_error('email', '<div><span class="text-danger small">', '</span></div>') ?>
   </div>