[Gemstracker-svn] SF.net SVN: gemstracker:[687] trunk/library/classes/Gems

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

Revision: 687
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=687&view=rev
Author:   michieltcs
Date:     2012-05-18 10:50:20 +0000 (Fri, 18 May 2012)
Log Message:
-----------
Round description is empty with single survey tracks, only show tracks with reception code OK

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

Modified: trunk/library/classes/Gems/Default/RespondentExportAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RespondentExportAction.php	2012-05-18 10:29:26 UTC (rev 686)
+++ trunk/library/classes/Gems/Default/RespondentExportAction.php	2012-05-18 10:50:20 UTC (rev 687)
@@ -75,6 +75,8 @@
      */
     protected function _exportTrackTokens(Gems_Tracker_RespondentTrack $track)
     {
+        $engine = $track->getTrackEngine();
+        
         $table = $this->html->table(array('class' => 'browser'));
         $table->th($this->_('Survey'))
               ->th($this->_('Round'))
@@ -87,7 +89,7 @@
         
         while ($token) {
             $table->tr()->td($token->getSurveyName())
-                        ->td($token->getRoundDescription())
+                        ->td(($engine->getTrackType() == 'T' ? $token->getRoundDescription() : $this->_('Single Survey')))
                         ->td(strtoupper($token->getTokenId()))
                         ->td(($token->isCompleted() ? $this->_('Yes') : $this->_('No')));
             
@@ -110,6 +112,10 @@
      */
     protected function _exportTrack(Gems_Tracker_RespondentTrack $track)
     {
+        if ($track->getReceptionCode() != GemsEscort::RECEPTION_OK) {
+            return;
+        }
+        
         $trackModel = $this->loader->getTracker()->getRespondentTrackModel();
         $trackModel->resetOrder();
         $trackModel->set('gtr_track_name',    'label', $this->_('Track'));

Modified: trunk/library/classes/Gems/Tracker/RespondentTrack.php
===================================================================
--- trunk/library/classes/Gems/Tracker/RespondentTrack.php	2012-05-18 10:29:26 UTC (rev 686)
+++ trunk/library/classes/Gems/Tracker/RespondentTrack.php	2012-05-18 10:50:20 UTC (rev 687)
@@ -504,6 +504,11 @@
     {
         return $this->_respTrackData['gr2t_id_organization'];
     }
+    
+    public function getReceptionCode()
+    {
+        return $this->_respTrackData['gr2t_reception_code'];
+    }
 
     /**
      *

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