Evolution #147: Profil : Configuration de son adresse (gmap et tout)

app/Resources/translations/userui.fr.yml

@@ -19,6 +19,16 @@ my_account:
   favorite_tags:    Vos tags préférés
   change_password:  Changer mon mot de passe
   change_email:     Changer mon adresse email
+  address:
+    title:          Mon adresse
+    description:    Avec votre adresse Muzi.ch pourra vous avertir plus aisément des événements à venirs dans votre région.
+    form:
+      ilivenear:    J'habite vers
+      in:           en
+      submit:       Mettre a jour
+      errors:
+        notown:     Veuillez saisir la ville
+        nocountry:  Veuillez saisir le pays
   
 connexion:
   password_lost:    Mot de passe perdu ?

src/Muzich/CoreBundle/Entity/User.php

@@ -107,6 +107,18 @@ class User extends BaseUser
   protected $bad_report_count;
 
   /**
+   * @ORM\Column(type="text", nullable=true)
+   * @ORM\Column(length=256)
+   */
+  protected $town;
+
+  /**
+   * @ORM\Column(type="text", nullable=true)
+   * @ORM\Column(length=128)
+   */
+  protected $country;
+  
+  /**
    * 
    */
   public function __construct()
@@ -332,6 +344,26 @@ class User extends BaseUser
     $this->setBadReportCount($this->getBadReportCount()+1);
   }
   
+  public function getTown()
+  {
+    return $this->town;
+  }
+  
+  public function setTown($town)
+  {
+    $this->town = $town;
+  }
+  
+  public function getCountry()
+  {
+    return $this->country;
+  }
+  
+  public function setCountry($country)
+  {
+    $this->country = $country;
+  }
+  
   /*
    * 
    * 
@@ -342,6 +374,34 @@ class User extends BaseUser
     return $this->getUsername();
   }
   
+//  public function getLocalisationExploded()
+//  {
+//    $town = null;
+//    $country = null;
+//    if ($this->localisation)
+//    {
+//      if (($explode = explode(', ', $this->localisation)))
+//      {
+//        $town = $explode[0];
+//        $country = $explode[1];
+//      }
+//    }
+//    return array(
+//      'town'    => $town,
+//      'country' => $country
+//    );
+//  }
+//  
+//  public function setLocalisationExploded($town, $country)
+//  {
+//    $town = str_replace(', ', '', $town);
+//    $town = str_replace(',', '', $town);
+//    $country = str_replace(', ', '', $country);
+//    $country = str_replace(',', '', $country);
+//    
+//    $this->localisation = $town. ', ' .$country;
+//  }
+  
 //  /**
 //  * @ORM\prePersist
 //  */

src/Muzich/CoreBundle/Tests/Controller/UserControllerTest.php

@@ -446,4 +446,88 @@ class UserControllerTest extends FunctionalTest
     
   }
   
+  public function testUpdateAddress()
+  {
+    $this->client = self::createClient();
+    $this->connectUser('paul', 'toor');
+    
+    $paul = $this->getUser();
+    
+    // D'après les fixtures, pas d'adresse pour paul
+    $this->assertEquals($paul->getTown(), null);
+    $this->assertEquals($paul->getCountry(), null);
+    
+    $crawler = $this->client->request(
+      'POST', 
+      $this->generateUrl('update_address', array('token' => $this->getUser()->getPersonalHash())), 
+      array(
+          'town' => '',
+          'country' => ''
+      ), 
+      array(), 
+      array('HTTP_X-Requested-With' => 'XMLHttpRequest')
+    );
+    
+    $this->isResponseSuccess();
+    $response = json_decode($this->client->getResponse()->getContent(), true);
+    
+    $this->assertEquals($response['status'], 'error');
+    $this->assertEquals(count($response['errors']), '2');
+    $this->assertEquals($response['errors'], array(
+      $this->getContainer()->get('translator')->trans('my_account.address.form.errors.notown', array(), 'userui'),
+      $this->getContainer()->get('translator')->trans('my_account.address.form.errors.nocountry', array(), 'userui')
+    ));
+    $paul = $this->getUser();
+    $this->assertEquals($paul->getTown(), null);
+    $this->assertEquals($paul->getCountry(), null);
+    
+    /////
+    
+    $crawler = $this->client->request(
+      'POST', 
+      $this->generateUrl('update_address', array('token' => $this->getUser()->getPersonalHash())), 
+      array(
+          'town' => 'peyruis',
+          'country' => ''
+      ), 
+      array(), 
+      array('HTTP_X-Requested-With' => 'XMLHttpRequest')
+    );
+    
+    $this->isResponseSuccess();
+    $response = json_decode($this->client->getResponse()->getContent(), true);
+    
+    $this->assertEquals($response['status'], 'error');
+    $this->assertEquals(count($response['errors']), '1');
+    $this->assertEquals($response['errors'], array(
+      $this->getContainer()->get('translator')->trans('my_account.address.form.errors.nocountry', array(), 'userui')
+    ));
+    $paul = $this->getUser();
+    $this->assertEquals($paul->getTown(), null);
+    $this->assertEquals($paul->getCountry(), null);
+    
+    /////
+    
+    $crawler = $this->client->request(
+      'POST', 
+      $this->generateUrl('update_address', array('token' => $this->getUser()->getPersonalHash())), 
+      array(
+          'town' => 'peyruis',
+          'country' => 'france'
+      ), 
+      array(), 
+      array('HTTP_X-Requested-With' => 'XMLHttpRequest')
+    );
+    
+    $this->outputDebug();
+    $this->isResponseSuccess();
+    $response = json_decode($this->client->getResponse()->getContent(), true);
+    
+    $paul = $this->getUser();
+    $this->assertEquals($response['status'], 'success');
+    $this->assertEquals($paul->getTown(), 'peyruis');
+    $this->assertEquals($paul->getCountry(), 'france');
+    
+  }
+  
 }

