[Gemstracker-svn] SF.net SVN: gemstracker:[1212] trunk/library

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

Revision: 1212
          http://sourceforge.net/p/gemstracker/code/1212
Author:   matijsdejong
Date:     2013-04-04 09:41:13 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
Confirmed _initOpenRosa to coding standards
Added Agenda field to surveys

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php
    trunk/library/classes/GemsEscort.php
    trunk/library/configs/db/patches.sql
    trunk/library/configs/db/tables/gems__surveys.30.sql

Modified: trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php
===================================================================
--- trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php	2013-04-03 12:52:59 UTC (rev 1211)
+++ trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php	2013-04-04 09:41:13 UTC (rev 1212)
@@ -100,7 +100,10 @@
 
         $survey       = $this->loader->getTracker()->getSurvey($currentId);
         $standAlone   = $this->escort instanceof Gems_Project_Tracks_StandAloneSurveysInterface;
-        $surveyFields = $this->util->getTranslated()->getEmptyDropdownArray() + $survey->getQuestionList($this->locale->getLanguage());
+        $surveyFields = $this->util->getTranslated()->getEmptyDropdownArray() +
+                $survey->getQuestionList($this->locale->getLanguage());
+        $dateFields   = $this->util->getTranslated()->getEmptyDropdownArray() +
+                $survey->getDatesList($this->locale->getLanguage());
         $surveyNotOK  = $data['gsu_surveyor_active'] ? null : 'disabled';
 
         // Forced data changes
@@ -128,6 +131,7 @@
 
         $bridge->addSelect(     'gsu_id_primary_group',      'description', $this->_('If empty, survey will never show up!'));
         $bridge->addSelect(     'gsu_result_field',          'multiOptions', $surveyFields);
+        $bridge->addSelect(     'gsu_agenda_result',         'multiOptions', $dateFields);
         $bridge->addText(       'gsu_duration');
         $bridge->addExhibitor(  'calc_duration', 'label', $this->_('Duration calculated'), 'value', $this->calculateDuration(isset($data['gsu_id_survey']) ? $data['gsu_id_survey'] : null));
         $bridge->addText(       'gsu_code');

Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php	2013-04-03 12:52:59 UTC (rev 1211)
+++ trunk/library/classes/GemsEscort.php	2013-04-04 09:41:13 UTC (rev 1212)
@@ -433,10 +433,8 @@
 
     /**
      * Initialize the OpenRosa survey source
-     *
-     * @param Zend_Controller_Action $actionController
      */
-    public function _initOpenRosa(Zend_Controller_Action $actionController = null)
+    protected function _initOpenRosa()
     {
         if ($this->getOption('useOpenRosa')) {
             // First handle dependencies

Modified: trunk/library/configs/db/patches.sql
===================================================================
--- trunk/library/configs/db/patches.sql	2013-04-03 12:52:59 UTC (rev 1211)
+++ trunk/library/configs/db/patches.sql	2013-04-04 09:41:13 UTC (rev 1212)
@@ -483,3 +483,7 @@
 -- PATCH: Longer SSN hashes
 ALTER TABLE gems__respondents CHANGE grs_ssn
       grs_ssn varchar(128) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci';
+
+-- GEMS VERSION: 52
+-- PATCH: Agenda items
+ALTER TABLE gems__surveys ADD gsu_agenda_result varchar(20) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' AFTER gsu_result_field;

Modified: trunk/library/configs/db/tables/gems__surveys.30.sql
===================================================================
--- trunk/library/configs/db/tables/gems__surveys.30.sql	2013-04-03 12:52:59 UTC (rev 1211)
+++ trunk/library/configs/db/tables/gems__surveys.30.sql	2013-04-04 09:41:13 UTC (rev 1212)
@@ -36,6 +36,7 @@
         -- end depreciated
 
         gsu_result_field   varchar(20) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
+        gsu_agenda_result  varchar(20) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
         gsu_duration       varchar(50) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
 
         gsu_code           varchar(64) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,

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