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

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

Revision: 825
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=825&view=rev
Author:   michieltcs
Date:     2012-07-09 12:26:37 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
Refactor (most of) the export form to RespondentExport

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/RespondentAction.php
    trunk/library/classes/Gems/Default/RespondentExportAction.php
    trunk/library/classes/Gems/Export/RespondentExport.php

Modified: trunk/library/classes/Gems/Default/RespondentAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RespondentAction.php	2012-07-09 08:10:13 UTC (rev 824)
+++ trunk/library/classes/Gems/Default/RespondentAction.php	2012-07-09 12:26:37 UTC (rev 825)
@@ -62,40 +62,6 @@
     public $useTabbedForms = true;
 
     /**
-     * Constructs the form
-     *
-     * @param Gems_Export_RespondentExport $export
-     * @return Gems_Form_TableForm
-     */
-    protected function _getExportForm($export)
-    {
-        $form = new Gems_Form_TableForm();
-        $form->setAttrib('target', '_blank');
-
-        $element = new Zend_Form_Element_Checkbox('group');
-        $element->setLabel($this->_('Group surveys'));
-        $element->setValue(1);
-        $form->addElement($element);
-
-        $element = new Zend_Form_Element_Select('format');
-        $element->setLabel($this->_('Output format'));
-        $outputFormats = array('html' => 'HTML');
-        if (!empty($export->_wkhtmltopdfLocation)) {
-            $outputFormats['pdf'] = 'PDF';
-            $element->setValue('pdf');
-        }
-        $element->setMultiOptions($outputFormats);
-        $form->addElement($element);
-
-        $element = new Zend_Form_Element_Submit('export');
-        $element->setLabel($this->_('Export'))
-                ->setAttrib('class', 'button');
-        $form->addElement($element);
-
-        return $form;
-    }
-
-    /**
      * Adds columns from the model to the bridge that creates the browse table.
      *
      * Adds a button column to the model, if such a button exists in the model.
@@ -530,7 +496,7 @@
 
         //Now show the export form
         $export = $this->loader->getRespondentExport($this);
-        $form = $this->_getExportForm($export);
+        $form = $export->getForm();
         $this->html->h2($this->_('Export respondent'));
         $div = $this->html->div(array('id' => 'mainform'));
         $div[] = $form;

Modified: trunk/library/classes/Gems/Default/RespondentExportAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RespondentExportAction.php	2012-07-09 08:10:13 UTC (rev 824)
+++ trunk/library/classes/Gems/Default/RespondentExportAction.php	2012-07-09 12:26:37 UTC (rev 825)
@@ -46,55 +46,17 @@
 {
     public $useHtmlView = true; 
 
-    /**
-     * Constructs the form 
-     * 
-     * @param Gems_Export_RespondentExport $export
-     * @return Gems_Form_TableForm
-     */    
-    protected function _getForm($export)
+    public function indexAction()
     {
-        $form = new Gems_Form_TableForm();
-        $form->setAttrib('target', '_blank');
+        $export = $this->loader->getRespondentExport($this);
         
         $element = new Zend_Form_Element_Text('id');
         $element->setLabel($this->_('Respondent number'));
-        
-        // only show description if we got here directly (id is empty)
-        if ($this->getRequest()->getParam('id') == '') {
-            $element->setDescription($this->_('Separate multiple respondents with a comma (,)'));
-        }
-        
+        $element->setOrder(-1);
+        $element->setDescription($this->_('Separate multiple respondents with a comma (,)'));
+        $form = $export->getForm();
         $form->addElement($element);
         
-        $element = new Zend_Form_Element_Checkbox('group');
-        $element->setLabel($this->_('Group surveys'));
-        $element->setValue(1);
-        $form->addElement($element);
-        
-        $element = new Zend_Form_Element_Select('format');
-        $element->setLabel($this->_('Output format'));
-        $outputFormats = array('html' => 'HTML');
-        if (!empty($export->_wkhtmltopdfLocation)) {
-            $outputFormats['pdf'] = 'PDF';
-            $element->setValue('pdf');
-        }
-        $element->setMultiOptions($outputFormats);
-        $form->addElement($element);
-        
-        $element = new Zend_Form_Element_Submit('export');
-        $element->setLabel($this->_('Export'))
-                ->setAttrib('class', 'button');
-        $form->addElement($element);
-        
-        return $form;
-    }
-    
-    public function indexAction()
-    {
-        $export = $this->loader->getRespondentExport($this);
-        
-        $form = $this->_getForm($export);
         $this->html->h2($this->_('Export respondent'));
         $div = $this->html->div(array('id' => 'mainform'));
         $div[] = $form;

Modified: trunk/library/classes/Gems/Export/RespondentExport.php
===================================================================
--- trunk/library/classes/Gems/Export/RespondentExport.php	2012-07-09 08:10:13 UTC (rev 824)
+++ trunk/library/classes/Gems/Export/RespondentExport.php	2012-07-09 12:26:37 UTC (rev 825)
@@ -307,7 +307,40 @@
             $this->_exportTrack($track);
         }
     }
+    
+    /**
+     * Constructs the form
+     *
+     * @return Gems_Form_TableForm
+     */
+    public function getForm()
+    {
+        $form = new Gems_Form_TableForm();
+        $form->setAttrib('target', '_blank');
 
+        $element = new Zend_Form_Element_Checkbox('group');
+        $element->setLabel($this->_('Group surveys'));
+        $element->setValue(1);
+        $form->addElement($element);
+
+        $element = new Zend_Form_Element_Select('format');
+        $element->setLabel($this->_('Output format'));
+        $outputFormats = array('html' => 'HTML');
+        if (!empty($this->_wkhtmltopdfLocation)) {
+            $outputFormats['pdf'] = 'PDF';
+            $element->setValue('pdf');
+        }
+        $element->setMultiOptions($outputFormats);
+        $form->addElement($element);
+
+        $element = new Zend_Form_Element_Submit('export');
+        $element->setLabel($this->_('Export'))
+                ->setAttrib('class', 'button');
+        $form->addElement($element);
+
+        return $form;
+    }
+
     /**
      * Renders the entire report (including layout)
      *

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