New header layout

[airbundle] / DataFixtures / AirFixtures.php

diff --git a/DataFixtures/AirFixtures.php b/DataFixtures/AirFixtures.php
index 9aa32793f75d54cd6fecca73fbe480f2372c398a..8ccf57266b668fd4e3c37cbeaf8d4aefaf485048 100644 (file)
--- a/DataFixtures/AirFixtures.php
+++ b/DataFixtures/AirFixtures.php
@@ -2,7 +2,7 @@
 
 namespace Rapsys\AirBundle\DataFixtures;
 
 
 namespace Rapsys\AirBundle\DataFixtures;
 

-use Rapsys\AirBundle\Entity\Title;
+use Rapsys\AirBundle\Entity\Civility;

 use Rapsys\AirBundle\Entity\Group;
 use Rapsys\AirBundle\Entity\User;
 use Rapsys\AirBundle\Entity\Location;
 use Rapsys\AirBundle\Entity\Group;
 use Rapsys\AirBundle\Entity\User;
 use Rapsys\AirBundle\Entity\Location;


@@ -14,8 +14,7 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
         */
        private $container;
 
         */
        private $container;
 

-       public function setContainer(\Symfony\Component\DependencyInjection\ContainerInterface $container = null)
-       {
+       public function setContainer(\Symfony\Component\DependencyInjection\ContainerInterface $container = null) {

                $this->container = $container;
        }
 
                $this->container = $container;
        }
 


