Add CommentEmbeddable to Activity : remoke remark field (Ref #21)

DataFixtures/ORM/LoadActivity.php

@@ -2,20 +2,20 @@
 
 /*
  * Chill is a software for social workers
- * 
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ *
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
  * <http://www.champs-libres.coop>, <info@champs-libres.coop>
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -41,25 +41,25 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
     use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
-    
+
     /**
-     * @var \Faker\Generator 
+     * @var \Faker\Generator
      */
     private $faker;
-    
+
     public function __construct()
     {
         $this->faker = FakerFactory::create('fr_FR');
-    } 
-    
+    }
+
     public function getOrder()
     {
         return 16400;
     }
-    
+
     /**
      * Return a random scope
-     * 
+     *
      * @return \Chill\MainBundle\Entity\Scope
      */
     private function getRandomScope()
@@ -67,10 +67,10 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, C
         $scopeRef = LoadScopes::$references[array_rand(LoadScopes::$references)];
         return $this->getReference($scopeRef);
     }
-    
+
     /**
      * Return a random activityType
-     * 
+     *
      * @return \Chill\ActivityBundle\Entity\ActivityType
      */
     private function getRandomActivityType()
@@ -78,27 +78,27 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, C
         $typeRef = LoadActivityType::$references[array_rand(LoadActivityType::$references)];
         return $this->getReference($typeRef);
     }
-    
+
     /**
      * Return a random activityReason
-     * 
+     *
      * @return \Chill\ActivityBundle\Entity\ActivityReason
      */
     private function getRandomActivityReason(array $excludingIds)
     {
         $reasonRef = LoadActivityReason::$references[array_rand(LoadActivityReason::$references)];
-        
+
         if (in_array($this->getReference($reasonRef)->getId(), $excludingIds)) {
             // we have a reason which should be excluded. Find another...
             return $this->getRandomActivityReason($excludingIds);
         }
-        
+
         return $this->getReference($reasonRef);
     }
-    
+
     /**
      * Return a random user
-     * 
+     *
      * @return \Chill\MainBundle\Entity\User
      */
     private function getRandomUser()
@@ -106,7 +106,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, C
         $userRef = array_rand(LoadUsers::$refs);
         return $this->getReference($userRef);
     }
-    
+
     public function newRandomActivity($person)
     {
         $activity = (new Activity())
@@ -117,24 +117,24 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, C
             ->setType($this->getRandomActivityType())
             ->setScope($this->getRandomScope())
             ->setAttendee($this->faker->boolean())
-            ->setRemark('A remark');
-        
+            ;
+
         $usedId = array();
         for ($i = 0; $i < rand(0, 4); $i++) {
             $reason = $this->getRandomActivityReason($usedId);
             $usedId[] = $reason->getId();
             $activity->addReason($reason);
         }
-        
+
         return $activity;
     }
-    
+
     public function load(ObjectManager $manager)
     {
         $persons = $this->container->get('doctrine.orm.entity_manager')
             ->getRepository('ChillPersonBundle:Person')
             ->findAll();
-        
+
         foreach($persons as $person) {
             $activityNbr = rand(0,3);
             for($i = 0; $i < $activityNbr; $i ++) {