diff --git a/VERSIONS_HOTLINE/94048 b/VERSIONS_HOTLINE/94048 new file mode 100644 index 0000000000000000000000000000000000000000..23ab02ab4f7ee273ae70eb6bd94b615d4c150a59 --- /dev/null +++ b/VERSIONS_HOTLINE/94048 @@ -0,0 +1 @@ + - ticket #94048 : Administration : elargissement de la plage horaire dans le module rendez-vous \ No newline at end of file diff --git a/library/ZendAfi/Form/Admin/RendezVous.php b/library/ZendAfi/Form/Admin/RendezVous.php index ed4efa78233f6e790de7e367c5a943eb0b3b1b17..b8a926b5a064997400252b3bf8d9e1219d697ca4 100644 --- a/library/ZendAfi/Form/Admin/RendezVous.php +++ b/library/ZendAfi/Form/Admin/RendezVous.php @@ -36,7 +36,7 @@ class ZendAfi_Form_Admin_RendezVous extends ZendAfi_Form { 'required' => true, 'allowEmpty'=>false, 'min' => '08:00', - 'max' => '18:00', + 'max' => '22:00', 'step' => '5']); $this->addElement('timePicker', 'end_time', @@ -44,7 +44,7 @@ class ZendAfi_Form_Admin_RendezVous extends ZendAfi_Form { 'required' => true, 'allowEmpty'=>false, 'min' => '08:00', - 'max' => '18:00', + 'max' => '22:00', 'step' => '5']); $multiOptions = ['0' => $this->_('Choisir un lieu')] + Class_Lieu::getAllLibelles(); diff --git a/tests/scenarios/RendezVous/RendezVousAdminTest.php b/tests/scenarios/RendezVous/RendezVousAdminTest.php index 789db45f34ac2e8796c5e51475c0a3d58eba63ff..19decf5f40c49267b1e79ab4178278a4e49b2754 100644 --- a/tests/scenarios/RendezVous/RendezVousAdminTest.php +++ b/tests/scenarios/RendezVous/RendezVousAdminTest.php @@ -190,14 +190,14 @@ class RendezVousAdminAddActionTest extends RendezVousAdminTestCase { /** @test */ public function begintimeShouldBePresentStartAt8EndAt18() { $this->assertXPath('//select[@name="begin_time"]//option[1][@value="08:00"]'); - $this->assertXPath('//select[@name="begin_time"]//option[last()][@value="18:00"]'); + $this->assertXPath('//select[@name="begin_time"]//option[last()][@value="22:00"]'); } /** @test */ public function endtimeShouldBePresentStartAt8EndAt18() { $this->assertXPath('//select[@name="end_time"]//option[1][@value="08:00"]'); - $this->assertXPath('//select[@name="end_time"]//option[last()][@value="18:00"]'); + $this->assertXPath('//select[@name="end_time"]//option[last()][@value="22:00"]'); }