X-Git-Url: https://git.rapsys.eu/.gitweb.cgi/airbundle/blobdiff_plain/dd2e406947b3b2dc472ac34f4b6628e725fc6eb7..d1a3b2d7fc85ab0fab4c0361ab369eb7523832ca:/DataFixtures/AirFixtures.php

diff --git a/DataFixtures/AirFixtures.php b/DataFixtures/AirFixtures.php
index 9aa3279..fd8074c 100644
--- a/DataFixtures/AirFixtures.php
+++ b/DataFixtures/AirFixtures.php
@@ -14,8 +14,7 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
 	 */
 	private $container;
 
-	public function setContainer(\Symfony\Component\DependencyInjection\ContainerInterface $container = null)
-	{
+	public function setContainer(\Symfony\Component\DependencyInjection\ContainerInterface $container = null) {
 		$this->container = $container;
 	}
 
@@ -46,12 +45,13 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
 		}
 
 		//Group tree
+		//XXX: ROLE_XXX is required by
 		$groupTree = array(
-			'ROLE_USER',
-			'ROLE_GUEST',
-			'ROLE_REGULAR',
-			'ROLE_SENIOR',
-			'ROLE_ADMIN'
+			'User',
+			'Guest',
+			'Regular',
+			'Senior',
+			'Admin'
 		);
 
 		//Create groups
@@ -72,9 +72,9 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
 		$userTree = array(
 			array(
 				'short' => 'Mr.',
-				'group' => 'ROLE_ADMIN',
+				'group' => 'Admin',
 				'mail' => 'tango@rapsys.eu',
-				'pseudonym' => 'Rapsys',
+				'pseudonym' => 'Milonga Raphaël',
 				'forename' => 'Raphaël',
 				'surname' => 'Gertz',
 				'phone' => '+33677952829',
@@ -82,54 +82,34 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
 			),
 			array(
 				'short' => 'Mr.',
-				'group' => 'ROLE_SENIOR',
+				'group' => 'Senior',
+				'mail' => 'denis.courvoisier@wanadoo.fr',
+				'pseudonym' => 'DJ Sined',
+				'forename' => 'Denis',
+				'surname' => 'Courvoisier',
+				'phone' => '+33600000000',
+				'password' => 'test'
+			),
+			array(
+				'short' => 'Mr.',
+				'group' => 'Senior',
 				'mail' => 'rannou402@orange.fr',
-				'pseudonym' => 'Mitch',
+				'pseudonym' => 'Trio Tango',
 				'forename' => 'Michel',
 				'surname' => 'Rannou',
 				'phone' => '+33600000000',
 				'password' => 'test'
 			),
-			array(
+			/*array(
 				'short' => 'Ms.',
-				'group' => 'ROLE_REGULAR',
+				'group' => 'Regular',
 				'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
@@ -156,9 +136,11 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
 		$manager->flush();
 
 		//Location tree
+		//XXX: adding a new zipcode here requires matching accuweather uris in Command/WeatherCommand.php
 		$locationTree = [
 			[
-				'title' => 'Opéra Garnier',
+				'title' => 'Opera Garnier',
+				'short' => 'Garnier',
 				'address' => '10 Place de l\'Opéra',
 				'zipcode' => '75009',
 				'city' => 'Paris',
@@ -166,7 +148,8 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
 				'longitude' => 2.331832
 			],
 			[
-				'title' => 'Jardin Tino-Rossi',
+				'title' => 'Tino-Rossi garden',
+				'short' => 'Docks',
 				'address' => '2 Quai Saint-Bernard',
 				'zipcode' => '75005',
 				'city' => 'Paris',
@@ -174,7 +157,8 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
 				'longitude' => 2.360953
 			],
 			[
-				'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',
@@ -183,7 +167,53 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
 				'longitude' => 2.288853
 			],
 			[
-				'title' => 'Marché Saint Honoré',
+				'title' => 'Colette square',
+				'short' => 'Colette',
+				'address' => 'Galerie du Théâtre Français',
+				'zipcode' => '75001',
+				'city' => 'Paris',
+				'latitude' => 48.863219,
+				'longitude' => 2.335847
+			],
+			[
+				'title' => 'Swan Island',
+				'short' => 'Swan',
+				'address' => 'Allée des Cygnes',
+				'zipcode' => '75015',
+				'city' => 'Paris',
+				'latitude' => 48.849976, #48.849976
+				'longitude' => 2.279603 #2.2796029
+			],
+			[
+				'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
+			],
+			[
+				'title' => 'Orleans gallery',
+				'short' => 'Orleans',
+				'address' => '8 Galerie du Jardin',
+				'zipcode' => '75001',
+				'city' => 'Paris',
+				'latitude' => 48.863885,
+				'longitude' => 2.337387
+			],
+			[
+				'title' => 'Orsay museum',
+				'short' => 'Orsay',
+				'address' => '1 rue de la Légion d\'Honneur',
+				'zipcode' => '75007',
+				'city' => 'Paris',
+				'latitude' => 48.860418,
+				'longitude' => 2.325815
+			],
+			[
+				'title' => 'Saint-Honore market',
+				'short' => 'Honore',
 				'address' => '1 Passage des Jacobins',
 				'zipcode' => '75001',
 				'city' => 'Paris',
@@ -191,12 +221,22 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
 				'longitude' => 2.331752
 			],
 			[
-				'title' => 'Palais de Tokyo',
+				'title' => 'Tokyo palace',
+				'short' => 'Tokyo',
 				'address' => '14 Avenue de New York',
 				'zipcode' => '75116',
 				'city' => 'Paris',
 				'latitude' => 48.863827,
 				'longitude' => 2.297339
+			],
+			[
+				'title' => 'Drawings\' garden',
+				'short' => 'Villette',
+				'address' => 'Allée du Belvédère',
+				'zipcode' => '75019',
+				'city' => 'Paris',
+				'latitude' => 48.892503,
+				'longitude' => 2.389300
 			]
 		];
 
@@ -205,6 +245,7 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
 		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']);
@@ -222,26 +263,17 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
 
 		//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();
-			$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);