gemstracker-svn

[Gemstracker-svn] SF.net SVN: gemstracker:[229] trunk/library/classes/Gems/Tracker/ RespondentTrack.php

[<gem...@li...>]

Revision: 229
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=229&view=rev
Author:   michieltcs
Date:     2011-11-17 14:20:41 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
Make sure _ensureFieldsData() is called when respondenttrack is refreshed

Modified Paths:
--------------
    trunk/library/classes/Gems/Tracker/RespondentTrack.php

Modified: trunk/library/classes/Gems/Tracker/RespondentTrack.php
===================================================================
--- trunk/library/classes/Gems/Tracker/RespondentTrack.php	2011-11-17 11:46:04 UTC (rev 228)
+++ trunk/library/classes/Gems/Tracker/RespondentTrack.php	2011-11-17 14:20:41 UTC (rev 229)
@@ -609,6 +609,8 @@
 
             $this->_respTrackData = $this->db->fetchRow($sql, $this->_respTrackId);
         }
+        
+        $this->_ensureFieldData(true);
 
         return $this;
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[250] trunk/library/classes/Gems/Tracker/ RespondentTrack.php

[<gem...@li...>]

Revision: 250
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=250&view=rev
Author:   mennodekker
Date:     2011-11-21 10:58:55 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
In a respondentTrack the getFieldData() method now returns an associative array of fieldcode->value pairs, alongside the old fieldId->value pairs

Modified Paths:
--------------
    trunk/library/classes/Gems/Tracker/RespondentTrack.php

Modified: trunk/library/classes/Gems/Tracker/RespondentTrack.php
===================================================================
--- trunk/library/classes/Gems/Tracker/RespondentTrack.php	2011-11-21 10:57:14 UTC (rev 249)
+++ trunk/library/classes/Gems/Tracker/RespondentTrack.php	2011-11-21 10:58:55 UTC (rev 250)
@@ -120,7 +120,17 @@
     private function _ensureFieldData($reload = false)
     {
         if ((null === $this->_fieldData) || $reload) {
-            $this->_fieldData = $this->getTrackEngine()->getFieldsData($this->_respTrackId);
+            $fieldData = $this->getTrackEngine()->getFieldsData($this->_respTrackId);
+            $fieldMap  = $this->getTrackEngine()->getFields();
+
+            //Map the fielddata to the fieldcode
+            foreach($fieldData as $key=>$value) {
+                if (isset($fieldMap[$key])) {
+                    $fieldData[$fieldMap[$key]] = $value;
+                }
+            }
+                
+            $this->_fieldData = $fieldData;
         }
     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[401] trunk/library/classes/Gems/Tracker/ RespondentTrack.php

[<gem...@li...>]

Revision: 401
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=401&view=rev
Author:   mennodekker
Date:     2012-01-06 14:01:17 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
Fix RespondentTrack throwing an error after update and getFirstToken()

Modified Paths:
--------------
    trunk/library/classes/Gems/Tracker/RespondentTrack.php

Modified: trunk/library/classes/Gems/Tracker/RespondentTrack.php
===================================================================
--- trunk/library/classes/Gems/Tracker/RespondentTrack.php	2012-01-06 10:22:34 UTC (rev 400)
+++ trunk/library/classes/Gems/Tracker/RespondentTrack.php	2012-01-06 14:01:17 UTC (rev 401)
@@ -534,7 +534,9 @@
             if (true === $refresh) {
                 unset($this->_tokens);
                 unset($this->_activeTokens);
-                unset($this->_firstToken);
+                //Next line will cause errors later on when we refresh the tokens, getFirstToken() will then throw an error
+                //unset($this->_firstToken); 
+                $this->_firstToken = null;
             }
             $this->_tokens       = array();
             $this->_activeTokens = array();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[406] trunk/library/classes/Gems/Tracker/ RespondentTrack.php

[<gem...@li...>]

Revision: 406
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=406&view=rev
Author:   matijsdejong
Date:     2012-01-12 12:00:47 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
Extension + cleanup of code after fex 401

Modified Paths:
--------------
    trunk/library/classes/Gems/Tracker/RespondentTrack.php

Modified: trunk/library/classes/Gems/Tracker/RespondentTrack.php
===================================================================
--- trunk/library/classes/Gems/Tracker/RespondentTrack.php	2012-01-11 15:18:41 UTC (rev 405)
+++ trunk/library/classes/Gems/Tracker/RespondentTrack.php	2012-01-12 12:00:47 UTC (rev 406)
@@ -459,13 +459,11 @@
     public function getFirstToken()
     {
         if (! $this->_firstToken) {
-            if ($this->_tokens) {
-                $this->_firstToken = reset($this->_tokens);
-            } else {
+            if (! $this->_tokens) {
                 //No cache yet, but we might need all tokens later
-                $tokens = $this->getTokens();
-                $this->_firstToken = reset($tokens);
+                $this->getTokens();
             }
+            $this->_firstToken = reset($this->_tokens);
         }
 
         return $this->_firstToken;
@@ -526,16 +524,13 @@
     /**
      * Returns all the tokens in this track
      *
+     * @param boolean $refresh When true, always reload
      * @return array of Gems_Tracker_Token
      */
     public function getTokens($refresh = false)
     {
-        if (! $this->_tokens || true === $refresh) {
-            if (true === $refresh) {
-                unset($this->_tokens);
-                unset($this->_activeTokens);
-                //Next line will cause errors later on when we refresh the tokens, getFirstToken() will then throw an error
-                //unset($this->_firstToken); 
+        if (! $this->_tokens || $refresh) {
+            if ($refresh) {
                 $this->_firstToken = null;
             }
             $this->_tokens       = array();
@@ -686,7 +681,7 @@
             // Reload reception code values
             $this->_ensureReceptionCode($code->getAllData());
         }
-        
+
         // Stopcodes have a different logic.
         if ($code->isStopCode()) {
             // Cascade stop to tokens

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.