Skip to content
Snippets Groups Projects
Commit dab98356 authored by Henri-Damien LAURENT's avatar Henri-Damien LAURENT
Browse files

hotline #94048 : Administration : allowing librarians to take meetings up to 22:00

parent ef34e712
Branches
Tags
4 merge requests!3297WIP: Master,!3203Master,!3202Hotline,!3199hotline #94048 : Administration : allowing librarians to take meetings up to 22:00
Pipeline #8009 passed with stage
in 40 minutes and 47 seconds
hotline#94048 : Administration : elargissement de la plage horaire dans le module rendez-vous
\ No newline at end of file
...@@ -36,7 +36,7 @@ class ZendAfi_Form_Admin_RendezVous extends ZendAfi_Form { ...@@ -36,7 +36,7 @@ class ZendAfi_Form_Admin_RendezVous extends ZendAfi_Form {
'required' => true, 'required' => true,
'allowEmpty'=>false, 'allowEmpty'=>false,
'min' => '08:00', 'min' => '08:00',
'max' => '18:00', 'max' => '22:00',
'step' => '5']); 'step' => '5']);
$this->addElement('timePicker', 'end_time', $this->addElement('timePicker', 'end_time',
...@@ -44,7 +44,7 @@ class ZendAfi_Form_Admin_RendezVous extends ZendAfi_Form { ...@@ -44,7 +44,7 @@ class ZendAfi_Form_Admin_RendezVous extends ZendAfi_Form {
'required' => true, 'required' => true,
'allowEmpty'=>false, 'allowEmpty'=>false,
'min' => '08:00', 'min' => '08:00',
'max' => '18:00', 'max' => '22:00',
'step' => '5']); 'step' => '5']);
$multiOptions = ['0' => $this->_('Choisir un lieu')] + Class_Lieu::getAllLibelles(); $multiOptions = ['0' => $this->_('Choisir un lieu')] + Class_Lieu::getAllLibelles();
......
...@@ -190,14 +190,14 @@ class RendezVousAdminAddActionTest extends RendezVousAdminTestCase { ...@@ -190,14 +190,14 @@ class RendezVousAdminAddActionTest extends RendezVousAdminTestCase {
/** @test */ /** @test */
public function begintimeShouldBePresentStartAt8EndAt18() { public function begintimeShouldBePresentStartAt8EndAt18() {
$this->assertXPath('//select[@name="begin_time"]//option[1][@value="08:00"]'); $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 */ /** @test */
public function endtimeShouldBePresentStartAt8EndAt18() { public function endtimeShouldBePresentStartAt8EndAt18() {
$this->assertXPath('//select[@name="end_time"]//option[1][@value="08:00"]'); $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"]');
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment