diff --git a/application/modules/admin/views/scripts/modo/formulaires.phtml b/application/modules/admin/views/scripts/modo/formulaires.phtml index 63d57924cf5d66db4c13e5f79e42776a2a4214d3..99181d9d82fc19f0a4ad5047932a2b95f9cec616 100644 --- a/application/modules/admin/views/scripts/modo/formulaires.phtml +++ b/application/modules/admin/views/scripts/modo/formulaires.phtml @@ -6,8 +6,8 @@ $data_names = Class_Formulaire::mergeDataNames($this->formulaires); echo $this->tagModelTable( $this->formulaires, - $data_names, - $data_names, + array_merge([$this->_('Posté par'), $this->_('Bibliothèque')], $data_names), + array_merge(['compte', 'libelle_bib'], $data_names), [['action' => 'delete-formulaire', 'content' => $this->boutonIco('type=del')]], 'formulaires'); ?> \ No newline at end of file diff --git a/library/Class/Formulaire.php b/library/Class/Formulaire.php index ebf350e87c7c2131787bb694395ff56d2bc88ec6..50ba8f4c4772f399a05aa445931c748133fb2e16 100644 --- a/library/Class/Formulaire.php +++ b/library/Class/Formulaire.php @@ -70,4 +70,19 @@ class Class_Formulaire extends Storm_Model_Abstract { $this->setDateCreation(date('Y-m-d H:i:s', self::getTimeSource()->time())); } + + public function getCompte() { + if ($this->hasUser()) + return $this->getUser()->getNomComplet(); + return ''; + } + + + public function getLibelleBib() { + if ($user = $this->getUser()) + return $user->getLibelleBib(); + + return ''; + } + } diff --git a/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php b/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php index e921bfa3e6ab1431b893989a3865106957716461..18b5ea3bb1d67bcf480a2ee65d699eb25c3ba7e7 100644 --- a/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php +++ b/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php @@ -40,7 +40,12 @@ abstract class ModoControllerFormulaireForArticleTestCase extends Admin_Abstract Class_Formulaire::newInstanceWithId(5, ['data' => serialize(['nom' => 'Bougie', 'Prenom' => 'Mireille']), - 'article' => $article]), + 'article' => $article, + 'user' => Class_Users::newInstanceWithId(34, + [ + 'login' => 'zork', + 'bib' => Class_Bib::newInstanceWithId(4, ['libelle' => 'Annecy']) + ])]), Class_Formulaire::newInstanceWithId(6, ['data' => serialize(['name' => 'Lefort', 'prenom' => 'Nono', @@ -87,13 +92,25 @@ class ModoControllerFormulaireForArticleListTest extends ModoControllerFormulair /** @test */ public function aTDShouldContainsPrenomMireille() { - $this->assertXPathContentContains('//td', 'Mireille'); + $this->assertXPathContentContains('//tr[2]//td', 'Mireille'); + } + + + /** @test */ + public function mireilleRowShouldContainsUserZork() { + $this->assertXPathContentContains('//tr[2]//td', 'zork'); + } + + + /** @test */ + public function mireilleRowShouldContainsBibAnnecy () { + $this->assertXPathContentContains('//tr[2]//td', 'Annecy'); } /** @test */ public function aTDShouldContainsActionToDeleteFormulaireMireille() { - $this->assertXPath('//td/a[contains(@href, "admin/modo/delete-formulaire/id_article/12/id/5")]'); + $this->assertXPath('//tr[2]//td/a[contains(@href, "admin/modo/delete-formulaire/id_article/12/id/5")]'); } }