add default locale, add translations, add form element width field, a…

…dd order field
sulu · Jun 12, 2016 · 3b590a5 · 3b590a5
1 parent 6449463
commit 3b590a5
Show file tree

Hide file tree

Showing 16 changed files with 314 additions and 135 deletions.
diff --git a/Controller/FormController.php b/Controller/FormController.php
@@ -78,13 +78,43 @@ public function getFieldDescriptors($locale, $filters)
                 [
                     'defaultTranslation' => new DoctrineJoinDescriptor(
                         'defaultTranslation',
-                        Form::class . '.defaultTranslation'
+                        Form::class . '.translations',
+                        sprintf('defaultTranslation.locale = %s.defaultLocale', Form::class)
                     ),
                 ]
             ),
             'public.title'
         );
 
+        $fieldDescriptors['changed'] = new DoctrineCaseFieldDescriptor(
+            'changed',
+            new DoctrineDescriptor(
+                'translation',
+                'changed',
+                [
+                    'translation' => new DoctrineJoinDescriptor(
+                        'translation',
+                        Form::class . '.translations',
+                        sprintf('translation.locale = \'%s\'', $locale)
+                    ),
+                ]
+            ),
+            new DoctrineDescriptor(
+                'defaultTranslation',
+                'changed',
+                [
+                    'defaultTranslation' => new DoctrineJoinDescriptor(
+                        'defaultTranslation',
+                        Form::class . '.translations',
+                        sprintf('defaultTranslation.locale = %s.defaultLocale', Form::class)
+                    ),
+                ]
+            ),
+            'public.changed',
+            false,
+            false
+        );
+
         return $fieldDescriptors;
     }
 
@@ -141,13 +171,41 @@ public function cgetTemplateAction(Request $request)
             'attachment',
             'checkbox',
             'choice',
-            'multiple-choice',
+            'multipleChoice',
+        ];
+
+        $widths = [
+            [
+                'id' => 'full',
+                'name' => 'l91_sulu_form.width.full',
+            ],
+            [
+                'id' => 'half',
+                'name' => 'l91_sulu_form.width.half',
+            ],
+            [
+                'id' => 'one-third',
+                'name' => 'l91_sulu_form.width.one-third',
+            ],
+            [
+                'id' => 'two-thirds',
+                'name' => 'l91_sulu_form.width.two-thirds',
+            ],
+            [
+                'id' => 'one-quarter',
+                'name' => 'l91_sulu_form.width.one-quarter',
+            ],
+            [
+                'id' => 'three-quarters',
+                'name' => 'l91_sulu_form.width.three-quarters',
+            ],
         ];
 
         return $this->render(
             $this->getBundleName() . ':' . $this->getListName() . ':template.html.twig',
             [
                 'types' => $types,
+                'widths' => $widths,
             ]
         );
     }
@@ -328,8 +386,8 @@ protected function getFilters(Request $request)
         unset($filters['flat']);
 
         $filters['fields'] = $listRestHelper->getFields();
-        $filters['limit'] = (int)$listRestHelper->getLimit();
-        $filters['offset'] = (int)$listRestHelper->getOffset();
+        $filters['limit'] = (int) $listRestHelper->getLimit();
+        $filters['offset'] = (int) $listRestHelper->getOffset();
         $filters['sortColumn'] = $listRestHelper->getSortColumn();
         $filters['sortOrder'] = $listRestHelper->getSortOrder();
         $filters['searchFields'] = $listRestHelper->getSearchFields();

diff --git a/Entity/Form.php b/Entity/Form.php
@@ -2,6 +2,8 @@
 
 namespace L91\Sulu\Bundle\FormBundle\Entity;
 
+use Doctrine\Common\Collections\ArrayCollection;
+
 class Form
 {
     /**
@@ -10,9 +12,9 @@ class Form
     private $id;
 
     /**
-     * @var FormTranslation
+     * @var string
      */
-    private $defaultTranslation;
+    private $defaultLocale;
 
     /**
      * @var \Doctrine\Common\Collections\Collection|FormTranslation[]
@@ -29,8 +31,8 @@ class Form
      */
     public function __construct()
     {
-        $this->translations = new \Doctrine\Common\Collections\ArrayCollection();
-        $this->fields = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->translations = new ArrayCollection();
+        $this->fields = new ArrayCollection();
     }
 
     /**
@@ -42,23 +44,19 @@ public function getId()
     }
 
     /**
-     * @param FormTranslation $defaultTranslation
-     *
-     * @return Form
+     * @return string
      */
-    public function setDefaultTranslation(FormTranslation $defaultTranslation = null)
+    public function getDefaultLocale()
     {
-        $this->defaultTranslation = $defaultTranslation;
-
-        return $this;
+        return $this->defaultLocale;
     }
 
     /**
-     * @return FormTranslation
+     * @param string $defaultLocale
      */
-    public function getDefaultTranslation()
+    public function setDefaultLocale($defaultLocale)
     {
-        return $this->defaultTranslation;
+        $this->defaultLocale = $defaultLocale;
     }
 
     /**
@@ -93,7 +91,7 @@ public function getTranslations()
      * @param string $locale
      * @param bool $create
      *
-     * @return FormTranslation
+     * @return FormTranslation|null
      */
     public function getTranslation($locale, $create = false)
     {
@@ -103,12 +101,14 @@ public function getTranslation($locale, $create = false)
             }
         }
 
