Multimedia: si réservation le jour même, ne pas proposer les créneaux horaire...

Multimedia: si réservation le jour même, ne pas proposer les créneaux horaire avant l'heure courante

.gitattributes

@@ -1820,6 +1820,7 @@ library/Class/Systeme/PergameService.php -text
 library/Class/Systeme/Sql.php -text
 library/Class/TagNotice.php -text
 library/Class/Thumbs.php -text
+library/Class/TimeSource.php -text
 library/Class/TypeDoc.php -text
 library/Class/Upload.php -text
 library/Class/UserGroup.php -text

library/Class/Multimedia/Location.php

@@ -72,6 +72,9 @@ class Multimedia_LocationLoader extends Storm_Model_Loader {
 
 
 class Class_Multimedia_Location extends Storm_Model_Abstract {
+	/** @var Class_TimeSource */
+	protected static $_time_source;
+	
 	protected $_loader_class = 'Multimedia_LocationLoader';
 	protected $_table_name = 'multimedia_location';
 	protected $_has_many = array(
@@ -93,9 +96,50 @@ class Class_Multimedia_Location extends Storm_Model_Abstract {
 	 * @return array
 	 */
 	public function getStartTimesForDate($date) {
-		return $this->getLoader()->getPossibleHours($this->getSlotSize(),
-			                                          $this->getMinTimeForDate($date),
-			                                          $this->getMaxTimeForDate($date));
+		$min_time = $this->getMinTimeForDate($date);
+		$start_times = $this->getLoader()->getPossibleHours($this->getSlotSize(),
+			                                                  $min_time,
+			                                                  $this->getMaxTimeForDate($date));
+
+		if ($min_time < ($current = $this->getCurrentTime())) {
+			$hour = (int) date('H', $current);
+			$minute = (int) date('i', $current);
+			$i = 0;
+ 
+			foreach (array_keys($start_times) as $time) {
+				$parts = explode(':', $time);
+				if ($hour <= (int)$parts[0] and $minute <= (int)$parts[1])
+					break;
+				++$i;
+			}
+
+			$start_times = array_slice($start_times, $i);
+		}
+
+		return $start_times;
+	}
+
+
+	/**
+	 * @category testing
+	 * @return int
+	 */
+	public function getCurrentTime() {
+		return self::getTimeSource()->time();
+	}
+
+
+	/** @return Class_TimeSource */
+	public static function getTimeSource() {
+		if (null == self::$_time_source)
+			self::$_time_source = new Class_TimeSource();
+		return self::$_time_source;
+	}
+
+
+	/** @param $time_source Class_TimeSource */
+	public static function setTimeSource($time_source) {
+		self::$_time_source = $time_source;
 	}
 
 

library/Class/TimeSource.php

+<?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 
+ */
+
+/**
+ * Encapsule les appels systeme temps pour pouvoir les surcharger pendant les tests
+ * @category testing
+ */
+class Class_TimeSource {
+	/** @return int */
+	public function time() {
+		return time();
+	}
+}
+?>
\ No newline at end of file

tests/application/modules/opac/controllers/AbonneControllerMultimediaTest.php

@@ -390,6 +390,11 @@ class AbonneControllerMultimediaHoldHoursTest extends AbonneControllerMultimedia
 		parent::setUp();
 		$this->_prepareLocationInSession();
 		$this->_prepareDayInSession();
+
+		Class_Multimedia_Location::setTimeSource(Storm_Test_ObjectWrapper::mock()
+			->whenCalled('time')
+			->willDo(function() {return strtotime('2012-09-09 09:00:00');}));
+
 		$this->dispatch('/abonne/multimedia-hold-hours', true);
 	}
 
@@ -402,7 +407,7 @@ class AbonneControllerMultimediaHoldHoursTest extends AbonneControllerMultimedia
 
 	/** @test */
 	public function listOfStartTimesShouldBePresent() {
-		$this->assertXPathCount('//select[@id="time"]/option', 19);
+		$this->assertXPathCount('//select[@id="time"]/option', 18);
 	}
 
 
@@ -412,6 +417,12 @@ class AbonneControllerMultimediaHoldHoursTest extends AbonneControllerMultimedia
 	}
 
 
+	/** @test */
+	public function startingAt8AndHalfShouldNotBePossible() {
+		$this->assertNotXpath('//option[@value="08:30"]');
+	}
+
+
 	/** @test */
 	public function oneHourDurationOptionShouldBePresent() {
 		$this->assertXPathContentContains('//option[@value="60"]', '1h');