gemstracker-svn

[Gemstracker-svn] SF.net SVN: gemstracker:[1128] tags/1.5.7

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

Revision: 1128
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1128&view=rev
Author:   mennodekker
Date:     2013-01-30 12:23:04 +0000 (Wed, 30 Jan 2013)
Log Message:
-----------
Don't rely on request for org_id filtering + css changes from trunk

Modified Paths:
--------------
    tags/1.5.7/library/classes/Gems/Export/RespondentExport.php
    tags/1.5.7/new_project/htdocs/gems/css/gems-fluid.css
    tags/1.5.7/new_project/htdocs/gems/css/gems-new.css

Modified: tags/1.5.7/library/classes/Gems/Export/RespondentExport.php
===================================================================
--- tags/1.5.7/library/classes/Gems/Export/RespondentExport.php	2013-01-30 12:22:38 UTC (rev 1127)
+++ tags/1.5.7/library/classes/Gems/Export/RespondentExport.php	2013-01-30 12:23:04 UTC (rev 1128)
@@ -52,6 +52,12 @@
      * @var GemsEscort
      */
     public $escort;
+    
+    /**
+     *
+     * @var Zend_Db_Adapter_Abstract
+     */
+    protected $db;
 
     protected $html;
 
@@ -282,9 +288,21 @@
     protected function _exportRespondent($respondentId)
     {
         $respondentModel = $this->loader->getModels()->getRespondentModel(false);
+        
         //Insert orgId when set
-        $respondentModel->applyRequest(Zend_Controller_Front::getInstance()->getRequest());
-        $respondentModel->addFilter(array('gr2o_patient_nr' => $respondentId));
+        if (is_array($respondentId) && isset($respondentId['gr2o_id_organization'])) {
+            $filter['gr2o_id_organization'] = $respondentId['gr2o_id_organization'];
+            $respondentId = $respondentId['gr2o_patient_nr'];
+        } else {
+            // Or accept to find in current organization
+            $filter['gr2o_id_organization'] = $this->loader->getCurrentUser()->getCurrentOrganizationId();
+            // Or use any organization?
+            // $allowedOrgs = $this->loader->getCurrentUser()->getAllowedOrganizations();
+            // $filter[] = sprintf('%s IN(%s)', $this->db->quoteIdentifier('gto_id_organization'), array_keys($allowedOrgs));
+        }
+        $filter['gr2o_patient_nr'] = $respondentId;
+
+        $respondentModel->setFilter($filter);
         $respondentData = $respondentModel->loadFirst();
 
         $this->html->snippet($this->_respondentSnippet,

Modified: tags/1.5.7/new_project/htdocs/gems/css/gems-fluid.css
===================================================================
--- tags/1.5.7/new_project/htdocs/gems/css/gems-fluid.css	2013-01-30 12:22:38 UTC (rev 1127)
+++ tags/1.5.7/new_project/htdocs/gems/css/gems-fluid.css	2013-01-30 12:23:04 UTC (rev 1128)
@@ -688,3 +688,7 @@
 .zend_echo {
     font-weight: normal;
 }
+
+#autofilter_target { clear: both;}
+.tabrow { clear: both; }
+.tabrow .tab { width: auto;}
\ No newline at end of file

Modified: tags/1.5.7/new_project/htdocs/gems/css/gems-new.css
===================================================================
--- tags/1.5.7/new_project/htdocs/gems/css/gems-new.css	2013-01-30 12:22:38 UTC (rev 1127)
+++ tags/1.5.7/new_project/htdocs/gems/css/gems-new.css	2013-01-30 12:23:04 UTC (rev 1128)
@@ -717,3 +717,6 @@
     font-weight: normal;
 }
 
+#autofilter_target { clear: both;}
+.tabrow { clear: both; }
+.tabrow .tab { width: auto;}
\ No newline at end of file

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

[Gemstracker-svn] SF.net SVN: gemstracker:[1131] tags/1.5.7

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

Revision: 1131
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1131&view=rev
Author:   mennodekker
Date:     2013-01-31 15:15:45 +0000 (Thu, 31 Jan 2013)
Log Message:
-----------
Merged revision(s) 1130 from trunk:
And another typo in spss export

Modified Paths:
--------------
    tags/1.5.7/library/classes/Gems/Export/Spss.php

Property Changed:
----------------
    tags/1.5.7/
    tags/1.5.7/library/


Property changes on: tags/1.5.7
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.5.0-pulse:306-430,467
/branches/1.5.x:426-455,458-472,475-481
/tags/1.5.0beta1:305
/tags/1.5.1:485,489,509-510
/tags/1.5.3-rc2:612,614,616,618
   + /branches/1.5.0-pulse:306-430,467
/branches/1.5.x:426-455,458-472,475-481
/tags/1.5.0beta1:305
/tags/1.5.1:485,489,509-510
/tags/1.5.3-rc2:612,614,616,618
/trunk:1130


Property changes on: tags/1.5.7/library
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.5.0-pulse/library:306-344,346,467
/branches/1.5.x/library:426-455,458-472,475-481
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
/tags/1.5.1/library:485,489,509-510,534
/tags/1.5.3-rc2/library:612,614,616,618
/tags/1.5.6-pulse20121012/library:986
   + /branches/1.5.0-pulse/library:306-344,346,467
/branches/1.5.x/library:426-455,458-472,475-481
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
/tags/1.5.1/library:485,489,509-510,534
/tags/1.5.3-rc2/library:612,614,616,618
/tags/1.5.6-pulse20121012/library:986
/trunk/library:1130

Modified: tags/1.5.7/library/classes/Gems/Export/Spss.php
===================================================================
--- tags/1.5.7/library/classes/Gems/Export/Spss.php	2013-01-31 15:05:05 UTC (rev 1130)
+++ tags/1.5.7/library/classes/Gems/Export/Spss.php	2013-01-31 15:15:45 UTC (rev 1131)
@@ -152,7 +152,7 @@
      * @param MUtil_Model_ModelAbstract $answerModel The modified answermodel that includes info about extra attributes
      * @param string                    $language    The language used / to use for the export
      */
-    public function handeExportData($data, $survey, $answers, $answerModel, $language)
+    public function handleExportData($data, $survey, $answers, $answerModel, $language)
     {
         $filename = $survey->getName() . '.dat';
         $response = $this->_doHeaders($filename);

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