*5324* Registration closes before end of day on the closing date

pkp · Sep 19, 2011 · 645122f · 645122f
1 parent 3481edf
commit 645122f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/classes/registration/RegistrationOptionDAO.inc.php b/classes/registration/RegistrationOptionDAO.inc.php
@@ -178,7 +178,7 @@ function &_returnRegistrationOptionFromRow(&$row) {
 		$registrationOption->setSchedConfId($row['sched_conf_id']);
 		$registrationOption->setCode($row['code']);
 		$registrationOption->setOpeningDate($this->dateFromDB($row['opening_date']));
-		$registrationOption->setClosingDate($this->dateFromDB($row['closing_date']));
+		$registrationOption->setClosingDate($this->datetimeFromDB($row['closing_date']));
 		$registrationOption->setSequence($row['seq']);
 		$registrationOption->setPublic($row['pub']);
 
@@ -219,7 +219,7 @@ function insertRegistrationOption(&$registrationOption) {
 				VALUES
 				(?, %s, %s, ?, ?, ?)',
 				$this->dateToDB($registrationOption->getOpeningDate()),
-				$this->dateToDB($registrationOption->getClosingDate())
+				$this->datetimeToDB($registrationOption->getClosingDate())
 			), array(
 				(int) $registrationOption->getSchedConfId(),
 				(int) $registrationOption->getPublic(),
@@ -250,7 +250,7 @@ function updateRegistrationOption(&$registrationOption) {
 					code = ?
 				WHERE	option_id = ?',
 				$this->dateToDB($registrationOption->getOpeningDate()),
-				$this->dateToDB($registrationOption->getClosingDate())
+				$this->datetimeToDB($registrationOption->getClosingDate())
 			), array(
 				(int) $registrationOption->getSchedConfId(),
 				(int) $registrationOption->getPublic(),

diff --git a/classes/registration/RegistrationTypeDAO.inc.php b/classes/registration/RegistrationTypeDAO.inc.php
@@ -234,7 +234,7 @@ function &_returnRegistrationTypeFromRow(&$row) {
 		$registrationType->setCost($row['cost']);
 		$registrationType->setCurrencyCodeAlpha($row['currency_code_alpha']);
 		$registrationType->setOpeningDate($this->dateFromDB($row['opening_date']));
-		$registrationType->setClosingDate($this->dateFromDB($row['closing_date']));
+		$registrationType->setClosingDate($this->datetimeFromDB($row['closing_date']));
 		$registrationType->setExpiryDate($this->dateFromDB($row['expiry_date']));
 		$registrationType->setAccess($row['access']);
 		$registrationType->setInstitutional($row['institutional']);

diff --git a/dbscripts/xml/ocs_schema.xml b/dbscripts/xml/ocs_schema.xml
@@ -1145,7 +1145,7 @@
 		</field>
 		<field name="code" type="C2" size="80" />
 		<field name="opening_date" type="D"/>
-		<field name="closing_date" type="D">
+		<field name="closing_date" type="T">
 			<NOTNULL/>
 		</field>
 		<field name="pub" type="I1">