-        if ($create) {
-            $translation = new FormTranslation();
-            $translation->setLocale($locale);
-
-            return $translation;
+        if (!$create) {
+            return;
         }
+
+        $translation = new FormTranslation();
+        $translation->setLocale($locale);
+
+        return $translation;
     }
 
     /**
@@ -143,7 +143,7 @@ public function getFields()
      * @param string $key
      * @param bool $create
      *
-     * @return FormField
+     * @return FormField|null
      */
     public function getField($key, $create = false)
     {
@@ -153,11 +153,31 @@ public function getField($key, $create = false)
             }
         }
 
-        if ($create) {
-            $field = new FormField();
-            $field->setKey($key);
+        if (!$create) {
+            return;
+        }
+
+        $field = new FormField();
+        $field->setKey($key);
 
-            return $field;
+        return $field;
+    }
+
+    /**
+     * @param $keys
+     *
+     * @return FormField[]
+     */
+    public function getFieldsNotInArray($keys)
+    {
+        $fields = [];
+
+        foreach ($this->fields as $field) {
+            if (!in_array($field->getKey(), $keys)) {
+                $fields[] = $field;
+            }
         }
+
+        return $fields;
     }
 }
diff --git a/Entity/FormField.php b/Entity/FormField.php
@@ -2,6 +2,8 @@
 
 namespace L91\Sulu\Bundle\FormBundle\Entity;
 
+use Doctrine\Common\Collections\ArrayCollection;
+
 class FormField
 {
     /**
@@ -30,9 +32,14 @@ class FormField
     private $id;
 
     /**
-     * @var FormFieldTranslation
+     * @var int
      */
-    private $defaultTranslation;
+    private $order;
+
+    /**
+     * @var string
+     */
+    private $defaultLocale;
 
     /**
      * @var \Doctrine\Common\Collections\Collection|FormTranslation[]
@@ -49,7 +56,47 @@ class FormField
      */
     public function __construct()
     {
-        $this->translations = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->translations = new ArrayCollection();
+    }
+
+    /**
+     * @return string
+     */
+    public function getDefaultLocale()
+    {
+        return $this->defaultLocale;
+    }
+
+    /**
+     * @param string $defaultLocale
+     *
+     * @return FormField
+     */
+    public function setDefaultLocale($defaultLocale)
+    {
+        $this->defaultLocale = $defaultLocale;
+
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getOrder()
+    {
+        return $this->order;
+    }
+
+    /**
+     * @param int $order
+     *
+     * @return FormField
+     */
+    public function setOrder($order)
+    {
+        $this->order = $order;
+
+        return $this;
     }
 
     /**
@@ -140,23 +187,11 @@ public function getId()
         return $this->id;
     }
 
-    /**
-     * @param FormFieldTranslation $defaultTranslation
-     *
-     * @return FormField
-     */
-    public function setDefaultTranslation(FormFieldTranslation $defaultTranslation = null)
-    {
-        $this->defaultTranslation = $defaultTranslation;
-
-        return $this;
-    }
-
     /**
      * @param string $locale
      * @param bool $create
      *
-     * @return FormFieldTranslation
+     * @return FormFieldTranslation|null
      */
     public function getTranslation($locale, $create = false)
     {
@@ -166,20 +201,14 @@ public function getTranslation($locale, $create = false)
             }
         }
 
-        if ($create) {
-            $translation = new FormFieldTranslation();
-            $translation->setLocale($locale);
-
-            return $translation;
+        if (!$create) {
+            return;
         }
-    }
 
-    /**
-     * @return FormFieldTranslation
-     */
-    public function getDefaultTranslation()
-    {
-        return $this->defaultTranslation;
+        $translation = new FormFieldTranslation();
+        $translation->setLocale($locale);
+
+        return $translation;
     }
 
     /**

diff --git a/EventListener/RequestListener.php b/EventListener/RequestListener.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace L91\Sulu\Bundle\FormBundle\EventListener;
 
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;