@@ -25,33 +24,33 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
        public function load(\Doctrine\Common\Persistence\ObjectManager $manager) {
                $encoder = $this->container->get('security.password_encoder');
 
        public function load(\Doctrine\Common\Persistence\ObjectManager $manager) {
                $encoder = $this->container->get('security.password_encoder');
 

-               //Title tree
-               $titleTree = array(
+               //Civility tree
+               $civilityTree = array(

                        'Mr.' => 'Mister',
                        'Mrs.' => 'Madam',
                        'Ms.' => 'Miss'
                );
 
                //Create titles
                        'Mr.' => 'Mister',
                        'Mrs.' => 'Madam',
                        'Ms.' => 'Miss'
                );
 
                //Create titles

-               $titles = array();
-               foreach($titleTree as $shortData => $titleData) {
-                       $title = new Title();
-                       $title->setShort($shortData);
-                       $title->setTitle($titleData);
-                       $title->setCreated(new \DateTime('now'));
-                       $title->setUpdated(new \DateTime('now'));
-                       $manager->persist($title);
-                       $titles[$shortData] = $title;
-                       unset($title);
+               $civilitys = array();
+               foreach($civilityTree as $shortData => $civilityData) {
+                       $civility = new Title($civilityData);
+                       $civility->setShort($shortData);
+                       $civility->setCreated(new \DateTime('now'));
+                       $civility->setUpdated(new \DateTime('now'));
+                       $manager->persist($civility);
+                       $civilitys[$shortData] = $civility;
+                       unset($civility);

                }
 
                //Group tree
                }
 
                //Group tree

+               //XXX: ROLE_XXX is required by

                $groupTree = array(
                $groupTree = array(

-                       'ROLE_USER',
-                       'ROLE_GUEST',
-                       'ROLE_REGULAR',
-                       'ROLE_SENIOR',
-                       'ROLE_ADMIN'
+                       'User',
+                       'Guest',
+                       'Regular',
+                       'Senior',
+                       'Admin'

                );
 
                //Create groups
                );
 
                //Create groups


@@ -72,78 +71,56 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
                $userTree = array(
                        array(
                                'short' => 'Mr.',
                $userTree = array(
                        array(
                                'short' => 'Mr.',

-                               'group' => 'ROLE_ADMIN',
+                               'group' => 'Admin',

                                'mail' => 'tango@rapsys.eu',
                                'mail' => 'tango@rapsys.eu',

-                               'pseudonym' => 'Rapsys',
+                               'pseudonym' => 'Milonga Raphaël',

                                'forename' => 'Raphaël',
                                'surname' => 'Gertz',
                                'phone' => '+33677952829',
                                'password' => 'test'
                        ),
                                'forename' => 'Raphaël',
                                'surname' => 'Gertz',
                                'phone' => '+33677952829',
                                'password' => 'test'
                        ),

+                       /*array(
+                               'short' => 'Mr.',
+                               'group' => 'Senior',
+                               'mail' => 'denis.courvoisier@wanadoo.fr',
+                               'pseudonym' => 'DJ Sined',
+                               'forename' => 'Denis',
+                               'surname' => 'Courvoisier',
+                               'phone' => '+33600000000',
+                               'password' => 'test'
+                       ),*/

                        array(
                                'short' => 'Mr.',
                        array(
                                'short' => 'Mr.',

-                               'group' => 'ROLE_SENIOR',
+                               'group' => 'Senior',

                                'mail' => 'rannou402@orange.fr',
                                'mail' => 'rannou402@orange.fr',

-                               'pseudonym' => 'Mitch',
+                               'pseudonym' => 'Trio Tango',

                                'forename' => 'Michel',
                                'surname' => 'Rannou',
                                'phone' => '+33600000000',
                                'password' => 'test'
                        ),
                                'forename' => 'Michel',
                                'surname' => 'Rannou',
                                'phone' => '+33600000000',
                                'password' => 'test'
                        ),

-                       array(
+                       /*array(

                                'short' => 'Ms.',
                                'short' => 'Ms.',

-                               'group' => 'ROLE_REGULAR',
+                               'group' => 'Regular',

                                'mail' => 'roxmaps@gmail.com',
                                'pseudonym' => 'Roxana',
                                'forename' => 'Roxana',
                                'surname' => 'Prado',
                                'phone' => '+33600000000',
                                'password' => 'test'
                                'mail' => 'roxmaps@gmail.com',
                                'pseudonym' => 'Roxana',
                                'forename' => 'Roxana',
                                'surname' => 'Prado',
                                'phone' => '+33600000000',
                                'password' => 'test'

-                       ),
-                       array(
-                               'short' => 'Mr.',
-                               'group' => 'ROLE_REGULAR',
-                               'mail' => 'majid.ghedjatti@gmail.com',
-                               'pseudonym' => 'El Guerrillero',
-                               'forename' => 'Majid',
-                               'surname' => 'Ghedjatti',
-                               'phone' => '+33600000000',
-                               'password' => 'test'
-                       ),
-                       array(
-                               'short' => 'Mr.',
-                               'group' => 'ROLE_SENIOR',
-                               'mail' => 'denis.courvoisier@wanadoo.fr',
-                               'pseudonym' => 'Sined',
-                               'forename' => 'Denis',
-                               'surname' => 'Courvoisier',
-                               'phone' => '+33600000000',
-                               'password' => 'test'
-                       ),
-                       array(
-                               'short' => 'Mr.',
-                               'group' => 'ROLE_REGULAR',
-                               'mail' => 'kastango13@gmail.com',
-                               'pseudonym' => 'Kastrat',
-                               'forename' => 'Kastrat',
-                               'surname' => 'Hasaj',
-                               'phone' => '+33600000000',
-                               'password' => 'test'
-                       ),
+                       ),*/

                );
 
                //Create users
                $users = array();
                foreach($userTree as $userData) {
                );
 
                //Create users
                $users = array();
                foreach($userTree as $userData) {

-                       $user = new User();
-                       $user->setMail($userData['mail']);
+                       $user = new User($userData['mail']);

                        $user->setPseudonym($userData['pseudonym']);
                        $user->setForename($userData['forename']);
                        $user->setSurname($userData['surname']);
                        $user->setPhone($userData['phone']);
                        $user->setPassword($encoder->encodePassword($user, $userData['password']));
                        $user->setPseudonym($userData['pseudonym']);
                        $user->setForename($userData['forename']);
                        $user->setSurname($userData['surname']);
                        $user->setPhone($userData['phone']);
                        $user->setPassword($encoder->encodePassword($user, $userData['password']));

-                       $user->setActive(true);
-                       $user->setTitle($titles[$userData['short']]);
+                       $user->setCivility($civilitys[$userData['short']]);

                        $user->addGroup($groups[$userData['group']]);
                        $user->setCreated(new \DateTime('now'));
                        $user->setUpdated(new \DateTime('now'));
                        $user->addGroup($groups[$userData['group']]);
                        $user->setCreated(new \DateTime('now'));
                        $user->setUpdated(new \DateTime('now'));


@@ -156,47 +133,148 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
                $manager->flush();
 
                //Location tree
                $manager->flush();
 
                //Location tree

+               //XXX: adding a new zipcode here requires matching accuweather uris in Command/WeatherCommand.php

                $locationTree = [
                        [
                $locationTree = [
                        [

-                               'title' => 'Opéra Garnier',
+                               'title' => 'Garnier opera',
+                               'short' => 'Garnier',

                                'address' => '10 Place de l\'Opéra',
                                'zipcode' => '75009',
                                'city' => 'Paris',
                                'latitude' => 48.871268,
                                'address' => '10 Place de l\'Opéra',
                                'zipcode' => '75009',
                                'city' => 'Paris',
                                'latitude' => 48.871268,

-                               'longitude' => 2.331832
+                               'longitude' => 2.331832,
+                               'hotspot' => true

                        ],
                        [
                        ],
                        [

-                               'title' => 'Jardin Tino-Rossi',
+                               'title' => 'Tino-Rossi garden',
+                               'short' => 'Docks',

                                'address' => '2 Quai Saint-Bernard',
                                'zipcode' => '75005',
                                'city' => 'Paris',
                                'latitude' => 48.847736,
                                'address' => '2 Quai Saint-Bernard',
                                'zipcode' => '75005',
                                'city' => 'Paris',
                                'latitude' => 48.847736,

-                               'longitude' => 2.360953
+                               'longitude' => 2.360953,
+                               'hotspot' => true

                        ],
                        [
                        ],
                        [

-                               'title' => 'Esplanade du Trocadéro',
+                               'title' => 'Trocadero esplanade',
+                               'short' => 'Trocadero',

                                'address' => '1 Avenue Hussein 1er de Jordanie',
                                #75016 pour meteo-france, accuweather supporte 75116
                                'zipcode' => '75116',
                                'city' => 'Paris',
                                'latitude' => 48.861888,
                                'address' => '1 Avenue Hussein 1er de Jordanie',
                                #75016 pour meteo-france, accuweather supporte 75116
                                'zipcode' => '75116',
                                'city' => 'Paris',
                                'latitude' => 48.861888,

-                               'longitude' => 2.288853
+                               'longitude' => 2.288853,
+                               'hotspot' => false
+                       ],
+                       [
+                               'title' => 'Colette place',
+                               'short' => 'Colette',
+                               'address' => 'Galerie du Théâtre Français',
+                               'zipcode' => '75001',
+                               'city' => 'Paris',
+                               'latitude' => 48.863219,
+                               'longitude' => 2.335847,
+                               'hotspot' => false

                        ],
                        [
                        ],
                        [

-                               'title' => 'Marché Saint Honoré',
+                               'title' => 'Swan island',
+                               'short' => 'Swan',
+                               'address' => 'Allée des Cygnes',
+                               'zipcode' => '75015',
+                               'city' => 'Paris',
+                               'latitude' => 48.849976, #48.849976
+                               'longitude' => 2.279603, #2.2796029,
+                               'hotspot' => false
+                       ],
+                       [
+                               'title' => 'Jussieu esplanade',
+                               'short' => 'Jussieu',
+                               'address' => '25 rue des Fossés Saint-Bernard',
+                               'zipcode' => '75005',
+                               'city' => 'Paris',
+                               'latitude' => 48.847955, #48.8479548
+                               'longitude' => 2.353291, #2.3532907,
+                               'hotspot' => false
+                       ],
+                       [
+                               'title' => 'Orleans gallery',
+                               'short' => 'Orleans',
+                               'address' => '8 Galerie du Jardin',
+                               'zipcode' => '75001',
+                               'city' => 'Paris',
+                               'latitude' => 48.863885,
+                               'longitude' => 2.337387,
+                               'hotspot' => false
+                       ],
+                       [
+                               'title' => 'Orsay museum',
+                               'short' => 'Orsay',
+                               'address' => '1 rue de la Légion d\'Honneur',
+                               'zipcode' => '75007',
+                               'city' => 'Paris',
+                               'latitude' => 48.860418,
+                               'longitude' => 2.325815,
+                               'hotspot' => false
+                       ],
+                       [
+                               'title' => 'Saint-Honore market',
+                               'short' => 'Honore',

                                'address' => '1 Passage des Jacobins',
                                'zipcode' => '75001',
                                'city' => 'Paris',
                                'latitude' => 48.866992,
                                'address' => '1 Passage des Jacobins',
                                'zipcode' => '75001',
                                'city' => 'Paris',
                                'latitude' => 48.866992,

-                               'longitude' => 2.331752
+                               'longitude' => 2.331752,
+                               'hotspot' => false

                        ],
                        [
                        ],
                        [

-                               'title' => 'Palais de Tokyo',
+                               'title' => 'Igor Stravinsky place',
+                               'short' => 'Stravinsky',
+                               'address' => '2 rue Brisemiche',
+                               'zipcode' => '75004',
+                               'city' => 'Paris',
+                               'latitude' => 48.859244,
+                               'longitude' => 2.351289,
+                               'hotspot' => false
+                       ],
+                       [
+                               'title' => 'Tokyo palace',
+                               'short' => 'Tokyo',

                                'address' => '14 Avenue de New York',
                                'zipcode' => '75116',
                                'city' => 'Paris',
                                'latitude' => 48.863827,
                                'address' => '14 Avenue de New York',
                                'zipcode' => '75116',
                                'city' => 'Paris',
                                'latitude' => 48.863827,

-                               'longitude' => 2.297339
+                               'longitude' => 2.297339,
+                               'hotspot' => false
+                       ],
+                       [
+                               'title' => 'Drawings\' garden',
+                               'short' => 'Villette',
+                               'address' => 'Allée du Belvédère',
+                               'zipcode' => '75019',
+                               'city' => 'Paris',
+                               'latitude' => 48.892503,
+                               'longitude' => 2.389300,
+                               'hotspot' => false
+                       ],
+                       [
+                               'title' => 'Louvre palace',
+                               'short' => 'Louvre',
+                               'address' => 'Quai François Mitterrand',
+                               'zipcode' => '75001',
+                               'city' => 'Paris',
+                               'latitude' => 48.860386,
+                               'longitude' => 2.332611,
+                               'hotspot' => false
+                       ],
+                       [
+                               'title' => 'Monde garden',
+                               'short' => 'Monde',
+                               'address' => '63 avenue Pierre Mendès-France',
+                               'zipcode' => '75013',
+                               'city' => 'Paris',
+                               'latitude' => 48.840451,
+                               'longitude' => 2.367638,
+                               'hotspot' => false

                        ]
                ];
 
                        ]
                ];
 


@@ -205,11 +283,13 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
                foreach($locationTree as $locationData) {
                        $location = new Location();
                        $location->setTitle($locationData['title']);
                foreach($locationTree as $locationData) {
                        $location = new Location();
                        $location->setTitle($locationData['title']);

+                       $location->setShort($locationData['short']);

                        $location->setAddress($locationData['address']);
                        $location->setZipcode($locationData['zipcode']);
                        $location->setCity($locationData['city']);
                        $location->setLatitude($locationData['latitude']);
                        $location->setLongitude($locationData['longitude']);
                        $location->setAddress($locationData['address']);
                        $location->setZipcode($locationData['zipcode']);
                        $location->setCity($locationData['city']);
                        $location->setLatitude($locationData['latitude']);
                        $location->setLongitude($locationData['longitude']);

+                       $location->setHotspot($locationData['hotspot']);

                        $location->setCreated(new \DateTime('now'));
                        $location->setUpdated(new \DateTime('now'));
                        $manager->persist($location);
                        $location->setCreated(new \DateTime('now'));
                        $location->setUpdated(new \DateTime('now'));
                        $manager->persist($location);


@@ -222,26 +302,17 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
 
                //Slot tree
                $slotTree = [
 
                //Slot tree
                $slotTree = [

-                       [
-                               'begin' => '14:00:00 UTC',
-                               'length' => '05:00:00'
-                       ],
-                       [
-                               'begin' => '19:00:00 UTC',
-                               'length' => '06:00:00'
-                       ],
-                       [
-                               'begin' => '19:00:00 UTC',
-                               'length' => '07:00:00'
-                       ]
+                       'Morning',
+                       'Afternoon',
+                       'Evening',
+                       'After'

                ];
 
                //Create slots
                $slots = array();
                foreach($slotTree as $slotData) {
                        $slot = new Slot();
                ];
 
                //Create slots
                $slots = array();
                foreach($slotTree as $slotData) {
                        $slot = new Slot();

-                       $slot->setBegin(new \DateTime($slotData['begin']));
-                       $slot->setLength(new \DateTime($slotData['length']));
+                       $slot->setTitle($slotData);

                        $slot->setCreated(new \DateTime('now'));
                        $slot->setUpdated(new \DateTime('now'));
                        $manager->persist($slot);
                        $slot->setCreated(new \DateTime('now'));
                        $slot->setUpdated(new \DateTime('now'));
                        $manager->persist($slot);