From dab983563d081e43ced901fdb8c2df380246e0ea Mon Sep 17 00:00:00 2001
From: Henri-Damien LAURENT <hdlaurent@afi-sa.fr>
Date: Fri, 26 Jul 2019 13:39:06 +0200
Subject: [PATCH] hotline #94048 : Administration : allowing librarians to take
meetings up to 22:00
---
cosmogramme/VERSIONS_HOTLINE/94048 | 1 +
library/ZendAfi/Form/Admin/RendezVous.php | 4 ++--
tests/scenarios/RendezVous/RendezVousAdminTest.php | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
create mode 100644 cosmogramme/VERSIONS_HOTLINE/94048
diff --git a/cosmogramme/VERSIONS_HOTLINE/94048 b/cosmogramme/VERSIONS_HOTLINE/94048
new file mode 100644
index 00000000000..33955ad46df
--- /dev/null
+++ b/cosmogramme/VERSIONS_HOTLINE/94048
@@ -0,0 +1 @@
+hotline#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 ed4efa78233..b8a926b5a06 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 789db45f34a..19decf5f40c 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"]');
}
--
GitLab