diff --git a/application/modules/admin/controllers/UsersController.php b/application/modules/admin/controllers/UsersController.php index 4603cc8c1e0749f6571c5dc8aa07533720d5fe68..b573c5389b2a9ce2ff20ce80f8acbf24ef669fe6 100644 --- a/application/modules/admin/controllers/UsersController.php +++ b/application/modules/admin/controllers/UsersController.php @@ -132,6 +132,7 @@ class Admin_UsersController extends Zend_Controller_Action ->setNom($data['nom']) ->setPrenom($data['prenom']) ->setMail($data['mail']) + ->setNaissance($data['naissance']) ->setRoleLevel($data['role']) ->setRole($class_role->rendNomRole($data['role'])) ->setIdSite($data['bib']) diff --git a/application/modules/admin/views/scripts/users/_form.phtml b/application/modules/admin/views/scripts/users/_form.phtml index a6bd5b90fbeac811b74647c47d0b193847f77174..99b91881ce99c0dfb8cdea5cee39b6c3597061a4 100644 --- a/application/modules/admin/views/scripts/users/_form.phtml +++ b/application/modules/admin/views/scripts/users/_form.phtml @@ -25,6 +25,10 @@ <td class="droite">Prénom </td> <td class="gauche"><input type="text" name="prenom" size="50" value="<?php echo $this->escape($this->user->getPrenom());?>"/></td> </tr> + <tr> + <td class="droite">Date de naissance </td> + <td class="gauche"><input type="text" name="naissance" size="10" value="<?php echo $this->escape($this->user->getNaissance());?>"/></td> + </tr> <tr> <td class="droite"><?php echo $this->traduire('Rôle'); ?> </td> <td class="gauche"> diff --git a/tests/application/modules/admin/controllers/UsersControllerTest.php b/tests/application/modules/admin/controllers/UsersControllerTest.php index be9675ead65ffdbaf5531ef446f4f4d9967485ec..aa52ff6240c9a923acc98f6a796f0588ee114ff4 100644 --- a/tests/application/modules/admin/controllers/UsersControllerTest.php +++ b/tests/application/modules/admin/controllers/UsersControllerTest.php @@ -195,7 +195,8 @@ class UsersControllerPostMarcusDataTest extends UsersControllerWithMarcusTestCas 'telephone' => '09 87 76 54 32 12', 'adresse' => '12 rue miles', 'code_postal' => '75000', - 'ville' => 'Paris')); + 'ville' => 'Paris', + 'naissance' => '1976-02-17')); $this->assertRedirectTo('/admin/users'); } @@ -221,6 +222,10 @@ class UsersControllerPostMarcusDataTest extends UsersControllerWithMarcusTestCas $this->assertEquals('Miles', $this->marcus->getPrenom()); } + public function testNaissanceIs1976() { + $this->assertEquals('1976-02-17', $this->marcus->getNaissance()); + } + public function testTelephoneIs09_87_76_54_32_12() { $this->assertEquals('09 87 76 54 32 12', $this->marcus->getTelephone()); } @@ -273,7 +278,8 @@ class UsersControllerPostMarcusInvalidDataTest extends UsersControllerWithMarcus 'telephone' => '', 'adresse' => '', 'code_postal' => '', - 'ville' => '')); + 'ville' => '', + 'naissance' => '')); $this->assertAction('edit'); $this->assertQueryContentContains('span#abonne_erreur', "Vous devez compléter le champ 'Identifiant'"); $this->assertQueryContentContains('span#abonne_erreur', "Vous devez compléter le champ 'Mot de passe'"); @@ -295,7 +301,8 @@ class UsersControllerPostMarcusInvalidDataTest extends UsersControllerWithMarcus 'telephone' => '04 50 12 34', 'adresse' => '', 'code_postal' => '', - 'ville' => '')); + 'ville' => '', + 'naissance' => '')); $this->assertAction('edit'); $this->assertQueryContentContains('span#abonne_erreur', "Le champ 'Identifiant' doit être inférieur à 50 caractères"); @@ -339,7 +346,8 @@ class UsersControllerPostValidDataWithCommOpsysTest extends UsersControllerWithM 'telephone' => '04 12 34 56 78', 'adresse' => '', 'code_postal' => '', - 'ville' => '')); + 'ville' => '', + 'naissance' => '')); } @@ -421,8 +429,9 @@ class UsersControllerAddPostTest extends UsersControllerWithMarcusTestCase { 'telephone' => '', 'adresse' => '', 'code_postal' => '', - 'ville' => ''))); - $this->dispatch('/admin/users/add'); + 'ville' => '', + 'naissance' => ''))); + $this->dispatch('/admin/users/add', true); }