Dev: Export filtered participants (CPDB, WIP)

LimeSurvey · Dec 2, 2016 · fe45034 · fe45034
1 parent ab8c603
commit fe45034
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/application/controllers/admin/participantsaction.php b/application/controllers/admin/participantsaction.php
@@ -160,9 +160,9 @@ public function editValueParticipantPanel()
     /**
      * Export to csv using optional search/filter
      *
-     * @todo Return value never checked?
-     * @param type $search  CDCriteria?
-     * @paran mixed $mAttributeIDs Empty array for no attributes, or array of attribute IDs or null for all attributes
+     * 
+     * @param CDCriteria $search
+     * @paran mixed $aAttributeIDs Empty array for no attributes, or array of attribute IDs or null for all attributes
      * @return boolean
      */
     private function csvExport($search = null, $aAttributeIDs = null)
@@ -1117,8 +1117,16 @@ public function exporttocsv()
             $search = $searchSelected;
         }
 
+        if ($filteredOrSelected == 'filtered') {
+            $p = new Participant();
+            $p->setAttributes(Yii::app()->request->getPost('Participant'));
+            $dataProvider = $p->search();
+            $dataProvider->setPagination(false);
+            $search = $dataProvider->getCriteria();
+        }
+
         $aAttributes=explode('+',Yii::app()->request->getPost('attributes',''));
-        $this->csvExport($search,$aAttributes);
+        $this->csvExport($search, $aAttributes);
     }
 
     /**

diff --git a/application/models/Participant.php b/application/models/Participant.php
@@ -740,6 +740,7 @@ public function getParticipantsCount($attid, $search = null, $userid = null) {
     }
 
     /**
+     * @param boolean $count
      * @param integer $page
      * @param integer $limit
      * @return CDbCommand