Merge branch 'master' into privacyEvent

Resources/config/doctrine/Person.orm.yml

@@ -28,6 +28,7 @@ Chill\PersonBundle\Entity\Person:
         gender:
             type: string
             length: 9
+            nullable: true
         memo:
             type: text
             default: ''

Resources/config/services/command.yml

@@ -0,0 +1,10 @@
+services:
+    Chill\PersonBundle\Command\ImportPeopleFromCSVCommand:
+        arguments:
+            $logger: '@logger'
+            $helper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
+            $em: '@Doctrine\ORM\EntityManagerInterface'
+            $customFieldProvider: '@Chill\CustomFieldsBundle\Service\CustomFieldProvider'
+            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
+        tags:
+            - { name: console.command }

Resources/migrations/Version20181005140249.php

@@ -0,0 +1,26 @@
+<?php declare(strict_types=1);
+
+namespace Application\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Set person gender not null
+ */
+final class Version20181005140249 extends AbstractMigration
+{
+    public function up(Schema $schema) : void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE chill_person_person ALTER gender DROP NOT NULL');
+    }
+
+    public function down(Schema $schema) : void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE chill_person_person ALTER gender SET NOT NULL');
+    }
+}

Resources/views/layout.html.twig

@@ -24,13 +24,6 @@
 {% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
 
 
-{% block css %}
-    {% stylesheets  output="css/person.css" filter="cssrewrite"
-        "bundles/chillperson/css/person.css"
-    %}
-        <link rel="stylesheet" href="{{ asset_url }}"/>
-    {% endstylesheets %}
-{% endblock %}
 
 {% block top_banner %}
     <div class="grid-12 parent" id="header-person-name" >