From: <gem...@li...> - 2011-10-13 10:58:11
|
Revision: 100 http://gemstracker.svn.sourceforge.net/gemstracker/?rev=100&view=rev Author: mennodekker Date: 2011-10-13 10:58:05 +0000 (Thu, 13 Oct 2011) Log Message: ----------- Quickfix: surveycompleted event now gets the right completion date/time Modified Paths: -------------- trunk/library/classes/Gems/Tracker/Token.php Modified: trunk/library/classes/Gems/Tracker/Token.php =================================================================== --- trunk/library/classes/Gems/Tracker/Token.php 2011-10-13 10:37:10 UTC (rev 99) +++ trunk/library/classes/Gems/Tracker/Token.php 2011-10-13 10:58:05 UTC (rev 100) @@ -348,6 +348,12 @@ } } + //Set completion time for completion event + if ($setCompletionTime) { + $values['gto_completion_time'] = $complTime->toString(Gems_Tracker::DB_DATETIME_FORMAT); + $this->_gemsData['gto_completion_time'] = $values['gto_completion_time']; + } + // Process any Gems side survey dependent changes if ($changed = $this->handleAfterCompletion()) { @@ -360,7 +366,8 @@ } if ($setCompletionTime) { - $values['gto_completion_time'] = $complTime->toString(Gems_Tracker::DB_DATETIME_FORMAT); + //Make sure to unset otherwise it won't get saved + $this->_gemsData['gto_completion_time'] = null; } $values['gto_duration_in_sec'] = max($complTime->diffSeconds($startTime), 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gem...@li...> - 2012-01-24 14:23:14
|
Revision: 420 http://gemstracker.svn.sourceforge.net/gemstracker/?rev=420&view=rev Author: mennodekker Date: 2012-01-24 14:23:03 +0000 (Tue, 24 Jan 2012) Log Message: ----------- Some more deprecated and redirects in Token due to new ReceptionCode object Modified Paths: -------------- trunk/library/classes/Gems/Tracker/Token.php Modified: trunk/library/classes/Gems/Tracker/Token.php =================================================================== --- trunk/library/classes/Gems/Tracker/Token.php 2012-01-24 13:45:19 UTC (rev 419) +++ trunk/library/classes/Gems/Tracker/Token.php 2012-01-24 14:23:03 UTC (rev 420) @@ -978,16 +978,18 @@ /** * - * @deprecated Use the ReceptionCode->hadRedoCode + * @deprecated Use the ReceptionCode->hasRedoCode * @return boolean */ public function hasRedoCode() { - if (! isset($this->_gemsData['grc_redo_survey'])) { + return $this->getReceptionCode()->hasRedoCode(); + /*if (! isset($this->_gemsData['grc_redo_survey'])) { $this->_ensureReceptionCode(); } return (boolean) $this->_gemsData['grc_redo_survey']; + */ } /** @@ -998,24 +1000,31 @@ */ public function hasRedoCopyCode() { + return $this->getReceptionCode()->hasRedoCopyCode(); + /* if (! isset($this->_gemsData['grc_redo_survey'])) { $this->_ensureReceptionCode(); } return Gems_Util_ReceptionCodeLibrary::REDO_COPY == $this->_gemsData['grc_redo_survey']; + */ } /** * + * @deprecated Use the ReceptionCode->isSuccess * @return boolean */ public function hasSuccesCode() { + return $this->getReceptionCode()->isSuccess(); + /* if (! isset($this->_gemsData['grc_success'])) { $this->_ensureReceptionCode(); } return $this->_gemsData['grc_success']; + */ } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gem...@li...> - 2012-02-22 08:27:53
|
Revision: 507 http://gemstracker.svn.sourceforge.net/gemstracker/?rev=507&view=rev Author: michieltcs Date: 2012-02-22 08:27:47 +0000 (Wed, 22 Feb 2012) Log Message: ----------- Switch to protected to allow child classes access to _gemsData array Modified Paths: -------------- trunk/library/classes/Gems/Tracker/Token.php Modified: trunk/library/classes/Gems/Tracker/Token.php =================================================================== --- trunk/library/classes/Gems/Tracker/Token.php 2012-02-21 18:06:31 UTC (rev 506) +++ trunk/library/classes/Gems/Tracker/Token.php 2012-02-22 08:27:47 UTC (rev 507) @@ -60,7 +60,7 @@ * * @var array The gems token data */ - private $_gemsData = array(); + protected $_gemsData = array(); /** * @@ -84,7 +84,7 @@ * * @var string The id of the token */ - private $_tokenId; + protected $_tokenId; /** * @@ -171,7 +171,7 @@ /** * Makes sure the respondent data is part of the $this->_gemsData */ - private function _ensureRespondentData() + protected function _ensureRespondentData() { if (! isset($this->_gemsData['grs_id_user'], $this->_gemsData['gr2o_id_user'], $this->_gemsData['gco_code'])) { $sql = "SELECT * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gem...@li...> - 2012-05-04 11:51:48
|
Revision: 669 http://gemstracker.svn.sourceforge.net/gemstracker/?rev=669&view=rev Author: matijsdejong Date: 2012-05-04 11:51:42 +0000 (Fri, 04 May 2012) Log Message: ----------- Added respondent utility functions to token. Should maybe think about a separate respondent object. Modified Paths: -------------- trunk/library/classes/Gems/Tracker/Token.php Modified: trunk/library/classes/Gems/Tracker/Token.php =================================================================== --- trunk/library/classes/Gems/Tracker/Token.php 2012-05-04 11:38:33 UTC (rev 668) +++ trunk/library/classes/Gems/Tracker/Token.php 2012-05-04 11:51:42 UTC (rev 669) @@ -799,7 +799,36 @@ } /** + * Returns the gender as a letter code * + * @return string + */ + public function getRespondentGender() + { + if (! isset($this->_gemsData['grs_id_user'])) { + $this->_ensureRespondentData(); + } + + return $this->_gemsData['grs_gender']; + } + + /** + * Returns the gender for use as part of a sentence, e.g. Dear Mr/Mrs + * + * @return string + */ + public function getRespondentGenderHello() + { + $greetings = $this->util->getTranslated()->getGenderGreeting(); + $gender = $this->getRespondentGender(); + + if (isset($greetings[$gender])) { + return $greetings[$gender]; + } + } + + /** + * * @return int */ public function getRespondentId() @@ -811,6 +840,19 @@ * * @return string */ + public function getRespondentLastName() + { + if (! isset($this->_gemsData['grs_id_user'])) { + $this->_ensureRespondentData(); + } + + return trim($this->_gemsData['grs_surname_prefix'] . ' ' . $this->_gemsData['grs_last_name']); + } + + /** + * + * @return string + */ public function getRespondentName() { if (! isset($this->_gemsData['grs_id_user'])) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gem...@li...> - 2012-08-01 11:20:39
|
Revision: 890 http://gemstracker.svn.sourceforge.net/gemstracker/?rev=890&view=rev Author: mennodekker Date: 2012-08-01 11:20:30 +0000 (Wed, 01 Aug 2012) Log Message: ----------- Allow projects to implement their own _updateToken Modified Paths: -------------- trunk/library/classes/Gems/Tracker/Token.php Modified: trunk/library/classes/Gems/Tracker/Token.php =================================================================== --- trunk/library/classes/Gems/Tracker/Token.php 2012-07-31 14:51:22 UTC (rev 889) +++ trunk/library/classes/Gems/Tracker/Token.php 2012-08-01 11:20:30 UTC (rev 890) @@ -205,7 +205,7 @@ * @param int $userId The current user * @return int 1 if data changed, 0 otherwise */ - private function _updateToken(array $values, $userId) + protected function _updateToken(array $values, $userId) { if ($this->tracker->filterChangesOnly($this->_gemsData, $values)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gem...@li...> - 2012-08-30 14:24:49
|
Revision: 918 http://gemstracker.svn.sourceforge.net/gemstracker/?rev=918&view=rev Author: mennodekker Date: 2012-08-30 14:24:40 +0000 (Thu, 30 Aug 2012) Log Message: ----------- Slightly better handling of not completely loaded token Modified Paths: -------------- trunk/library/classes/Gems/Tracker/Token.php Modified: trunk/library/classes/Gems/Tracker/Token.php =================================================================== --- trunk/library/classes/Gems/Tracker/Token.php 2012-08-30 14:12:18 UTC (rev 917) +++ trunk/library/classes/Gems/Tracker/Token.php 2012-08-30 14:24:40 UTC (rev 918) @@ -843,7 +843,11 @@ */ public function getRespondentId() { - return $this->_gemsData['gto_id_respondent']; + if (array_key_exists('gto_id_respondent', $this->_gemsData)) { + return $this->_gemsData['gto_id_respondent']; + } else { + throw new Gems_Exception('Token not loaded correctly'); + } } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gem...@li...> - 2012-12-17 12:46:18
|
Revision: 1068 http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1068&view=rev Author: mennodekker Date: 2012-12-17 12:46:11 +0000 (Mon, 17 Dec 2012) Log Message: ----------- Removed debug statement Modified Paths: -------------- trunk/library/classes/Gems/Tracker/Token.php Modified: trunk/library/classes/Gems/Tracker/Token.php =================================================================== --- trunk/library/classes/Gems/Tracker/Token.php 2012-12-17 12:27:22 UTC (rev 1067) +++ trunk/library/classes/Gems/Tracker/Token.php 2012-12-17 12:46:11 UTC (rev 1068) @@ -201,7 +201,7 @@ $respId = $this->_gemsData['gto_id_respondent']; $orgId = $this->_gemsData['gto_id_organization']; - MUtil_Echo::track($this->_gemsData); + // MUtil_Echo::track($this->_gemsData); if ($row = $this->db->fetchRow($sql, array($respId, $orgId))) { $this->_gemsData = $this->_gemsData + $row; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |