diff --git a/.gitattributes b/.gitattributes
index c5f02bb44ffb1b8db794b17b9bf17f88f137d8e6..a9939bead296ad4c868b8aeeb4df8d9738157b86 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1944,6 +1944,7 @@ library/ZendAfi/View/Helper/Permalink.php -text
library/ZendAfi/View/Helper/Portail.php -text
library/ZendAfi/View/Helper/ReadSpeaker.php -text
library/ZendAfi/View/Helper/RenderAlbum.php -text
+library/ZendAfi/View/Helper/RenderDateRange.php -text
library/ZendAfi/View/Helper/RenderForm.php -text
library/ZendAfi/View/Helper/RenderLieu.php -text
library/ZendAfi/View/Helper/ReseauxSociaux.php -text
diff --git a/application/modules/admin/controllers/FormationController.php b/application/modules/admin/controllers/FormationController.php
index 90455cf28b8b3e096b9203b83b0fabb800c55a7d..f852819e3fca95dffd9f650af55a3df45f326bbb 100644
--- a/application/modules/admin/controllers/FormationController.php
+++ b/application/modules/admin/controllers/FormationController.php
@@ -360,12 +360,11 @@ class Admin_FormationController extends Zend_Controller_Action {
->validate();
if ($form->isValid($this->_request->getPost()) && $session->isValid()) {
- if ($session->save()) {
- $this->_helper->notify(sprintf('Session du %s sauvegardée',
- $this->view->humanDate($session->getDateDebut(), 'd MMMM YYYY')));
- $this->_redirect('admin/formation/session_edit/id/'.$session->getId());
- return true;
- }
+ $session->save();
+ $this->_helper->notify(sprintf('Session du %s sauvegardée',
+ $this->view->humanDate($session->getDateDebut(), 'd MMMM YYYY')));
+ $this->_redirect('admin/formation/session_edit/id/'.$session->getId());
+ return true;
}
foreach($session->getErrors() as $attribute => $message) {
diff --git a/application/modules/opac/views/scripts/abonne/_session.phtml b/application/modules/opac/views/scripts/abonne/_session.phtml
index 007ecbcf6b88c3ca6d96813767233e70de83acbe..bfef4a64dd8faddf49a6778ae4e185de310b8b8f 100644
--- a/application/modules/opac/views/scripts/abonne/_session.phtml
+++ b/application/modules/opac/views/scripts/abonne/_session.phtml
@@ -1,7 +1,7 @@
<tr class="session_<?php echo $this->session->getId()?> <?php echo $this->item_class ?>">
<?php
echo sprintf("<td>%s %s</td>",
- $this->humanDate($this->session->getDateDebut(), 'dd MMMM Y'),
+ $this->renderDateRange($this->session->getDateDebut(), $this->session->getDateFin()),
$this->session->isAnnule() ? '(Annulé)' : '');
echo sprintf("<td>%s </td>", $this->session->getLibelleLieu());
echo sprintf("<td>%s</td>",
diff --git a/application/modules/opac/views/scripts/abonne/detail-session.phtml b/application/modules/opac/views/scripts/abonne/detail-session.phtml
index 7c10aa44cddc40ee62f47fd3a0519ed24094a766..6924dc9f757e7cd500f9ed81d8e0d5a0f9f62aff 100644
--- a/application/modules/opac/views/scripts/abonne/detail-session.phtml
+++ b/application/modules/opac/views/scripts/abonne/detail-session.phtml
@@ -1,8 +1,8 @@
<?php
echo $this->openBoite(sprintf('Formation %s: session du %s',
$this->session->getLibelleFormation(),
- $this->humanDate($this->session->getDateDebut(),
- 'd MMMM yyyy')));
+ $this->renderDateRange($this->session->getDateDebut(),
+ $this->session->getDateFin())));
?>
diff --git a/library/Class/SessionFormation.php b/library/Class/SessionFormation.php
index 54d8ae2cd89f83d90b2b277dc36d5eadef209ba4..d4bcc6ee87340a0d99f15ae4fab20b3a16bac45f 100644
--- a/library/Class/SessionFormation.php
+++ b/library/Class/SessionFormation.php
@@ -151,7 +151,7 @@ class Class_SessionFormation extends Storm_Model_Abstract {
"La date limite d'inscription doit être inférieure ou égale à la date de début");
$this->checkAttribute('date_fin',
- Class_Date::isEndDateAfterStartDateNotEmpty($this->getDateFin(), $this->getDateDebut()),
+ Class_Date::isEndDateAfterStartDate($this->getDateDebut(), $this->getDateFin()),
"La date de fin doit être supérieure ou égale à la date de début");
}
diff --git a/library/ZendAfi/View/Helper/RenderDateRange.php b/library/ZendAfi/View/Helper/RenderDateRange.php
new file mode 100644
index 0000000000000000000000000000000000000000..d2a21b98a34a34861a8b69f84aee869ac446e50a
--- /dev/null
+++ b/library/ZendAfi/View/Helper/RenderDateRange.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright (c) 2012, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * AFI-OPAC 2.0 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * AFI-OPAC 2.0 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with AFI-OPAC 2.0; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+class ZendAfi_View_Helper_RenderDateRange extends Zend_View_Helper_HtmlElement {
+ public function renderDateRange($date_debut, $date_fin) {
+ $date_fin = $date_fin ? $date_fin : $date_debut;
+
+ if ($date_debut == $date_fin) {
+ $event_string = $this->view->humanDate($date_debut, 'dd MMMM Y');
+ } else {
+ $event_string = $this->view->_(
+ '%s au %s',
+ $this->view->humanDate($date_debut, 'dd MMMM Y'),
+ $this->view->humanDate($date_fin, 'dd MMMM Y')
+ );
+ }
+ return sprintf('<span>%s</span>', $event_string);
+ }
+}
+
+?>
\ No newline at end of file
diff --git a/public/opac/css/global.css b/public/opac/css/global.css
index b72caecd506a85f80c2691a48109e14851d63fe1..8c1218a16aa4b77680a08ce1a89fdbd23cfe17e1 100644
--- a/public/opac/css/global.css
+++ b/public/opac/css/global.css
@@ -777,6 +777,12 @@ dl.session_formation + .actions a:last-child {
}
+.formations table td:first-child {
+ width: 140px;
+ padding: 5px 0px;
+}
+
+
.first:hover,
.second:hover{
background-color: rgba(194, 221, 230, 0.4);
diff --git a/tests/application/modules/admin/controllers/FormationControllerTest.php b/tests/application/modules/admin/controllers/FormationControllerTest.php
index 8317f662f124cf26b7361baf31482320f01e5c73..101e270ea79d1c07872c6b29ec29d395b0a6e522 100644
--- a/tests/application/modules/admin/controllers/FormationControllerTest.php
+++ b/tests/application/modules/admin/controllers/FormationControllerTest.php
@@ -745,8 +745,7 @@ class Admin_FormationControllerPostSessionLearnJavaWithInvalidDataTest extends
array('date_debut' => '',
'effectif_min' => 20,
'effectif_max' => 4,
- 'date_limite_inscription' => '05/01/2099',
- 'date_fin' => '05/01/1990'));
+ 'date_limite_inscription' => '05/01/2022'));
}
/** @test */
@@ -772,6 +771,18 @@ class Admin_FormationControllerPostSessionLearnJavaWithInvalidDataTest extends
$this->assertXPathContentContains('//ul[@class="errors"]//li',
"La date limite d'inscription doit être inférieure ou égale à la date de début");
}
+}
+
+
+
+
+class Admin_FormationControllerPostSessionLearnJavaWithInvalidDateFinTest extends Admin_FormationControllerTestCase {
+ public function setUp() {
+ parent::setUp();
+ $this->postDispatch('/admin/formation/session_edit/id/32',
+ array('date_debut' => '05/02/2011',
+ 'date_fin' => '05/01/2010'));
+ }
/** @test */
diff --git a/tests/application/modules/opac/controllers/AbonneControllerFormationsTest.php b/tests/application/modules/opac/controllers/AbonneControllerFormationsTest.php
index 871de3889aa216536e2b95c38819dbbf836cdcbe..d67621d642f789f0a35b03567d1d3f1834dc4a79 100644
--- a/tests/application/modules/opac/controllers/AbonneControllerFormationsTest.php
+++ b/tests/application/modules/opac/controllers/AbonneControllerFormationsTest.php
@@ -116,6 +116,7 @@ abstract class AbstractAbonneControllerFormationsTestCase extends AbstractContro
->setStagiaires(array())
->setLieu($this->_bonlieu)
->setDateDebut('2022-02-17')
+ ->setDateFin('2022-02-19')
->setDateLimiteInscription('2022-02-15'),
@@ -236,7 +237,7 @@ class AbonneControllerFormationsListTest extends AbstractAbonneControllerFormati
/** @test */
function session_fevrier_17_ShouldBeDisplayedUnderLearnJavaInSecondPosition() {
- $this->assertXPathContentContains('//tr[2]//td', '17 février 2022');
+ $this->assertXPathContentContains('//tr[2]//td', '17 février 2022 au 19 février 2022', $this->_response->getBody());
}
@@ -275,7 +276,7 @@ class AbonneControllerFormationsListTest extends AbstractAbonneControllerFormati
/** @test */
function session_septembre_java_ShouldBeAnnule() {
- $this->assertXPathContentContains('//tr', '27 septembre 2022 (Annul');
+ $this->assertXPathContentContains('//tr//td[contains(text(), "Annul")]//span', '27 septembre 2022');
}
@@ -596,7 +597,7 @@ class AbonneControllerFormationsSessionJuilletPythonDetailTest extends AbstractA
/** @test */
public function titleShouldBeFormationLearnPython_SessionDu21Juillet2023() {
- $this->assertXPathContentContains('//h1', 'Formation Learn Python: session du 21 juillet 2023');
+ $this->assertXPathContentContains('//h1[contains(text(), "Learn Python")]//span', '21 juillet 2023');
}