|
From: <gem...@li...> - 2013-04-10 10:08:38
|
Revision: 1220
http://sourceforge.net/p/gemstracker/code/1220
Author: mennodekker
Date: 2013-04-10 10:08:36 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
export: initial survey is empty now and does not show a count
minor cleanup in compliancetablesnippet
Modified Paths:
--------------
trunk/library/classes/Gems/Default/ExportAction.php
trunk/library/classes/Gems/Snippets/Tracker/Compliance/ComplianceTableSnippet.php
Modified: trunk/library/classes/Gems/Default/ExportAction.php
===================================================================
--- trunk/library/classes/Gems/Default/ExportAction.php 2013-04-10 10:02:57 UTC (rev 1219)
+++ trunk/library/classes/Gems/Default/ExportAction.php 2013-04-10 10:08:36 UTC (rev 1220)
@@ -129,7 +129,7 @@
{
$empty = $this->util->getTranslated()->getEmptyDropdownArray();
$tracks = $empty + $this->util->getTrackData()->getSteppedTracks();
- $surveys = $this->util->getDbLookup()->getSurveysForExport(isset($data['tid']) ? $data['tid'] : null);
+ $surveys = $empty + $this->util->getDbLookup()->getSurveysForExport(isset($data['tid']) ? $data['tid'] : null);
$organizations = $this->loader->getCurrentUser()->getRespondentOrganizations();
$types = $this->export->getExportClasses();
@@ -158,7 +158,7 @@
//Add a field to the form showing the record count. If this is too slow for large recordsets
//then remove it or make it more efficient
unset($data['records']);
- if (isset($data['sid'])) {
+ if (!empty($data['sid'])) {
$survey = $this->loader->getTracker()->getSurvey(intval($data['sid']));
$filter = $this->_getFilter($data);
//$answers = $survey->getRawTokenAnswerRows($filter);
Modified: trunk/library/classes/Gems/Snippets/Tracker/Compliance/ComplianceTableSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/Tracker/Compliance/ComplianceTableSnippet.php 2013-04-10 10:02:57 UTC (rev 1219)
+++ trunk/library/classes/Gems/Snippets/Tracker/Compliance/ComplianceTableSnippet.php 2013-04-10 10:08:36 UTC (rev 1220)
@@ -110,7 +110,6 @@
$cDesc = null;
}
}
- $cIcon = $model->get($name, 'roundIcon');
$class = 'newRound';
$thClass = $class .' ' . $alternateClass; // Add alternate class only for th
$th = $th_row->td(array('class' => $thClass));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|