From: <gem...@li...> - 2011-09-15 10:58:14
|
Revision: 17 http://gemstracker.svn.sourceforge.net/gemstracker/?rev=17&view=rev Author: matijsdejong Date: 2011-09-15 10:58:07 +0000 (Thu, 15 Sep 2011) Log Message: ----------- - fixed SingleTrack bug where the more than one track is in the project Modified Paths: -------------- trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php Modified: trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php =================================================================== --- trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php 2011-09-15 10:47:16 UTC (rev 16) +++ trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php 2011-09-15 10:58:07 UTC (rev 17) @@ -391,12 +391,12 @@ public function getTrackCount($currentId) { - $singleTrack = $this->escort instanceof Gems_Project_Tracks_SingleTrackInterface; + $singleTrack = ($this->escort instanceof Gems_Project_Tracks_SingleTrackInterface) ? $this->escort->getTrackId() : null; $select = new Zend_Db_Select($this->db); $select->from('gems__rounds', array('useCnt' => 'COUNT(*)', 'trackCnt' => 'COUNT(DISTINCT gro_id_track)')); if ($singleTrack) { - $select->where("gro_id_track = ?", $this->escort->getTrackId()); + $select->where("gro_id_track = ?", $singleTrack); } else { $select->joinLeft('gems__tracks', 'gtr_id_track = gro_id_track', array()) ->group('gems__tracks.gtr_id_track') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gem...@li...> - 2011-09-20 14:55:36
|
Revision: 50 http://gemstracker.svn.sourceforge.net/gemstracker/?rev=50&view=rev Author: mennodekker Date: 2011-09-20 14:55:25 +0000 (Tue, 20 Sep 2011) Log Message: ----------- Fixing pdf upload / display? Modified Paths: -------------- trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php Modified: trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php =================================================================== --- trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php 2011-09-20 13:47:14 UTC (rev 49) +++ trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php 2011-09-20 14:55:25 UTC (rev 50) @@ -93,7 +93,8 @@ */ protected function addFormElements(MUtil_Model_FormBridge $bridge, MUtil_Model_ModelAbstract $model, array $data, $new = false) { - // MUtil_Echo::r($data, __CLASS__ . '->' . __FUNCTION__); + //MUtil_Echo::r($data, __CLASS__ . '->' . __FUNCTION__); + $data = array_merge($model->loadFirst(), $data); // Prepare variables $currentId = $data['gsu_id_survey']; @@ -436,8 +437,11 @@ public function setMenuParameter($data) { + $source = $this->menu->getParameterSource(); + $source->offsetSet('gsu_has_pdf', $data['gsu_survey_pdf'] ? 1 : 0); + $source->offsetSet(MUtil_Model::REQUEST_ID, $data['gsu_id_survey']); + $this->data['gsu_has_pdf'] = $data['gsu_survey_pdf'] ? 1 : 0; $this->data[MUtil_Model::REQUEST_ID] = $data['gsu_id_survey']; - $this->data['gsu_has_pdf'] = $data['gsu_survey_pdf'] ? 1 : 0; return $this; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gem...@li...> - 2012-07-13 09:51:13
|
Revision: 838 http://gemstracker.svn.sourceforge.net/gemstracker/?rev=838&view=rev Author: michieltcs Date: 2012-07-13 09:51:02 +0000 (Fri, 13 Jul 2012) Log Message: ----------- Add missing gsu_code form element Modified Paths: -------------- trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php Modified: trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php =================================================================== --- trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php 2012-07-13 09:43:23 UTC (rev 837) +++ trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php 2012-07-13 09:51:02 UTC (rev 838) @@ -123,6 +123,7 @@ $bridge->addSelect( 'gsu_id_primary_group', 'description', $this->_('If empty, survey will never show up!')); $bridge->addSelect( 'gsu_result_field', 'multiOptions', $surveyFields); $bridge->addText( 'gsu_duration'); + $bridge->addText( 'gsu_code'); $bridge->addSelect( 'gsu_beforeanswering_event'); $bridge->addSelect( 'gsu_completed_event'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gem...@li...> - 2012-09-27 11:14:31
|
Revision: 964 http://gemstracker.svn.sourceforge.net/gemstracker/?rev=964&view=rev Author: matijsdejong Date: 2012-09-27 11:14:25 +0000 (Thu, 27 Sep 2012) Log Message: ----------- Fix where standalone surveys where saved with the gtr_track_type "'" instead of "S". Modified Paths: -------------- trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php Modified: trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php =================================================================== --- trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php 2012-09-27 08:41:00 UTC (rev 963) +++ trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php 2012-09-27 11:14:25 UTC (rev 964) @@ -192,10 +192,11 @@ // These fields are needed only when the stand alone survey is being created. $bridge->addHiddenMulti('gro_id_order', 'gro_id_track', 'gro_id_survey', 'gro_survey_name', 'gro_round_description', - 'gtr_track_name', 'gtr_survey_rounds', 'gtr_track_type'); + 'gtr_track_name', 'gtr_survey_rounds'); } $bridge->addHidden('create_stand_alone'); + $bridge->addHidden('gtr_track_type'); // Always store, otherwise join expression is used as value. :( $bridge->addText( 'gtr_track_info', 'label', $this->_('Description')); $bridge->addDate( 'gtr_date_start', 'label', $this->_('Assignable since')); $bridge->addDate( 'gtr_date_until', 'label', $this->_('Assignable until')); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |