API: changed date-format, camelCase instead of snake_case, null values, update and create for customer and project (#718)

src/Form/ActivityEditForm.php

@@ -11,13 +11,14 @@ namespace App\Form;
 
 use App\Entity\Activity;
 use App\Form\Type\CustomerType;
+use App\Form\Type\FixedRateType;
+use App\Form\Type\HourlyRateType;
 use App\Form\Type\ProjectType;
 use App\Form\Type\YesNoType;
 use App\Repository\CustomerRepository;
 use App\Repository\ProjectRepository;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\MoneyType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -66,18 +67,23 @@ class ActivityEditForm extends AbstractType
                 'label' => 'label.comment',
                 'required' => false,
             ])
-            ->add('customer', CustomerType::class, [
-                'label' => 'label.customer',
-                'query_builder' => function (CustomerRepository $repo) use ($customer) {
-                    return $repo->builderForEntityType($customer);
-                },
-                'data' => $customer ? $customer : null,
-                'required' => false,
-                'mapped' => false,
-                'project_enabled' => true,
-            ])
+        ;
+
+        if ($options['customer']) {
+            $builder
+                ->add('customer', CustomerType::class, [
+                    'query_builder' => function (CustomerRepository $repo) use ($customer) {
+                        return $repo->builderForEntityType($customer);
+                    },
+                    'data' => $customer ? $customer : null,
+                    'required' => false,
+                    'mapped' => false,
+                    'project_enabled' => true,
+                ]);
+        }
+
+        $builder
             ->add('project', ProjectType::class, [
-                'label' => 'label.project',
                 'required' => false,
                 'query_builder' => function (ProjectRepository $repo) use ($project, $customer) {
                     return $repo->builderForEntityType($project, $customer);
@@ -103,14 +109,10 @@ class ActivityEditForm extends AbstractType
         );
 
         $builder
-            ->add('fixedRate', MoneyType::class, [
-                'label' => 'label.fixedRate',
-                'required' => false,
+            ->add('fixedRate', FixedRateType::class, [
                 'currency' => $currency,
             ])
-            ->add('hourlyRate', MoneyType::class, [
-                'label' => 'label.hourlyRate',
-                'required' => false,
+            ->add('hourlyRate', HourlyRateType::class, [
                 'currency' => $currency,
             ])
             // boolean
@@ -119,7 +121,7 @@ class ActivityEditForm extends AbstractType
             ])
         ;
 
-        if (null === $id) {
+        if (null === $id && $options['create_more']) {
             $builder->add('create_more', CheckboxType::class, [
                 'label' => 'label.create_more',
                 'required' => false,
@@ -138,6 +140,8 @@ class ActivityEditForm extends AbstractType
             'csrf_protection' => true,
             'csrf_field_name' => '_token',
             'csrf_token_id' => 'admin_activity_edit',
+            'create_more' => false,
+            'customer' => false,
         ]);
     }
 }