src/Muzich/UserBundle/Controller/UserController.php

@@ -506,5 +506,65 @@ class UserController extends Controller
     $this->setFlash('success', 'user.changeemail.success');
     return new RedirectResponse($this->generateUrl('my_account'));
   }
+  
+  /**
+   *
+   * @param string $town
+   * @param string $country
+   * @param string $token
+   * @return Response 
+   */
+  public function updateAddressAction($token)
+  {
+    if (($response = $this->mustBeConnected(true)))
+    {
+      return $response;
+    }
+    
+    /**
+     * Bug lors des tests: L'user n'est pas 'lié' a celui en base par doctrine.
+     * Docrine le voit si on faire une requete directe.
+     */
+    $user = $this->getUser();
+    if ($this->container->getParameter('env') == 'test')
+    {
+      $user = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')->findOneById(
+        $this->container->get('security.context')->getToken()->getUser()->getId(),
+        array()
+      )->getSingleResult();
+    }
+    
+    $errors = array();
+    if ($user->getPersonalHash() != $token)
+    {
+      $errors[] = 'NotAllowed';
+    }
+    
+    if (!trim($this->getRequest()->request->get('town')))
+    {
+      $errors[] = $this->trans('my_account.address.form.errors.notown', array(), 'userui');
+    }
+    if (!trim($this->getRequest()->request->get('country')))
+    {
+      $errors[] = $this->trans('my_account.address.form.errors.nocountry', array(), 'userui');
+    }
+    
+    if (count($errors))
+    {
+      return $this->jsonResponse(array(
+        'status' => 'error',
+        'errors' => $errors
+      ));
+    }
+    
+    $user->setTown(trim($this->getRequest()->request->get('town')));
+    $user->setCountry(trim($this->getRequest()->request->get('country')));
+    $this->getDoctrine()->getEntityManager()->persist($user);
+    $this->getDoctrine()->getEntityManager()->flush();
+    
+    return $this->jsonResponse(array(
+      'status' => 'success'
+    ));
+  }
     
 }

src/Muzich/UserBundle/Resources/config/routing.yml

@@ -28,4 +28,8 @@ change_email_request:
     
 change_email_confirm:
   pattern: /account/change-email/confirm/{token}
-  defaults: { _controller: MuzichUserBundle:User:changeEmailConfirm }
+  defaults: { _controller: MuzichUserBundle:User:changeEmailConfirm }
+  
+update_address:
+  pattern: /ajax/update-address/{token}
+  defaults: { _controller: MuzichUserBundle:User:updateAddress }

src/Muzich/UserBundle/Resources/views/User/account.html.twig

@@ -45,5 +45,20 @@
 
     <input type="submit" class="button" />
   </form>
+  
+  <h3>{{ 'my_account.address.title'|trans({}, 'userui') }}</h3>
+  
+  <p>{{ 'my_account.address.description'|trans({}, 'userui') }}</p>
+  
+  <form id="address_update" action="{{ path('update_address', {"token":app.user.getPersonalHash}) }}" method="post">
+    <p>
+      {{ 'my_account.address.form.ilivenear'|trans({}, 'userui') }}
+      <input type="text" name="town" class="intext" value="{{ app.user.town }}" />
+      {{ 'my_account.address.form.in'|trans({}, 'userui') }}
+      <input type="text" name="country" class="intext" value="{{ app.user.country }}" />
+      <input type="submit" value="{{ 'my_account.address.form.submit'|trans({}, 'userui') }}" class="button address_submit" />
+      <img class="loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading"/>
+    </p>
+  </form>
     
 {% endblock %}

src/Muzich/UserBundle/Resources/views/layout.html.twig

@@ -3,6 +3,9 @@
 {% block css %}
 	<link href="{{ asset('bundles/muzichuser/css/user.css') }}" rel="stylesheet" media="screen" type="text/css" />
 {% endblock %}
+{% block js %}
+	<script src="{{ asset('bundles/muzichuser/js/user.js') }}" type="text/javascript"></script>
+{% endblock %}
 
 {% block main_content %}
   

web/bundles/muzichcore/css/main.css

@@ -1038,4 +1038,17 @@ div#added_element_to_group
   padding: 20px;
   font-size: 115%;
   font-weight: bold;
+}
+
+input.intext
+{
+  border: none;
+  border-bottom-color: #000;
+  border-bottom-style: dashed;
+  border-bottom-width: 1px;
+  width: 110px;
+  text-align: center;
+  margin-left: 15px;
+  margin-right: 15px;
+  font-weight: bold;
 }

web/bundles/muzichuser/js/user.js

@@ -0,0 +1,29 @@
+/*  */
+
+$(document).ready(function(){
+    
+  $('form#address_update input[type="submit"]').click(function(){
+    $('form#address_update img.loader').show();
+  });
+    
+  $('form#address_update').ajaxForm(function(response){
+      
+      $('form#address_update img.loader').hide();
+      form = $('form#address_update');
+      
+      form.find('ul.error_list').remove();
+      if (response.status == 'error')
+      {
+        ul_errors = $('<ul>').addClass('error_list');
+
+        for (i in response.errors)
+        {
+          ul_errors.append($('<li>').append(response.errors[i]));
+        }
+
+        form.prepend(ul_errors);
+      }
+      
+  });
+   
+});