Menu
▾
▴
gemstracker-svn — Receive updates on svn commits
You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(84) |
Oct
(70) |
Nov
(164) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(52) |
Feb
(77) |
Mar
(70) |
Apr
(58) |
May
(81) |
Jun
(74) |
Jul
(87) |
Aug
(30) |
Sep
(45) |
Oct
(37) |
Nov
(51) |
Dec
(31) |
| 2013 |
Jan
(47) |
Feb
(29) |
Mar
(40) |
Apr
(33) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <gem...@li...> - 2012-07-02 14:49:12
|
Revision: 806
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=806&view=rev
Author: matijsdejong
Date: 2012-07-02 14:49:06 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
Fix for default tabs
Modified Paths:
--------------
trunk/library/classes/MUtil/Snippets/TabSnippetAbstract.php
Modified: trunk/library/classes/MUtil/Snippets/TabSnippetAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Snippets/TabSnippetAbstract.php 2012-07-02 14:37:45 UTC (rev 805)
+++ trunk/library/classes/MUtil/Snippets/TabSnippetAbstract.php 2012-07-02 14:49:06 UTC (rev 806)
@@ -126,8 +126,12 @@
{
$paramKey = $this->getParameterKey();
- if ($paramKey && ($tabId != $this->defaultTab)) {
- return array($paramKey => $tabId);
+ if ($paramKey) {
+ if ($tabId == $this->defaultTab) {
+ return array($paramKey => null);
+ } else {
+ return array($paramKey => $tabId);
+ }
}
return array();
@@ -164,7 +168,12 @@
$this->defaultTab = key($tabs);
}
if (null === $this->currentTab) {
- $this->currentTab = $this->request->getParam($this->getParameterKey(), $this->defaultTab);
+ $this->currentTab = $this->request->getParam($this->getParameterKey());
+
+ // Param can exist and be empty
+ if (! $this->currentTab) {
+ $this->currentTab = $this->defaultTab;
+ }
}
$tabRow = MUtil_Html::create()->div();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-02 14:37:51
|
Revision: 805
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=805&view=rev
Author: mennodekker
Date: 2012-07-02 14:37:45 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
Allow for better styling and preserve custom classname when setting alternating rows
Modified Paths:
--------------
trunk/library/classes/Gems/Form/TableForm.php
Modified: trunk/library/classes/Gems/Form/TableForm.php
===================================================================
--- trunk/library/classes/Gems/Form/TableForm.php 2012-07-02 08:54:34 UTC (rev 804)
+++ trunk/library/classes/Gems/Form/TableForm.php 2012-07-02 14:37:45 UTC (rev 805)
@@ -178,7 +178,7 @@
'Tooltip',
array('Label', array('escape'=>false)),
array(array('labelCell' => 'HtmlTag'), array('tag' => 'td', 'class'=>'label', 'colspan'=>2)),
- array(array('row' => 'HtmlTag'), array('tag' => 'tr', 'class' => $element->getName()))
+ array(array('row' => 'HtmlTag'), array('tag' => 'tr', 'class' => $element->getAttrib('class') . ' ' . $element->getName()))
);
} elseif ($element instanceof Zend_Form_Element_Hidden ||
$element instanceof Zend_Form_Element_Submit) {
@@ -247,7 +247,7 @@
if ($element instanceof Zend_Form_Element_Hidden) {
$decorator->setOption('style', 'display:none;');
} else {
- $decorator->setOption('class', $this->_alternate . ' ' . $name);
+ $decorator->setOption('class', $this->_alternate . ' ' . $decorator->getOption('class'));
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-02 08:54:40
|
Revision: 804
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=804&view=rev
Author: mennodekker
Date: 2012-07-02 08:54:34 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/library/classes/Gems/Form/TableForm.php
Modified: trunk/library/classes/Gems/Form/TableForm.php
===================================================================
--- trunk/library/classes/Gems/Form/TableForm.php 2012-07-02 08:51:54 UTC (rev 803)
+++ trunk/library/classes/Gems/Form/TableForm.php 2012-07-02 08:54:34 UTC (rev 804)
@@ -75,7 +75,7 @@
}
if (!isset($dec) || $dec == false) {
- return 'ViewHelper';
+ $dec = $element->getDecorator('ViewHelper');
}
return $dec;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-02 08:52:01
|
Revision: 803
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=803&view=rev
Author: mennodekker
Date: 2012-07-02 08:51:54 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
All forms should work again now
Modified Paths:
--------------
trunk/library/classes/Gems/Form/TableForm.php
Modified: trunk/library/classes/Gems/Form/TableForm.php
===================================================================
--- trunk/library/classes/Gems/Form/TableForm.php 2012-06-29 12:52:01 UTC (rev 802)
+++ trunk/library/classes/Gems/Form/TableForm.php 2012-07-02 08:51:54 UTC (rev 803)
@@ -74,9 +74,11 @@
$dec = $element->getDecorator('File');
}
- if (!isset($dec) || $dec == null) {
+ if (!isset($dec) || $dec == false) {
return 'ViewHelper';
}
+
+ return $dec;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-29 12:52:12
|
Revision: 802
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=802&view=rev
Author: mennodekker
Date: 2012-06-29 12:52:01 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Update to data export: source needs to be active, gems survey status and source survey status are interpreted by a helper method to allow other sources to have their own logic.
Fixed a notice in survey when adding a new survey and tracker::verbose
Modified Paths:
--------------
trunk/library/classes/Gems/Default/ExportAction.php
trunk/library/classes/Gems/Tracker/Survey.php
trunk/library/classes/Gems/Util/DbLookup.php
Modified: trunk/library/classes/Gems/Default/ExportAction.php
===================================================================
--- trunk/library/classes/Gems/Default/ExportAction.php 2012-06-29 10:14:01 UTC (rev 801)
+++ trunk/library/classes/Gems/Default/ExportAction.php 2012-06-29 12:52:01 UTC (rev 802)
@@ -140,8 +140,7 @@
*/
public function getForm(&$data)
{
- //Read some data from tables, initialize defaults...
- $surveys = $this->db->fetchPairs('SELECT gsu_id_survey, gsu_survey_name FROM gems__surveys WHERE gsu_active = 1 ORDER BY gsu_survey_name');
+ $surveys = $this->loader->getUtil()->getDbLookup()->getSurveysForExport();
$organizations = $this->loader->getCurrentUser()->getAllowedOrganizations();
$types = $this->export->getExportClasses();
@@ -151,7 +150,7 @@
//Start adding elements
$element = new Zend_Form_Element_Select('sid');
$element->setLabel($this->_('Survey'))
- ->setMultiOptions($surveys);
+ ->setMultiOptions($surveys);
$elements[] = $element;
//Add a field to the form showing the record count. If this is too slow for large recordsets
Modified: trunk/library/classes/Gems/Tracker/Survey.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Survey.php 2012-06-29 10:14:01 UTC (rev 801)
+++ trunk/library/classes/Gems/Tracker/Survey.php 2012-06-29 12:52:01 UTC (rev 802)
@@ -137,7 +137,8 @@
if (Gems_Tracker::$verbose) {
$echo = '';
foreach ($values as $key => $val) {
- $echo .= $key . ': ' . $this->_gemsSurvey[$key] . ' => ' . $val . "\n";
+ $old = isset($this->_gemsSurvey[$key]) ? $this->_gemsSurvey[$key] : null;
+ $echo .= $key . ': ' . $old . ' => ' . $val . "\n";
}
MUtil_Echo::r($echo, 'Updated values for ' . $this->_surveyId);
}
Modified: trunk/library/classes/Gems/Util/DbLookup.php
===================================================================
--- trunk/library/classes/Gems/Util/DbLookup.php 2012-06-29 10:14:01 UTC (rev 801)
+++ trunk/library/classes/Gems/Util/DbLookup.php 2012-06-29 12:52:01 UTC (rev 802)
@@ -342,6 +342,55 @@
return $groups;
}
+ /**
+ * Get all surveys that can be exported
+ *
+ * For export not only active surveys should be returned, but all surveys that can be exported.
+ * As this depends on the kind of source used it is in this method so projects can change to
+ * adapt to their own sources.
+ *
+ * @return array
+ */
+ public function getSurveysForExport()
+ {
+ // Read some data from tables, initialize defaults...
+ $select = $this->db->select();
+
+ // Fetch al surveys
+ $select->from('gems__surveys')
+ ->join('gems__sources', 'gsu_id_source = gso_id_source')
+ ->where('gso_active = 1')
+ ->order(array('gsu_active DESC', 'gsu_survey_name'));
+ $result = $this->db->fetchAll($select);
+
+ if ($result) {
+ // And transform to have inactive surveys in gems and source in a
+ // different group at the bottom
+ $surveys = array();
+ $Inactive = $this->translate->_('inactive');
+ $sourceInactive = $this->translate->_('source inactive');
+ foreach ($result as $survey) {
+ $id = $survey['gsu_id_survey'];
+ $name = $survey['gsu_survey_name'];
+ if ($survey['gsu_surveyor_active'] == 0) {
+ // Inactive in the source, for LimeSurvey this is a problem!
+ if (!strpos($survey['gso_ls_class'], 'LimeSurvey')) {
+ $surveys[$sourceInactive][$id] = $name;
+ }
+ } elseif ($survey['gsu_active'] == 0) {
+ // Inactive in GemsTracker
+ $surveys[$Inactive][$id] = $name;
+ } else {
+ $surveys[$id] = $name;
+ }
+ }
+ } else {
+ $surveys = array();
+ }
+
+ return $surveys;
+ }
+
public function getUserConsents()
{
static $consents;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-29 10:14:12
|
Revision: 801
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=801&view=rev
Author: matijsdejong
Date: 2012-06-29 10:14:01 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Fix for cron action halting on error error
Modified Paths:
--------------
tags/1.5.4-pulse-20120604/library/classes/Gems/Default/CronAction.php
tags/1.5.4-pulse-20120604/library/classes/Gems/Email/TemplateMailer.php
Modified: tags/1.5.4-pulse-20120604/library/classes/Gems/Default/CronAction.php
===================================================================
--- tags/1.5.4-pulse-20120604/library/classes/Gems/Default/CronAction.php 2012-06-29 09:17:25 UTC (rev 800)
+++ tags/1.5.4-pulse-20120604/library/classes/Gems/Default/CronAction.php 2012-06-29 10:14:01 UTC (rev 801)
@@ -162,6 +162,7 @@
$model = $this->loader->getTracker()->getTokenModel();
$mailer = new Gems_Email_TemplateMailer($this->escort);
+ $mailer->continueOnError = true;
// $mailer->setDefaultTransport(new MUtil_Mail_Transport_EchoLog());
Modified: tags/1.5.4-pulse-20120604/library/classes/Gems/Email/TemplateMailer.php
===================================================================
--- tags/1.5.4-pulse-20120604/library/classes/Gems/Email/TemplateMailer.php 2012-06-29 09:17:25 UTC (rev 800)
+++ tags/1.5.4-pulse-20120604/library/classes/Gems/Email/TemplateMailer.php 2012-06-29 10:14:01 UTC (rev 801)
@@ -49,7 +49,14 @@
const MAIL_TLS = 2;
/**
+ * Should the mailer continue sending mails, even when it encounters errors?
*
+ * @var boolean
+ */
+ public $continueOnError = false;
+
+ /**
+ *
* @var Zend_Mail_Transport
*/
protected $defaultTransport = null;
@@ -59,6 +66,11 @@
*/
protected $escort;
+ /**
+ * Feedback messages for this action.
+ *
+ * @var array of string
+ */
protected $messages = array();
private $_changeDate;
@@ -238,6 +250,7 @@
$send = array();
$scount = 0;
$ucount = 0;
+ $result = true;
foreach ($tokensData as $tokenData) {
// Should this token be mailed?
@@ -249,11 +262,15 @@
if ($message = $this->processMail($tokenData)) {
$this->addMessage($this->escort->_('Mail failed to send.'));
$this->addMessage($message);
- return false;
+ $result = true;
+ if (! $this->continueOnError) {
+ break;
+ }
+ } else {
+ $send[$tokenData['grs_email']] = true;
+ $scount++;
+ $ucount++;
}
- $send[$tokenData['grs_email']] = true;
- $scount++;
- $ucount++;
} elseif ($updateAll) {
$this->updateToken($tokenData);
@@ -266,7 +283,7 @@
$this->addMessage(sprintf($this->escort->_('Sent %d e-mails, updated %d tokens.'), $scount, $ucount));
}
- return true;
+ return $result;
}
/**
@@ -335,12 +352,12 @@
MUtil_Echo::r($to, $to_name);
MUtil_Echo::r($from, $from_name);
}
-
+
if (!$this->bounceCheck()) {
$validate = new Zend_Validate_EmailAddress();
-
+
if (!$validate->isValid($to)) {
- return "Invalid e-mail address {$to}";
+ return sprintf($this->escort->_("Invalid e-mail address '%s'."), $to);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-29 09:17:31
|
Revision: 800
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=800&view=rev
Author: mennodekker
Date: 2012-06-29 09:17:25 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Add a default organization when initialising the db to prevent errors
Modified Paths:
--------------
trunk/library/configs/db/tables/gems__organizations.20.sql
Modified: trunk/library/configs/db/tables/gems__organizations.20.sql
===================================================================
--- trunk/library/configs/db/tables/gems__organizations.20.sql 2012-06-29 08:34:24 UTC (rev 799)
+++ trunk/library/configs/db/tables/gems__organizations.20.sql 2012-06-29 09:17:25 UTC (rev 800)
@@ -1,4 +1,3 @@
-
CREATE TABLE if not exists gems__organizations (
gor_id_organization bigint unsigned not null auto_increment,
@@ -40,3 +39,6 @@
ENGINE=InnoDB
AUTO_INCREMENT = 70
CHARACTER SET 'utf8' COLLATE 'utf8_general_ci';
+
+INSERT INTO `gems__organizations` (`gor_id_organization`, `gor_name`) VALUES
+(70, 'New organization');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-29 08:34:35
|
Revision: 799
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=799&view=rev
Author: mennodekker
Date: 2012-06-29 08:34:24 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Locale has a cache too, and when not set it will use system temp dir
Modified Paths:
--------------
trunk/library/classes/GemsEscort.php
Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php 2012-06-28 15:16:55 UTC (rev 798)
+++ trunk/library/classes/GemsEscort.php 2012-06-29 08:34:24 UTC (rev 799)
@@ -191,6 +191,7 @@
Zend_Db_Table_Abstract::setDefaultMetadataCache($cache);
Zend_Translate::setCache($cache);
+ Zend_Locale::setCache($cache);
return $cache;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-28 15:17:05
|
Revision: 798
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=798&view=rev
Author: matijsdejong
Date: 2012-06-28 15:16:55 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
Small fix
Modified Paths:
--------------
trunk/library/classes/MUtil/Model/DatabaseModelAbstract.php
Modified: trunk/library/classes/MUtil/Model/DatabaseModelAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Model/DatabaseModelAbstract.php 2012-06-28 14:20:55 UTC (rev 797)
+++ trunk/library/classes/MUtil/Model/DatabaseModelAbstract.php 2012-06-28 15:16:55 UTC (rev 798)
@@ -183,7 +183,9 @@
}
}
- $select->order($sqlsort);
+ if (isset($sqlsort)) {
+ $select->order($sqlsort);
+ }
}
if (MUtil_Model::$verbose) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-28 14:21:01
|
Revision: 797
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=797&view=rev
Author: mennodekker
Date: 2012-06-28 14:20:55 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
Not all form elements play by the rules...
Modified Paths:
--------------
trunk/library/classes/Gems/Form/TableForm.php
Modified: trunk/library/classes/Gems/Form/TableForm.php
===================================================================
--- trunk/library/classes/Gems/Form/TableForm.php 2012-06-28 14:17:45 UTC (rev 796)
+++ trunk/library/classes/Gems/Form/TableForm.php 2012-06-28 14:20:55 UTC (rev 797)
@@ -68,13 +68,15 @@
$class = get_class($element);
if (strpos($class, 'JQuery')) {
- return $element->getDecorator('UiWidgetElement');
+ $dec = $element->getDecorator('UiWidgetElement');
}
if (strpos($class, 'File')) {
- return $element->getDecorator('File');
+ $dec = $element->getDecorator('File');
}
- return $element->getDecorator('ViewHelper');
+ if (!isset($dec) || $dec == null) {
+ return 'ViewHelper';
+ }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-28 14:17:55
|
Revision: 796
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=796&view=rev
Author: matijsdejong
Date: 2012-06-28 14:17:45 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
Container menu items are in a class of their own
Allows empty privilege: container only shown when one of the sub items is allowed
Modified Paths:
--------------
trunk/library/classes/Gems/Menu/MenuAbstract.php
trunk/library/classes/Gems/Menu/SubMenuItem.php
trunk/library/classes/Gems/Menu.php
Added Paths:
-----------
trunk/library/classes/Gems/Menu/ContainerItem.php
Added: trunk/library/classes/Gems/Menu/ContainerItem.php
===================================================================
--- trunk/library/classes/Gems/Menu/ContainerItem.php (rev 0)
+++ trunk/library/classes/Gems/Menu/ContainerItem.php 2012-06-28 14:17:45 UTC (rev 796)
@@ -0,0 +1,130 @@
+<?php
+
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * @package Gems
+ * @subpackage Menu
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
+ */
+
+/**
+ * A container item is one that gathers multiple sub menu
+ * items, but does not have it's own controller/action pair
+ * but selects the first sub item instead.
+ *
+ * @package Gems
+ * @subpackage Menu
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.5.5
+ */
+class Gems_Menu_ContainerItem extends Gems_Menu_SubMenuItem
+{
+ /**
+ * Returns a Zend_Navigation creation array for this menu item, with
+ * sub menu items in 'pages'
+ *
+ * @param Gems_Menu_ParameterCollector $source
+ * @return array
+ */
+ protected function _toNavigationArray(Gems_Menu_ParameterCollector $source)
+ {
+ $result = parent::_toNavigationArray($source);
+
+ // Get any missing MVC keys from children, even when invisible
+ if ($requiredIndices = $this->notSet('controller', 'action')) {
+
+ if (isset($result['pages'])) {
+ $firstChild = null;
+ $order = 0;
+ foreach ($result['pages'] as $page) {
+ if ($page['allowed']) {
+ if ($page['order'] < $order || $order == 0) {
+ $firstChild = $page;
+ $order = $page['order'];
+ }
+ }
+ }
+
+ if (null === $firstChild) {
+ // No children are visible and required mvc properties
+ // are missing: ergo this page is not visible.
+ $result['visible'] = false;
+
+ // Use first (invisible) child as firstChild
+ $firstChild = reset($result['pages']);
+ }
+ } else {
+ // Use '/' slash as default to ensure any not visible
+ // menu items points to another existing item that is
+ // active.
+ $firstChild = array_fill_keys($requiredIndices, '/');
+ }
+
+ foreach ($requiredIndices as $key) {
+ $result[$key] = $firstChild[$key];
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * Set the visibility of the menu item and any sub items in accordance
+ * with the specified user role.
+ *
+ * @param Zend_Acl $acl
+ * @param string $userRole
+ * @return Gems_Menu_MenuAbstract (continuation pattern)
+ */
+ protected function applyAcl(Zend_Acl $acl, $userRole)
+ {
+ parent::applyAcl($acl, $userRole);
+
+ if ($this->isVisible()) {
+ $this->set('allowed', false);
+ $this->set('visible', false);
+
+ if ($this->_subItems) {
+ foreach ($this->_subItems as $item) {
+
+ if ($item->get('visible', true)) {
+ $this->set('allowed', true);
+ $this->set('visible', true);
+
+ return $this;
+ }
+ }
+ }
+ }
+ return $this;
+ }
+}
Modified: trunk/library/classes/Gems/Menu/MenuAbstract.php
===================================================================
--- trunk/library/classes/Gems/Menu/MenuAbstract.php 2012-06-28 10:08:16 UTC (rev 795)
+++ trunk/library/classes/Gems/Menu/MenuAbstract.php 2012-06-28 14:17:45 UTC (rev 796)
@@ -92,6 +92,13 @@
}
}
+ /**
+ * Returns a Zend_Navigation creation array for this menu item, with
+ * sub menu items in 'pages'
+ *
+ * @param Gems_Menu_ParameterCollector $source
+ * @return array
+ */
protected function _toNavigationArray(Gems_Menu_ParameterCollector $source)
{
if ($this->_subItems) {
@@ -105,9 +112,9 @@
if (($this instanceof Gems_Menu_SubMenuItem) &&
(! $this->notSet('controller', 'action')) &&
isset($page['params'])) {
+
$params = $page['params'];
- // TODO: ugly! Make beautiful!
- unset($params['reset']);
+ unset($params['reset']); // Ignore this setting
if (count($params)) {
$class = '';
@@ -116,13 +123,6 @@
}
if ((null !== $lastParams) && ($lastParams !== $params)) {
- // $pages[$i++] = array('type' => 'uri');
- /* $l = $i - 1;
- if (isset($pages[$l]['class'])) {
- $pages[$l]['class'] .= ' breakAfter';
- } else {
- $pages[$l]['class'] = 'breakAfter';
- } // */
$class .= 'breakBefore';
} else {
$class = trim($class);
@@ -231,7 +231,24 @@
$other['privilege'] = $privilege;
}
- return $this->add($other);
+ // Process parameters.
+ $defaults = array(
+ 'visible' => (boolean) $label, // All menu containers are initally visible unless stated otherwise or specified without label
+ 'allowed' => true, // Same as with visible, need this for t_oNavigationArray()
+ 'order' => 10 * (count($this->_subItems) + 1),
+ );
+
+ foreach ($defaults as $key => $value) {
+ if (! isset($other[$key])) {
+ $other[$key] = $value;
+ }
+ }
+
+ $page = new Gems_Menu_ContainerItem($this->escort, $this, $other);
+
+ $this->_subItems[] = $page;
+
+ return $page;
}
/**
@@ -355,7 +372,7 @@
// MUtil_Echo::track($infoPage->_toNavigationArray(array($this->escort->request)));
} else {
if ($this->escort instanceof Gems_Project_Tracks_StandAloneSurveysInterface) {
- $infoPage = $this->addContainer($label, 'pr.project');
+ $infoPage = $this->addContainer($label);
$tracksPage = $infoPage->addPage($this->_('Tracks'), 'pr.project', 'project-tracks');
$tracksPage->addAutofilterAction();
@@ -469,7 +486,15 @@
return $setup;
}
- public function applyAcl(Zend_Acl $acl, $userRole)
+ /**
+ * Set the visibility of the menu item and any sub items in accordance
+ * with the specified user role.
+ *
+ * @param Zend_Acl $acl
+ * @param string $userRole
+ * @return Gems_Menu_MenuAbstract (continuation pattern)
+ */
+ protected function applyAcl(Zend_Acl $acl, $userRole)
{
if ($this->_subItems) {
$anyVisible = false;
@@ -498,12 +523,12 @@
}
}
- // Do not show a 'container' menu item (that depends for controller
+ /*/ Do not show a 'container' menu item (that depends for controller
// on it's children) when no sub item is allowed.
if ((! $anyVisible) && $this->notSet('controller', 'action')) {
$this->set('allowed', false);
$this->set('visible', false);
- }
+ } // */
}
return $this;
Modified: trunk/library/classes/Gems/Menu/SubMenuItem.php
===================================================================
--- trunk/library/classes/Gems/Menu/SubMenuItem.php 2012-06-28 10:08:16 UTC (rev 795)
+++ trunk/library/classes/Gems/Menu/SubMenuItem.php 2012-06-28 14:17:45 UTC (rev 796)
@@ -253,6 +253,13 @@
}
}
+ /**
+ * Returns a Zend_Navigation creation array for this menu item, with
+ * sub menu items in 'pages'
+ *
+ * @param Gems_Menu_ParameterCollector $source
+ * @return array
+ */
protected function _toNavigationArray(Gems_Menu_ParameterCollector $source)
{
$result = $this->_itemOptions;
@@ -270,41 +277,6 @@
$result['pages'] = parent::_toNavigationArray($source);
}
- // Get any missing MVC keys from children, even when invisible
- if ($requiredIndices = $this->notSet('controller', 'action')) {
-
- if (isset($result['pages'])) {
- $firstChild = null;
- $order = 0;
- foreach ($result['pages'] as $page) {
- if ($page['allowed']) {
- if ($page['order'] < $order || $order == 0) {
- $firstChild = $page;
- $order = $page['order'];
- }
- }
- }
-
- if (null === $firstChild) {
- // No children are visible and required mvc properties
- // are missing: ergo this page is not visible.
- $result['visible'] = false;
-
- // Use first (invisible) child as firstChild
- $firstChild = reset($result['pages']);
- }
- } else {
- // Use '/' slash as default to ensure any not visible
- // menu items points to another existing item that is
- // active.
- $firstChild = array_fill_keys($requiredIndices, '/');
- }
-
- foreach ($requiredIndices as $key) {
- $result[$key] = $firstChild[$key];
- }
- }
-
return $result;
}
Modified: trunk/library/classes/Gems/Menu.php
===================================================================
--- trunk/library/classes/Gems/Menu.php 2012-06-28 10:08:16 UTC (rev 795)
+++ trunk/library/classes/Gems/Menu.php 2012-06-28 14:17:45 UTC (rev 796)
@@ -89,7 +89,7 @@
$this->loadProjectMenu();
$this->setOnlyActiveBranchVisible();
- $this->applyAcl($escort->acl, $escort->session->user_role);
+ $this->applyAcl($escort->acl, $escort->getLoader()->getCurrentUser()->getRole());
}
private function _findPath($request)
@@ -589,10 +589,10 @@
$this->addMailSetupMenu($this->_('Mail'));
// EXPORT DATA
- $this->addContainer('Export data', 'pr.export', array('controller'=>'export', 'action'=>'index'));
+ $this->addPage('Export data', 'pr.export', 'export', 'index');
// EXPORT TO HTML
- $this->addContainer($this->_('Export respondent'), 'pr.export-html', array('controller' => 'respondent-export', 'action'=>'index'));
+ $this->addPage($this->_('Export respondent'), 'pr.export-html', 'respondent-export', 'index');
// OTHER ITEMS
$this->addLogonOffToken();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-28 10:08:27
|
Revision: 795
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=795&view=rev
Author: matijsdejong
Date: 2012-06-28 10:08:16 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
Updated translations
Modified Paths:
--------------
trunk/library/languages/default-en.mo
trunk/library/languages/default-en.po
trunk/library/languages/default-nl.mo
trunk/library/languages/default-nl.po
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2012-06-28 09:48:38 UTC (rev 794)
+++ trunk/library/languages/default-en.po 2012-06-28 10:08:16 UTC (rev 795)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-27 13:31+0100\n"
+"POT-Creation-Date: 2012-06-28 12:06+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -697,11 +697,11 @@
msgid "Cron jobs turned off."
msgstr "Cron jobs turned off."
-#: classes/Gems/Default/CronAction.php:222
+#: classes/Gems/Default/CronAction.php:223
msgid "No mails sent."
msgstr "No mails sent."
-#: classes/Gems/Default/CronAction.php:225
+#: classes/Gems/Default/CronAction.php:226
msgid "On this test system all mail will be delivered to the from address."
msgstr "On this test system all mail will be delivered to the from address."
@@ -1419,7 +1419,7 @@
msgstr "Email servers"
#: classes/Gems/Default/MailTemplateAction.php:76
-#: classes/Gems/Default/RespondentAction.php:373
+#: classes/Gems/Default/RespondentAction.php:372
msgid "(all organizations)"
msgstr "(all organizations)"
@@ -1443,7 +1443,7 @@
#: classes/Gems/Default/OptionAction.php:136
#: classes/Gems/Default/OrganizationAction.php:135
-#: classes/Gems/Default/RespondentAction.php:221
+#: classes/Gems/Default/RespondentAction.php:220
msgid "Language"
msgstr "Language"
@@ -1820,104 +1820,104 @@
msgstr[0] "reception code"
msgstr[1] "reception codes"
-#: classes/Gems/Default/RespondentAction.php:77
+#: classes/Gems/Default/RespondentAction.php:76
#: classes/Gems/Default/RespondentExportAction.php:71
msgid "Group surveys"
msgstr "Group surveys"
-#: classes/Gems/Default/RespondentAction.php:82
+#: classes/Gems/Default/RespondentAction.php:81
#: classes/Gems/Default/RespondentExportAction.php:76
msgid "Output format"
msgstr "Output format"
-#: classes/Gems/Default/RespondentAction.php:160
+#: classes/Gems/Default/RespondentAction.php:159
#, php-format
msgid "Random Example BSN: %s"
msgstr "Random Example BSN: %s"
-#: classes/Gems/Default/RespondentAction.php:162
+#: classes/Gems/Default/RespondentAction.php:161
msgid "Enter a 9-digit SSN number."
msgstr "Enter a 9-digit BSN number."
-#: classes/Gems/Default/RespondentAction.php:169
+#: classes/Gems/Default/RespondentAction.php:168
msgid "Identification"
msgstr "Identification"
-#: classes/Gems/Default/RespondentAction.php:180
+#: classes/Gems/Default/RespondentAction.php:179
msgid "SSN"
msgstr "BSN"
-#: classes/Gems/Default/RespondentAction.php:184
+#: classes/Gems/Default/RespondentAction.php:183
msgid "Patient number"
msgstr "Patient number"
-#: classes/Gems/Default/RespondentAction.php:193
+#: classes/Gems/Default/RespondentAction.php:192
msgid "Medical data"
msgstr "Medical data"
-#: classes/Gems/Default/RespondentAction.php:200
+#: classes/Gems/Default/RespondentAction.php:199
msgid "DBC's, etc..."
msgstr "DBC's, etc..."
-#: classes/Gems/Default/RespondentAction.php:203
+#: classes/Gems/Default/RespondentAction.php:202
msgid "Contact information"
msgstr "Contact information"
-#: classes/Gems/Default/RespondentAction.php:208
+#: classes/Gems/Default/RespondentAction.php:207
msgid "Respondent has no e-mail"
msgstr "Patient has no e-mail"
-#: classes/Gems/Default/RespondentAction.php:209
+#: classes/Gems/Default/RespondentAction.php:208
msgid "With housenumber"
msgstr "With housenumber"
-#: classes/Gems/Default/RespondentAction.php:216
+#: classes/Gems/Default/RespondentAction.php:215
msgid "Country"
msgstr "Country"
-#: classes/Gems/Default/RespondentAction.php:220
+#: classes/Gems/Default/RespondentAction.php:219
msgid "Settings"
msgstr "Settings"
-#: classes/Gems/Default/RespondentAction.php:222
+#: classes/Gems/Default/RespondentAction.php:221
msgid "Has the respondent signed the informed consent letter?"
msgstr "Has the patient signed the informed consent letter?"
-#: classes/Gems/Default/RespondentAction.php:252
+#: classes/Gems/Default/RespondentAction.php:251
msgid "Comments"
msgstr "Comments"
-#: classes/Gems/Default/RespondentAction.php:253
+#: classes/Gems/Default/RespondentAction.php:252
msgid "Treatment"
msgstr "Treatment"
-#: classes/Gems/Default/RespondentAction.php:281
+#: classes/Gems/Default/RespondentAction.php:280
msgid "Rejection code"
msgstr "Rejection code"
-#: classes/Gems/Default/RespondentAction.php:288
+#: classes/Gems/Default/RespondentAction.php:287
msgid "Delete respondent"
msgstr "Delete patient"
-#: classes/Gems/Default/RespondentAction.php:320
+#: classes/Gems/Default/RespondentAction.php:319
msgid "Respondent deleted."
msgstr "Patient deleted"
-#: classes/Gems/Default/RespondentAction.php:324
+#: classes/Gems/Default/RespondentAction.php:323
msgid "Respondent tracks stopped."
msgstr "Patient tracks stopped."
-#: classes/Gems/Default/RespondentAction.php:328
+#: classes/Gems/Default/RespondentAction.php:327
msgid "Choose a reception code to delete."
msgstr "Choose a reception code to delete."
-#: classes/Gems/Default/RespondentAction.php:422
+#: classes/Gems/Default/RespondentAction.php:421
msgid "respondent"
msgid_plural "respondents"
msgstr[0] "patient"
msgstr[1] "patients"
-#: classes/Gems/Default/RespondentAction.php:497
+#: classes/Gems/Default/RespondentAction.php:496
msgid "Please settle the informed consent form for this respondent."
msgstr "Please settle the informed consent form for this patient."
@@ -2745,12 +2745,12 @@
msgstr "Last contact"
#: classes/Gems/Email/OneMailForm.php:131
-#: classes/Gems/Email/TemplateMailer.php:217
+#: classes/Gems/Email/TemplateMailer.php:229
msgid "The sending of emails was blocked for this installation."
msgstr "The sending of emails was blocked for this installation."
#: classes/Gems/Email/OneMailForm.php:141
-#: classes/Gems/Email/TemplateMailer.php:250
+#: classes/Gems/Email/TemplateMailer.php:263
msgid "Mail failed to send."
msgstr "Mail failed to send."
@@ -2759,11 +2759,16 @@
msgid "Sent email to %s."
msgstr "Sent email to %s."
-#: classes/Gems/Email/TemplateMailer.php:266
+#: classes/Gems/Email/TemplateMailer.php:283
#, php-format
msgid "Sent %d e-mails, updated %d tokens."
msgstr "Sent %d e-mails, updated %d tokens."
+#: classes/Gems/Email/TemplateMailer.php:360
+#, php-format
+msgid "Invalid e-mail address '%s'."
+msgstr "Invalid e-mail address '%s'."
+
#: classes/Gems/Export/Excel.php:60
msgid "Excel options"
msgstr "Excel options"
@@ -3080,6 +3085,17 @@
msgid "Answered surveys"
msgstr "Answered surveys"
+#: classes/Gems/Snippets/RespondentDetailSnippetAbstract.php:141
+#: classes/Gems/Snippets/Export/RespondentSnippet.php:81
+#: classes/Gems/Snippets/Export/RespondentSnippet.php:89
+msgid "Respondent information"
+msgstr "Patient information"
+
+#: classes/Gems/Snippets/RespondentDetailSnippetAbstract.php:144
+#, php-format
+msgid "%s respondent information"
+msgstr "%s patient information"
+
#: classes/Gems/Snippets/Export/ReportFooterSnippet.php:55
msgid "Report generation finished."
msgstr "Report generation finished."
@@ -3105,11 +3121,6 @@
msgid "Unknown respondent %s"
msgstr "Unknown respondent %s"
-#: classes/Gems/Snippets/Export/RespondentSnippet.php:81
-#: classes/Gems/Snippets/Export/RespondentSnippet.php:89
-msgid "Respondent information"
-msgstr "Patient information"
-
#: classes/Gems/Task/Db/ExecutePatch.php:66
#, php-format
msgid "Executing patchlevel %d"
@@ -4201,11 +4212,11 @@
msgid "Address"
msgstr "Address"
-#: snippets/RespondentDetailsWithAssignmentsSnippet.php:108
+#: snippets/RespondentDetailsWithAssignmentsSnippet.php:110
msgid "No surveys"
msgstr "No surveys"
-#: snippets/RespondentDetailsWithAssignmentsSnippet.php:129
+#: snippets/RespondentDetailsWithAssignmentsSnippet.php:131
msgid "No tracks"
msgstr "No tracks"
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2012-06-28 09:48:38 UTC (rev 794)
+++ trunk/library/languages/default-nl.po 2012-06-28 10:08:16 UTC (rev 795)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-27 13:32+0100\n"
+"POT-Creation-Date: 2012-06-28 12:07+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -697,11 +697,11 @@
msgid "Cron jobs turned off."
msgstr "Cron opdrachten uitgezet."
-#: classes/Gems/Default/CronAction.php:222
+#: classes/Gems/Default/CronAction.php:223
msgid "No mails sent."
msgstr "Geen mail verzonden."
-#: classes/Gems/Default/CronAction.php:225
+#: classes/Gems/Default/CronAction.php:226
msgid "On this test system all mail will be delivered to the from address."
msgstr "Op dit test systeem worden alle emails gestuurd naar het \"van\" adres."
@@ -1419,7 +1419,7 @@
msgstr "Email servers"
#: classes/Gems/Default/MailTemplateAction.php:76
-#: classes/Gems/Default/RespondentAction.php:373
+#: classes/Gems/Default/RespondentAction.php:372
msgid "(all organizations)"
msgstr "(alle organisaties)"
@@ -1443,7 +1443,7 @@
#: classes/Gems/Default/OptionAction.php:136
#: classes/Gems/Default/OrganizationAction.php:135
-#: classes/Gems/Default/RespondentAction.php:221
+#: classes/Gems/Default/RespondentAction.php:220
msgid "Language"
msgstr "Taal"
@@ -1820,104 +1820,104 @@
msgstr[0] "Ontvangst code"
msgstr[1] "Ontvangst code"
-#: classes/Gems/Default/RespondentAction.php:77
+#: classes/Gems/Default/RespondentAction.php:76
#: classes/Gems/Default/RespondentExportAction.php:71
msgid "Group surveys"
msgstr "Groepeer vragenlijsten"
-#: classes/Gems/Default/RespondentAction.php:82
+#: classes/Gems/Default/RespondentAction.php:81
#: classes/Gems/Default/RespondentExportAction.php:76
msgid "Output format"
msgstr "Uitvoerformaat"
-#: classes/Gems/Default/RespondentAction.php:160
+#: classes/Gems/Default/RespondentAction.php:159
#, php-format
msgid "Random Example BSN: %s"
msgstr "Willekeurig voorbeeld BSN: %s"
-#: classes/Gems/Default/RespondentAction.php:162
+#: classes/Gems/Default/RespondentAction.php:161
msgid "Enter a 9-digit SSN number."
msgstr "Voer een BSN nummer van 9 cijfers in."
-#: classes/Gems/Default/RespondentAction.php:169
+#: classes/Gems/Default/RespondentAction.php:168
msgid "Identification"
msgstr "Identificatie"
-#: classes/Gems/Default/RespondentAction.php:180
+#: classes/Gems/Default/RespondentAction.php:179
msgid "SSN"
msgstr "SSN"
-#: classes/Gems/Default/RespondentAction.php:184
+#: classes/Gems/Default/RespondentAction.php:183
msgid "Patient number"
msgstr "Patiënt nummer"
-#: classes/Gems/Default/RespondentAction.php:193
+#: classes/Gems/Default/RespondentAction.php:192
msgid "Medical data"
msgstr "Medische gegevens"
-#: classes/Gems/Default/RespondentAction.php:200
+#: classes/Gems/Default/RespondentAction.php:199
msgid "DBC's, etc..."
msgstr "DBC's, etc..."
-#: classes/Gems/Default/RespondentAction.php:203
+#: classes/Gems/Default/RespondentAction.php:202
msgid "Contact information"
msgstr "Contact informatie"
-#: classes/Gems/Default/RespondentAction.php:208
+#: classes/Gems/Default/RespondentAction.php:207
msgid "Respondent has no e-mail"
msgstr "Patiënt zonder email"
-#: classes/Gems/Default/RespondentAction.php:209
+#: classes/Gems/Default/RespondentAction.php:208
msgid "With housenumber"
msgstr "Met huisnummer"
-#: classes/Gems/Default/RespondentAction.php:216
+#: classes/Gems/Default/RespondentAction.php:215
msgid "Country"
msgstr "Land"
-#: classes/Gems/Default/RespondentAction.php:220
+#: classes/Gems/Default/RespondentAction.php:219
msgid "Settings"
msgstr "Instellingen"
-#: classes/Gems/Default/RespondentAction.php:222
+#: classes/Gems/Default/RespondentAction.php:221
msgid "Has the respondent signed the informed consent letter?"
msgstr "Heeft de patiënt het \"informed consent\" formulier ondertekend?"
-#: classes/Gems/Default/RespondentAction.php:252
+#: classes/Gems/Default/RespondentAction.php:251
msgid "Comments"
msgstr "Opmerkingen"
-#: classes/Gems/Default/RespondentAction.php:253
+#: classes/Gems/Default/RespondentAction.php:252
msgid "Treatment"
msgstr "Behandeling"
-#: classes/Gems/Default/RespondentAction.php:281
+#: classes/Gems/Default/RespondentAction.php:280
msgid "Rejection code"
msgstr "Afkeuringscode"
-#: classes/Gems/Default/RespondentAction.php:288
+#: classes/Gems/Default/RespondentAction.php:287
msgid "Delete respondent"
msgstr "Verwijder patiënt"
-#: classes/Gems/Default/RespondentAction.php:320
+#: classes/Gems/Default/RespondentAction.php:319
msgid "Respondent deleted."
msgstr "Patiënt verwijderd"
-#: classes/Gems/Default/RespondentAction.php:324
+#: classes/Gems/Default/RespondentAction.php:323
msgid "Respondent tracks stopped."
msgstr "Trajecten van patiënt zijn gestopt."
-#: classes/Gems/Default/RespondentAction.php:328
+#: classes/Gems/Default/RespondentAction.php:327
msgid "Choose a reception code to delete."
msgstr "Kies een ontvangst code om te verwijderen."
-#: classes/Gems/Default/RespondentAction.php:422
+#: classes/Gems/Default/RespondentAction.php:421
msgid "respondent"
msgid_plural "respondents"
msgstr[0] "patiënt"
msgstr[1] "patiënten"
-#: classes/Gems/Default/RespondentAction.php:497
+#: classes/Gems/Default/RespondentAction.php:496
msgid "Please settle the informed consent form for this respondent."
msgstr "A.u.b. het informed consent formulier doornemen met deze patiënt"
@@ -2745,12 +2745,12 @@
msgstr "Contactdatum"
#: classes/Gems/Email/OneMailForm.php:131
-#: classes/Gems/Email/TemplateMailer.php:217
+#: classes/Gems/Email/TemplateMailer.php:229
msgid "The sending of emails was blocked for this installation."
msgstr "Het versturen van emails is geblokkeerd in deze installatie."
#: classes/Gems/Email/OneMailForm.php:141
-#: classes/Gems/Email/TemplateMailer.php:250
+#: classes/Gems/Email/TemplateMailer.php:263
msgid "Mail failed to send."
msgstr "Mail sturen mislukt."
@@ -2759,11 +2759,16 @@
msgid "Sent email to %s."
msgstr "Email naar %s verzonden."
-#: classes/Gems/Email/TemplateMailer.php:266
+#: classes/Gems/Email/TemplateMailer.php:283
#, php-format
msgid "Sent %d e-mails, updated %d tokens."
msgstr "%d emails verzonden en %d kenmerken bijgewerkt."
+#: classes/Gems/Email/TemplateMailer.php:360
+#, php-format
+msgid "Invalid e-mail address '%s'."
+msgstr "Ongeldig email adres '%s'."
+
#: classes/Gems/Export/Excel.php:60
msgid "Excel options"
msgstr "Excel opties"
@@ -3080,6 +3085,17 @@
msgid "Answered surveys"
msgstr "Beantwoorde vragenlijsten"
+#: classes/Gems/Snippets/RespondentDetailSnippetAbstract.php:141
+#: classes/Gems/Snippets/Export/RespondentSnippet.php:81
+#: classes/Gems/Snippets/Export/RespondentSnippet.php:89
+msgid "Respondent information"
+msgstr "Patiënt informatie"
+
+#: classes/Gems/Snippets/RespondentDetailSnippetAbstract.php:144
+#, php-format
+msgid "%s respondent information"
+msgstr "%s patiënt informatie"
+
#: classes/Gems/Snippets/Export/ReportFooterSnippet.php:55
msgid "Report generation finished."
msgstr "Rapport is aangemaakt."
@@ -3105,11 +3121,6 @@
msgid "Unknown respondent %s"
msgstr "Onbekende patiënt %s"
-#: classes/Gems/Snippets/Export/RespondentSnippet.php:81
-#: classes/Gems/Snippets/Export/RespondentSnippet.php:89
-msgid "Respondent information"
-msgstr "Patiënt informatie"
-
#: classes/Gems/Task/Db/ExecutePatch.php:66
#, php-format
msgid "Executing patchlevel %d"
@@ -4201,11 +4212,11 @@
msgid "Address"
msgstr "Adres"
-#: snippets/RespondentDetailsWithAssignmentsSnippet.php:108
+#: snippets/RespondentDetailsWithAssignmentsSnippet.php:110
msgid "No surveys"
msgstr "Geen vragenlijsten"
-#: snippets/RespondentDetailsWithAssignmentsSnippet.php:129
+#: snippets/RespondentDetailsWithAssignmentsSnippet.php:131
msgid "No tracks"
msgstr "Geen trajecten"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-28 09:48:49
|
Revision: 794
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=794&view=rev
Author: matijsdejong
Date: 2012-06-28 09:48:38 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
Show organization name in caption when the user is not with the current organization
Modified Paths:
--------------
trunk/library/classes/Gems/Default/RespondentAction.php
trunk/library/classes/Gems/Snippets/RespondentDetailSnippetAbstract.php
trunk/library/snippets/RespondentDetailsSnippet.php
trunk/library/snippets/RespondentDetailsWithAssignmentsSnippet.php
Modified: trunk/library/classes/Gems/Default/RespondentAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RespondentAction.php 2012-06-28 08:46:02 UTC (rev 793)
+++ trunk/library/classes/Gems/Default/RespondentAction.php 2012-06-28 09:48:38 UTC (rev 794)
@@ -47,7 +47,6 @@
abstract class Gems_Default_RespondentAction extends Gems_Controller_BrowseEditAction implements Gems_Menu_ParameterSourceInterface
{
public $showSnippets = array(
- 'Respondent_MultiOrganizationTab',
'RespondentDetailsSnippet',
'AddTracksSnippet',
'RespondentTokenTabsSnippet',
Modified: trunk/library/classes/Gems/Snippets/RespondentDetailSnippetAbstract.php
===================================================================
--- trunk/library/classes/Gems/Snippets/RespondentDetailSnippetAbstract.php 2012-06-28 08:46:02 UTC (rev 793)
+++ trunk/library/classes/Gems/Snippets/RespondentDetailSnippetAbstract.php 2012-06-28 09:48:38 UTC (rev 794)
@@ -3,7 +3,7 @@
/**
* Copyright (c) 2011, Erasmus MC
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
@@ -14,7 +14,7 @@
* * Neither the name of Erasmus MC nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -25,8 +25,8 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
+ *
+ *
* @package Gems
* @subpackage Snippets
* @author Matijs de Jong <mj...@ma...>
@@ -48,41 +48,54 @@
{
/**
* Optional: array of buttons
- *
+ *
* @var array
*/
protected $buttons;
-
+
/**
*
+ * @var Gems_Loader
+ */
+ protected $loader;
+
+ /**
+ *
* @var Gems_Model_RespondentModel
*/
protected $model;
-
+
/**
- * Optional: href for onclick
- *
+ * Optional: href for onclick
+ *
* @var MUtil_Html_HrefArrayAttribute
*/
protected $onclick;
-
+
/**
* Optional: repaeter respondentData
- *
+ *
* @var MUtil_Lazy_RepeatableInterface
*/
protected $repeater;
-
+
/**
+ * Required
+ *
+ * @var Zend_Controller_Request_Abstract
+ */
+ protected $request;
+
+ /**
* Optional: not always filled, use repeater
- *
+ *
* @var array
*/
protected $respondentData;
/**
*
- * @param MUtil_Model_VerticalTableBridge $bridge
+ * @param MUtil_Model_VerticalTableBridge $bridge
* @return void
*/
protected function addButtons(MUtil_Model_VerticalTableBridge $bridge)
@@ -94,7 +107,7 @@
/**
*
- * @param MUtil_Model_VerticalTableBridge $bridge
+ * @param MUtil_Model_VerticalTableBridge $bridge
* @return void
*/
protected function addOnClick(MUtil_Model_VerticalTableBridge $bridge)
@@ -103,16 +116,36 @@
$bridge->tbody()->onclick = array('location.href=\'', $this->onclick, '\';');
}
}
-
+
/**
* Place to set the data to display
- *
+ *
* @param MUtil_Model_VerticalTableBridge $bridge
* @return void
*/
abstract protected function addTableCells(MUtil_Model_VerticalTableBridge $bridge);
-
+
/**
+ * Returns the caption for this table
+ *
+ * @param boolean $onlyNotCurrent Only return a string when the organization is different
+ * @return string
+ */
+ protected function getCaption($onlyNotCurrent = false)
+ {
+ $orgId = $this->request->getParam(MUtil_Model::REQUEST_ID2);
+ if ($orgId == $this->loader->getCurrentUser()->getCurrentOrganizationId()) {
+ if ($onlyNotCurrent) {
+ return;
+ } else {
+ return $this->_('Respondent information');
+ }
+ } else {
+ return sprintf($this->_('%s respondent information'), $this->loader->getOrganization($orgId)->getName());
+ }
+ }
+
+ /**
* Create the snippets content
*
* This is a stub function either override getHtmlOutput() or override render()
@@ -125,14 +158,14 @@
$bridge = new MUtil_Model_VerticalTableBridge($this->model, array('class' => 'displayer'));
$bridge->setRepeater($this->repeater);
$bridge->setColumnCount(2); // May be overruled
-
+
$this->addTableCells($bridge);
$this->addButtons($bridge);
$this->addOnClick($bridge);
-
+
return $bridge->getTable();
}
-
+
/**
* The place to check if the data set in the snippet is valid
* to generate the snippet.
@@ -158,14 +191,14 @@
if (! is_array(reset($this->respondentData))) {
$this->respondentData = array($this->respondentData);
}
-
+
$this->repeater = MUtil_Lazy::repeat($this->respondentData);
}
}
-
+
return true;
}
-
+
return false;
}
}
Modified: trunk/library/snippets/RespondentDetailsSnippet.php
===================================================================
--- trunk/library/snippets/RespondentDetailsSnippet.php 2012-06-28 08:46:02 UTC (rev 793)
+++ trunk/library/snippets/RespondentDetailsSnippet.php 2012-06-28 09:48:38 UTC (rev 794)
@@ -3,7 +3,7 @@
/**
* Copyright (c) 2011, Erasmus MC
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
@@ -14,7 +14,7 @@
* * Neither the name of Erasmus MC nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -25,8 +25,8 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
+ *
+ *
* @package Gems
* @subpackage Snippets
* @author Matijs de Jong <mj...@ma...>
@@ -36,7 +36,7 @@
*/
/**
- * Displays a respondent's details
+ * Displays a respondent's details
*
* @package Gems
* @subpackage Snippets
@@ -48,16 +48,16 @@
{
/**
* Place to set the data to display
- *
+ *
* @param MUtil_Model_VerticalTableBridge $bridge
* @return void
*/
protected function addTableCells(MUtil_Model_VerticalTableBridge $bridge)
{
$HTML = MUtil_Html::create();
-
- $bridge->caption($this->_('Respondent information'));
+ $bridge->caption($this->getCaption());
+
$br = $HTML->br();
$address[] = $bridge->grs_address_1;
$address[] = $br;
Modified: trunk/library/snippets/RespondentDetailsWithAssignmentsSnippet.php
===================================================================
--- trunk/library/snippets/RespondentDetailsWithAssignmentsSnippet.php 2012-06-28 08:46:02 UTC (rev 793)
+++ trunk/library/snippets/RespondentDetailsWithAssignmentsSnippet.php 2012-06-28 09:48:38 UTC (rev 794)
@@ -71,7 +71,7 @@
$HTML = MUtil_Html::create();
- $bridge->tdh($this->_('Respondent information'), array('colspan' => 2));
+ $bridge->tdh($this->getCaption(), array('colspan' => 2));
// Caption for surveys
$trackLabel = $this->_('Assigned surveys');
@@ -96,6 +96,8 @@
// ROW 1
$bridge->addItem($bridge->gr2o_patient_nr, $this->_('Respondent nr: '));
+ $rowspan = 10;
+
// Column for surveys
$tracksModel = $this->model->getRespondentTracksModel();
// Add token as action needs token ID + only one per single survey
@@ -117,7 +119,7 @@
$tracksTarget->em($tracksData->gr2t_track_info, array('renderWithoutContent' => false));
$tracksTarget[] = ' ';
$tracksTarget[] = MUtil_Lazy::call($this->util->getTranslated()->formatDate, $tracksData->gr2t_created);
- $bridge->td($tracksList, array('rowspan' => 10, 'class' => 'linked tracksList'));
+ $bridge->td($tracksList, array('rowspan' => $rowspan, 'class' => 'linked tracksList'));
// Column for tracks
$tracksModel = $this->model->getRespondentTracksModel();
@@ -138,7 +140,7 @@
$tracksTarget->em($tracksData->gr2t_track_info, array('renderWithoutContent' => false));
$tracksTarget[] = ' ';
$tracksTarget[] = MUtil_Lazy::call($this->util->getTranslated()->formatDate, $tracksData->gr2t_created);
- $bridge->td($tracksList, array('rowspan' => 10, 'class' => 'linked tracksList'));
+ $bridge->td($tracksList, array('rowspan' => $rowspan, 'class' => 'linked tracksList'));
// OTHER ROWS
$bridge->addItem(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-28 08:46:11
|
Revision: 793
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=793&view=rev
Author: mennodekker
Date: 2012-06-28 08:46:02 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
Made mutli-org a little safer
Updated respondentexport to work with new model
Slider values applied to logaction
Optimised tableform a little
Modified Paths:
--------------
trunk/library/classes/Gems/Default/LogAction.php
trunk/library/classes/Gems/Export/RespondentExport.php
trunk/library/classes/Gems/Form/TableForm.php
trunk/library/classes/Gems/Model/RespondentModel.php
Modified: trunk/library/classes/Gems/Default/LogAction.php
===================================================================
--- trunk/library/classes/Gems/Default/LogAction.php 2012-06-27 11:59:17 UTC (rev 792)
+++ trunk/library/classes/Gems/Default/LogAction.php 2012-06-28 08:46:02 UTC (rev 793)
@@ -71,8 +71,8 @@
}
// Create date range elements
- $min = -91;
- $max = 91;
+ $min = $this->minPeriod;
+ $max = $this->maxPeriod;
$size = max(strlen($min), strlen($max));
$element = new Zend_Form_Element_Text('period_start', array('label' => $this->_('from'), 'size' => $size - 1, 'maxlength' => $size, 'class' => 'rightAlign'));
Modified: trunk/library/classes/Gems/Export/RespondentExport.php
===================================================================
--- trunk/library/classes/Gems/Export/RespondentExport.php 2012-06-27 11:59:17 UTC (rev 792)
+++ trunk/library/classes/Gems/Export/RespondentExport.php 2012-06-28 08:46:02 UTC (rev 793)
@@ -285,7 +285,9 @@
protected function _exportRespondent($respondentId)
{
$respondentModel = $this->loader->getModels()->getRespondentModel(false);
- $respondentModel->setFilter(array('gr2o_patient_nr' => $respondentId));
+ //Insert orgId when set
+ $respondentModel->applyRequest(Zend_Controller_Front::getInstance()->getRequest());
+ $respondentModel->addFilter(array('gr2o_patient_nr' => $respondentId));
$respondentData = $respondentModel->loadFirst();
$this->html->snippet($this->_respondentSnippet,
Modified: trunk/library/classes/Gems/Form/TableForm.php
===================================================================
--- trunk/library/classes/Gems/Form/TableForm.php 2012-06-27 11:59:17 UTC (rev 792)
+++ trunk/library/classes/Gems/Form/TableForm.php 2012-06-28 08:46:02 UTC (rev 793)
@@ -65,24 +65,16 @@
* @return null|Zend_Form_Decorator_Abstract
*/
private function _getImportantDecorator($element) {
- $dec1 = null;
+ $class = get_class($element);
- if ($dec1 = $element->getDecorator('ViewHelper')) {
- return $dec1;
- } elseif ($dec1 = $element->getDecorator('UiWidgetElement')) {
- return $dec1;
- } elseif ($dec1 = $element->getDecorator('File')) {
- return $dec1;
- } else {
- $decorators = $element->getDecorators();
- foreach($decorators as $name=>$decorator) {
- if (substr($name, 0, 5) == 'ZendX') {
- $dec1 = $decorator;
- break;
- }
- }
- return $dec1;
+ if (strpos($class, 'JQuery')) {
+ return $element->getDecorator('UiWidgetElement');
}
+ if (strpos($class, 'File')) {
+ return $element->getDecorator('File');
+ }
+
+ return $element->getDecorator('ViewHelper');
}
/**
@@ -225,7 +217,7 @@
if ($this->loadDefaultDecoratorsIsDisabled()) {
return $this;
}
-
+
$class = $this->getAttrib('class');
if (empty($class)) {
$class = 'formTable';
@@ -256,7 +248,7 @@
}
}
}
-
+
return parent::setView($view);
}
}
\ No newline at end of file
Modified: trunk/library/classes/Gems/Model/RespondentModel.php
===================================================================
--- trunk/library/classes/Gems/Model/RespondentModel.php 2012-06-27 11:59:17 UTC (rev 792)
+++ trunk/library/classes/Gems/Model/RespondentModel.php 2012-06-28 08:46:02 UTC (rev 793)
@@ -104,9 +104,11 @@
$filter = parent::_checkFilterUsed($filter);
if (! isset($filter['gr2o_id_organization'])) {
- if ($this->isMultiOrganization()) {
+ if ($this->isMultiOrganization() && !isset($filter['gr2o_patient_nr'])) {
+ // If we are not looking for a specific patient, we can look at all patients
$filter[] = 'gr2o_id_organization IN (' . implode(', ', array_keys($this->user->getAllowedOrganizations())) . ')';
} else {
+ // Otherwise, we can only see in our current organization
$filter['gr2o_id_organization'] = $this->getCurrentOrganization();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-27 11:59:27
|
Revision: 792
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=792&view=rev
Author: matijsdejong
Date: 2012-06-27 11:59:17 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
Cron job now continues trying to send e-mails even after an error was encountered.
Modified Paths:
--------------
trunk/library/classes/Gems/Default/CronAction.php
trunk/library/classes/Gems/Email/TemplateMailer.php
Modified: trunk/library/classes/Gems/Default/CronAction.php
===================================================================
--- trunk/library/classes/Gems/Default/CronAction.php 2012-06-27 11:34:34 UTC (rev 791)
+++ trunk/library/classes/Gems/Default/CronAction.php 2012-06-27 11:59:17 UTC (rev 792)
@@ -162,7 +162,8 @@
$model = $this->loader->getTracker()->getTokenModel();
$mailer = new Gems_Email_TemplateMailer($this->escort);
-
+ $mailer->continueOnError = true;
+
// $mailer->setDefaultTransport(new MUtil_Mail_Transport_EchoLog());
$jobs = $this->db->fetchAll("SELECT * FROM gems__mail_jobs WHERE gmj_active = 1");
Modified: trunk/library/classes/Gems/Email/TemplateMailer.php
===================================================================
--- trunk/library/classes/Gems/Email/TemplateMailer.php 2012-06-27 11:34:34 UTC (rev 791)
+++ trunk/library/classes/Gems/Email/TemplateMailer.php 2012-06-27 11:59:17 UTC (rev 792)
@@ -49,7 +49,14 @@
const MAIL_TLS = 2;
/**
+ * Should the mailer continue sending mails, even when it encounters errors?
*
+ * @var boolean
+ */
+ public $continueOnError = false;
+
+ /**
+ *
* @var Zend_Mail_Transport
*/
protected $defaultTransport = null;
@@ -59,6 +66,11 @@
*/
protected $escort;
+ /**
+ * Feedback messages for this action.
+ *
+ * @var array of string
+ */
protected $messages = array();
private $_changeDate;
@@ -238,6 +250,7 @@
$send = array();
$scount = 0;
$ucount = 0;
+ $result = true;
foreach ($tokensData as $tokenData) {
// Should this token be mailed?
@@ -249,11 +262,15 @@
if ($message = $this->processMail($tokenData)) {
$this->addMessage($this->escort->_('Mail failed to send.'));
$this->addMessage($message);
- return false;
+ $result = true;
+ if (! $this->continueOnError) {
+ break;
+ }
+ } else {
+ $send[$tokenData['grs_email']] = true;
+ $scount++;
+ $ucount++;
}
- $send[$tokenData['grs_email']] = true;
- $scount++;
- $ucount++;
} elseif ($updateAll) {
$this->updateToken($tokenData);
@@ -266,7 +283,7 @@
$this->addMessage(sprintf($this->escort->_('Sent %d e-mails, updated %d tokens.'), $scount, $ucount));
}
- return true;
+ return $result;
}
/**
@@ -335,12 +352,12 @@
MUtil_Echo::r($to, $to_name);
MUtil_Echo::r($from, $from_name);
}
-
+
if (!$this->bounceCheck()) {
$validate = new Zend_Validate_EmailAddress();
-
+
if (!$validate->isValid($to)) {
- return "Invalid e-mail address {$to}";
+ return sprintf($this->escort->_("Invalid e-mail address '%s'."), $to);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-27 11:34:42
|
Revision: 791
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=791&view=rev
Author: matijsdejong
Date: 2012-06-27 11:34:34 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
Code cleanup and prettier error messages
Modified Paths:
--------------
trunk/library/classes/Gems/Default/OrganizationAction.php
trunk/library/classes/Gems/Model/HiddenOrganizationModel.php
trunk/library/classes/GemsEscort.php
trunk/library/languages/default-en.mo
trunk/library/languages/default-en.po
trunk/library/languages/default-nl.mo
trunk/library/languages/default-nl.po
Modified: trunk/library/classes/Gems/Default/OrganizationAction.php
===================================================================
--- trunk/library/classes/Gems/Default/OrganizationAction.php 2012-06-26 13:56:06 UTC (rev 790)
+++ trunk/library/classes/Gems/Default/OrganizationAction.php 2012-06-27 11:34:34 UTC (rev 791)
@@ -88,7 +88,10 @@
return;
}
- throw new Exception($this->_('Invalid organization.'));
+ throw new Gems_Exception(
+ $this->_('Inaccessible or unknown organization'),
+ 403, null,
+ sprintf($this->_('Access to this page is not allowed for current role: %s.'), $this->loader->getCurrentUser()->getRole()));
}
/**
Modified: trunk/library/classes/Gems/Model/HiddenOrganizationModel.php
===================================================================
--- trunk/library/classes/Gems/Model/HiddenOrganizationModel.php 2012-06-26 13:56:06 UTC (rev 790)
+++ trunk/library/classes/Gems/Model/HiddenOrganizationModel.php 2012-06-27 11:34:34 UTC (rev 791)
@@ -107,10 +107,12 @@
}
if (isset($parameters[MUtil_Model::REQUEST_ID2]) &&
- !array_key_exists($parameters[MUtil_Model::REQUEST_ID2], $this->user->getAllowedOrganizations())
- ) {
+ (! array_key_exists($parameters[MUtil_Model::REQUEST_ID2], $this->user->getAllowedOrganizations()))) {
- throw new Exception($this->translate->_('Invalid organization.'));
+ throw new Gems_Exception(
+ $this->translate->_('Inaccessible or unknown organization'),
+ 403, null,
+ sprintf($this->translate->_('Access to this page is not allowed for current role: %s.'), $this->user->getRole()));
}
return parent::applyParameters($parameters);
Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php 2012-06-26 13:56:06 UTC (rev 790)
+++ trunk/library/classes/GemsEscort.php 2012-06-27 11:34:34 UTC (rev 791)
@@ -1539,8 +1539,6 @@
$loader = $this->getLoader();
$user = $loader->getCurrentUser();
- // MUtil_Echo::r($request->getParams(), 'params');
- // MUtil_Echo::r($request->getUserParams(), 'userparams');
// Load the menu. As building the menu can depend on all resources and the request, we do it here.
//
// PS: The REQUEST is needed because otherwise the locale for translate is not certain.
@@ -1607,9 +1605,9 @@
// Throw an exception + HTTP 401 when an autofilter is called
if ($request->getActionName() == 'autofilter') {
throw new Gems_Exception("Session expired", 401);
- } else if ($menuItem = $this->menu->findFirst(array('allowed' => true, 'visible' => true))) {
+ } elseif ($menuItem = $this->menu->findFirst(array('allowed' => true, 'visible' => true))) {
// Do not store previous request & show message when the intended action is logoff
- if (!($request->getControllerName() == 'index' && $request->getActionName() == 'logoff')) {
+ if (! ($request->getControllerName() == 'index' && $request->getActionName() == 'logoff')) {
$this->addMessage($this->_('You are no longer logged in.'));
$this->addMessage($this->_('You must login to access this page.'));
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2012-06-26 13:56:06 UTC (rev 790)
+++ trunk/library/languages/default-en.po 2012-06-27 11:34:34 UTC (rev 791)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-14 15:04+0100\n"
+"POT-Creation-Date: 2012-06-27 13:31+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -37,58 +37,58 @@
msgid "You are not logged in"
msgstr "You are not logged in"
-#: classes/GemsEscort.php:965
+#: classes/GemsEscort.php:968
#, php-format
msgid "User: %s"
msgstr "User: %s"
-#: classes/GemsEscort.php:990
+#: classes/GemsEscort.php:993
msgid "version"
msgstr "version"
-#: classes/GemsEscort.php:1432
+#: classes/GemsEscort.php:1435
msgid "Take note: your session has expired, your inputs were not saved. Please check the input data and try again"
msgstr "Take note: your session has expired, your inputs were not saved. Please check the input data and try again"
-#: classes/GemsEscort.php:1563
+#: classes/GemsEscort.php:1564
msgid "Please check back later."
msgstr "Please check back later."
-#: classes/GemsEscort.php:1565
-#: classes/GemsEscort.php:1569
+#: classes/GemsEscort.php:1566
#: classes/GemsEscort.php:1570
+#: classes/GemsEscort.php:1571
msgid "System is in maintenance mode"
msgstr "System is in maintenance mode"
-#: classes/GemsEscort.php:1580
+#: classes/GemsEscort.php:1581
msgid "No access to site."
msgstr "No access to site."
-#: classes/GemsEscort.php:1582
-#: classes/GemsEscort.php:1625
+#: classes/GemsEscort.php:1583
+#: classes/GemsEscort.php:1626
msgid "You have no access to this site."
msgstr "You have no access to this site."
-#: classes/GemsEscort.php:1598
+#: classes/GemsEscort.php:1599
msgid "No access to page"
msgstr "No access to page"
-#: classes/GemsEscort.php:1600
+#: classes/GemsEscort.php:1601
#, php-format
msgid "Access to this page is not allowed for current role: %s."
msgstr "Access to this page is not allowed for current role: %s."
-#: classes/GemsEscort.php:1610
-#: classes/GemsEscort.php:1623
+#: classes/GemsEscort.php:1611
+#: classes/GemsEscort.php:1624
msgid "You are no longer logged in."
msgstr "You are no longer logged in."
-#: classes/GemsEscort.php:1611
+#: classes/GemsEscort.php:1612
msgid "You must login to access this page."
msgstr "You must login to access this page."
-#: classes/GemsEscort.php:1752
-#: classes/GemsEscort.php:1754
+#: classes/GemsEscort.php:1753
+#: classes/GemsEscort.php:1755
#, php-format
msgid "%d survey"
msgid_plural "%d surveys"
@@ -185,7 +185,7 @@
msgstr "Roles"
#: classes/Gems/Menu.php:197
-#: classes/Gems/Menu.php:347
+#: classes/Gems/Menu.php:377
msgid "Assigned"
msgstr "Assigned"
@@ -218,7 +218,7 @@
msgstr "Upgrade"
#: classes/Gems/Menu.php:220
-#: classes/Gems/Menu.php:320
+#: classes/Gems/Menu.php:341
msgid "Show"
msgstr "Show"
@@ -264,155 +264,159 @@
msgstr "Change password"
#: classes/Gems/Menu.php:248
-#: classes/Gems/Menu.php:289
-#: classes/Gems/Menu.php:324
+#: classes/Gems/Menu.php:301
+#: classes/Gems/Menu.php:347
msgid "Token"
msgstr "Token"
-#: classes/Gems/Menu.php:280
+#: classes/Gems/Menu.php:289
msgid "Export"
msgstr "Export"
-#: classes/Gems/Menu.php:285
+#: classes/Gems/Menu.php:296
msgid "Track"
msgstr "Track"
-#: classes/Gems/Menu.php:292
-#: classes/Gems/Menu.php:312
-#: classes/Gems/Menu.php:343
+#: classes/Gems/Menu.php:304
+#: classes/Gems/Menu.php:329
+#: classes/Gems/Menu.php:371
msgid "Add"
msgstr "Add"
-#: classes/Gems/Menu.php:296
-#: classes/Gems/Menu.php:378
+#: classes/Gems/Menu.php:310
+#: classes/Gems/Menu.php:410
msgid "Preview"
msgstr "Preview"
-#: classes/Gems/Menu.php:303
+#: classes/Gems/Menu.php:319
msgid "Tracks"
msgstr "Tracks"
-#: classes/Gems/Menu.php:316
+#: classes/Gems/Menu.php:335
msgid "Assignments"
msgstr "Assignments"
-#: classes/Gems/Menu.php:328
+#: classes/Gems/Menu.php:351
msgid "Edit"
msgstr "Edit"
-#: classes/Gems/Menu.php:332
+#: classes/Gems/Menu.php:357
msgid "Delete"
msgstr "Delete"
-#: classes/Gems/Menu.php:337
+#: classes/Gems/Menu.php:364
msgid "Surveys"
msgstr "Surveys"
-#: classes/Gems/Menu.php:369
+#: classes/Gems/Menu.php:401
msgid "Fill in"
msgstr "Fill in"
-#: classes/Gems/Menu.php:372
+#: classes/Gems/Menu.php:404
msgid "Print PDF"
msgstr "Print PDF"
-#: classes/Gems/Menu.php:375
+#: classes/Gems/Menu.php:407
msgid "E-Mail now!"
msgstr "E-Mail now!"
-#: classes/Gems/Menu.php:381
+#: classes/Gems/Menu.php:413
msgid "Answers"
msgstr "Answers"
-#: classes/Gems/Menu.php:531
+#: classes/Gems/Menu.php:565
msgid "Respondents"
msgstr "Patients"
-#: classes/Gems/Menu.php:539
+#: classes/Gems/Menu.php:573
msgid "Overview"
msgstr "Overview"
-#: classes/Gems/Menu.php:546
+#: classes/Gems/Menu.php:580
msgid "Project"
msgstr "Project"
-#: classes/Gems/Menu.php:549
+#: classes/Gems/Menu.php:583
msgid "Setup"
msgstr "Setup"
-#: classes/Gems/Menu.php:552
+#: classes/Gems/Menu.php:586
+msgid "Track Builder"
+msgstr "Track Builder"
+
+#: classes/Gems/Menu.php:589
msgid "Mail"
msgstr "Mail"
-#: classes/Gems/Menu.php:555
-msgid "Track Builder"
-msgstr "Track Builder"
-
-#: classes/Gems/Menu.php:561
+#: classes/Gems/Menu.php:595
msgid "Export respondent"
msgstr "Export respondent"
-#: classes/Gems/Menu.php:567
+#: classes/Gems/Menu.php:601
msgid "Contact"
msgstr "Contact"
-#: classes/Gems/Menu.php:580
+#: classes/Gems/Menu.php:615
msgid "Changelog"
msgstr "Changelog"
-#: classes/Gems/Model.php:230
+#: classes/Gems/Model.php:206
msgid "Respondent nr"
msgstr "Patient nr"
-#: classes/Gems/Model.php:231
+#: classes/Gems/Model.php:209
+msgid "Organization"
+msgstr "Organization"
+
+#: classes/Gems/Model.php:211
msgid "Opened"
msgstr "Opened"
-#: classes/Gems/Model.php:232
+#: classes/Gems/Model.php:212
msgid "Consent"
msgstr "Consent"
-#: classes/Gems/Model.php:234
+#: classes/Gems/Model.php:214
msgid "E-Mail"
msgstr "E-Mail"
-#: classes/Gems/Model.php:239
+#: classes/Gems/Model.php:219
msgid "Gender"
msgstr "Gender"
-#: classes/Gems/Model.php:240
+#: classes/Gems/Model.php:220
msgid "First name"
msgstr "First name"
-#: classes/Gems/Model.php:241
+#: classes/Gems/Model.php:221
msgid "Surname prefix"
msgstr "Surname prefix"
-#: classes/Gems/Model.php:242
+#: classes/Gems/Model.php:222
msgid "Last name"
msgstr "Last name"
-#: classes/Gems/Model.php:244
+#: classes/Gems/Model.php:224
msgid "Name"
msgstr "Name"
-#: classes/Gems/Model.php:247
+#: classes/Gems/Model.php:227
msgid "Street"
msgstr "Street"
-#: classes/Gems/Model.php:248
+#: classes/Gems/Model.php:228
msgid "Zipcode"
msgstr "Zipcode"
-#: classes/Gems/Model.php:249
+#: classes/Gems/Model.php:229
msgid "City"
msgstr "City"
-#: classes/Gems/Model.php:251
+#: classes/Gems/Model.php:231
msgid "Phone"
msgstr "Phone"
-#: classes/Gems/Model.php:253
+#: classes/Gems/Model.php:233
msgid "Birthday"
msgstr "Birthday"
@@ -987,11 +991,6 @@
msgid "%s records found."
msgstr "%s records found."
-#: classes/Gems/Default/ExportAction.php:172
-#: classes/Gems/Default/LogAction.php:197
-msgid "Organization"
-msgstr "Organization"
-
#: classes/Gems/Default/ExportAction.php:181
msgid "Export to"
msgstr "Export to"
@@ -1420,6 +1419,7 @@
msgstr "Email servers"
#: classes/Gems/Default/MailTemplateAction.php:76
+#: classes/Gems/Default/RespondentAction.php:373
msgid "(all organizations)"
msgstr "(all organizations)"
@@ -1442,8 +1442,8 @@
msgstr "Login Name"
#: classes/Gems/Default/OptionAction.php:136
-#: classes/Gems/Default/OrganizationAction.php:132
-#: classes/Gems/Default/RespondentAction.php:175
+#: classes/Gems/Default/OrganizationAction.php:135
+#: classes/Gems/Default/RespondentAction.php:221
msgid "Language"
msgstr "Language"
@@ -1464,113 +1464,113 @@
msgid "Item"
msgstr "Item"
-#: classes/Gems/Default/OrganizationAction.php:91
-msgid "Invalid organization."
-msgstr "Invalid organization."
+#: classes/Gems/Default/OrganizationAction.php:92
+msgid "Inaccessible or unknown organization"
+msgstr "Inaccessible or unknown organization"
-#: classes/Gems/Default/OrganizationAction.php:113
+#: classes/Gems/Default/OrganizationAction.php:116
msgid "Url"
msgstr "Url"
-#: classes/Gems/Default/OrganizationAction.php:114
+#: classes/Gems/Default/OrganizationAction.php:117
msgid "Task"
msgstr "Task"
-#: classes/Gems/Default/OrganizationAction.php:115
+#: classes/Gems/Default/OrganizationAction.php:118
msgid "Contact name"
msgstr "Contact name"
-#: classes/Gems/Default/OrganizationAction.php:116
+#: classes/Gems/Default/OrganizationAction.php:119
msgid "Contact email"
msgstr "Contact email"
-#: classes/Gems/Default/OrganizationAction.php:119
+#: classes/Gems/Default/OrganizationAction.php:122
msgid "Style"
msgstr "Style"
-#: classes/Gems/Default/OrganizationAction.php:124
+#: classes/Gems/Default/OrganizationAction.php:127
msgid "Default url's"
msgstr "Default url's"
-#: classes/Gems/Default/OrganizationAction.php:126
+#: classes/Gems/Default/OrganizationAction.php:129
#, php-format
msgid "Always switch to this organization when %s is accessed from one of these space separated url's. The first is used for mails."
msgstr "Always switch to this organization when %s is accessed from one of these space separated url's. The first is used for mails."
-#: classes/Gems/Default/OrganizationAction.php:136
+#: classes/Gems/Default/OrganizationAction.php:139
msgid "Can the organization be used?"
msgstr "Can the organization be used?"
-#: classes/Gems/Default/OrganizationAction.php:137
+#: classes/Gems/Default/OrganizationAction.php:140
msgid "Login"
msgstr "Login"
-#: classes/Gems/Default/OrganizationAction.php:137
+#: classes/Gems/Default/OrganizationAction.php:140
msgid "Can people login for this organization?"
msgstr "Can people login for this organization?"
-#: classes/Gems/Default/OrganizationAction.php:138
+#: classes/Gems/Default/OrganizationAction.php:141
msgid "Accepting"
msgstr "Accepting"
-#: classes/Gems/Default/OrganizationAction.php:138
+#: classes/Gems/Default/OrganizationAction.php:141
msgid "Can new respondents be added to the organization?"
msgstr "Can new patients be added to the organization?"
-#: classes/Gems/Default/OrganizationAction.php:139
+#: classes/Gems/Default/OrganizationAction.php:142
msgid "Does the organization have respondents?"
msgstr "Does the organization have patients?"
-#: classes/Gems/Default/OrganizationAction.php:140
+#: classes/Gems/Default/OrganizationAction.php:143
msgid "Respondent group"
msgstr "Patient group"
-#: classes/Gems/Default/OrganizationAction.php:140
+#: classes/Gems/Default/OrganizationAction.php:143
msgid "Allows respondents to login."
msgstr "Allow patients to login."
-#: classes/Gems/Default/OrganizationAction.php:144
+#: classes/Gems/Default/OrganizationAction.php:147
msgid "Greeting"
msgstr "Greeting"
-#: classes/Gems/Default/OrganizationAction.php:144
-#: classes/Gems/Default/OrganizationAction.php:145
+#: classes/Gems/Default/OrganizationAction.php:147
+#: classes/Gems/Default/OrganizationAction.php:148
msgid "For emails and token forward screen."
msgstr "For emails and token forward screen."
-#: classes/Gems/Default/OrganizationAction.php:145
+#: classes/Gems/Default/OrganizationAction.php:148
msgid "Signature"
msgstr "Signature"
-#: classes/Gems/Default/OrganizationAction.php:147
+#: classes/Gems/Default/OrganizationAction.php:150
msgid "Accessible by"
msgstr "Accessible by"
-#: classes/Gems/Default/OrganizationAction.php:147
+#: classes/Gems/Default/OrganizationAction.php:150
msgid "Checked organizations see this organizations respondents."
msgstr "Checked organizations see this organizations patients."
-#: classes/Gems/Default/OrganizationAction.php:157
+#: classes/Gems/Default/OrganizationAction.php:160
msgid "Code name"
msgstr "Code name"
-#: classes/Gems/Default/OrganizationAction.php:157
+#: classes/Gems/Default/OrganizationAction.php:160
msgid "Only for programmers."
msgstr "Only for programmers."
-#: classes/Gems/Default/OrganizationAction.php:175
+#: classes/Gems/Default/OrganizationAction.php:178
msgid "This can not be changed yet"
msgstr "This can not be changed yet"
-#: classes/Gems/Default/OrganizationAction.php:177
+#: classes/Gems/Default/OrganizationAction.php:180
msgid "User Definition"
msgstr "User Definition"
-#: classes/Gems/Default/OrganizationAction.php:207
+#: classes/Gems/Default/OrganizationAction.php:210
msgid "Participating organizations"
msgstr "Participating organizations"
-#: classes/Gems/Default/OrganizationAction.php:218
+#: classes/Gems/Default/OrganizationAction.php:221
msgid "organization"
msgid_plural "organizations"
msgstr[0] "organization"
@@ -1820,189 +1820,115 @@
msgstr[0] "reception code"
msgstr[1] "reception codes"
-#: classes/Gems/Default/RespondentAction.php:119
+#: classes/Gems/Default/RespondentAction.php:77
+#: classes/Gems/Default/RespondentExportAction.php:71
+msgid "Group surveys"
+msgstr "Group surveys"
+
+#: classes/Gems/Default/RespondentAction.php:82
+#: classes/Gems/Default/RespondentExportAction.php:76
+msgid "Output format"
+msgstr "Output format"
+
+#: classes/Gems/Default/RespondentAction.php:160
#, php-format
msgid "Random Example BSN: %s"
msgstr "Random Example BSN: %s"
-#: classes/Gems/Default/RespondentAction.php:122
+#: classes/Gems/Default/RespondentAction.php:162
msgid "Enter a 9-digit SSN number."
msgstr "Enter a 9-digit BSN number."
-#: classes/Gems/Default/RespondentAction.php:127
+#: classes/Gems/Default/RespondentAction.php:169
msgid "Identification"
msgstr "Identification"
-#: classes/Gems/Default/RespondentAction.php:134
+#: classes/Gems/Default/RespondentAction.php:180
msgid "SSN"
msgstr "BSN"
-#: classes/Gems/Default/RespondentAction.php:138
+#: classes/Gems/Default/RespondentAction.php:184
msgid "Patient number"
msgstr "Patient number"
-#: classes/Gems/Default/RespondentAction.php:147
+#: classes/Gems/Default/RespondentAction.php:193
msgid "Medical data"
msgstr "Medical data"
-#: classes/Gems/Default/RespondentAction.php:154
+#: classes/Gems/Default/RespondentAction.php:200
msgid "DBC's, etc..."
msgstr "DBC's, etc..."
-#: classes/Gems/Default/RespondentAction.php:157
+#: classes/Gems/Default/RespondentAction.php:203
msgid "Contact information"
msgstr "Contact information"
-#: classes/Gems/Default/RespondentAction.php:162
+#: classes/Gems/Default/RespondentAction.php:208
msgid "Respondent has no e-mail"
msgstr "Patient has no e-mail"
-#: classes/Gems/Default/RespondentAction.php:163
+#: classes/Gems/Default/RespondentAction.php:209
msgid "With housenumber"
msgstr "With housenumber"
-#: classes/Gems/Default/RespondentAction.php:170
+#: classes/Gems/Default/RespondentAction.php:216
msgid "Country"
msgstr "Country"
-#: classes/Gems/Default/RespondentAction.php:174
+#: classes/Gems/Default/RespondentAction.php:220
msgid "Settings"
msgstr "Settings"
-#: classes/Gems/Default/RespondentAction.php:176
+#: classes/Gems/Default/RespondentAction.php:222
msgid "Has the respondent signed the informed consent letter?"
msgstr "Has the patient signed the informed consent letter?"
-#: classes/Gems/Default/RespondentAction.php:206
+#: classes/Gems/Default/RespondentAction.php:252
msgid "Comments"
msgstr "Comments"
-#: classes/Gems/Default/RespondentAction.php:207
+#: classes/Gems/Default/RespondentAction.php:253
msgid "Treatment"
msgstr "Treatment"
-#: classes/Gems/Default/RespondentAction.php:235
+#: classes/Gems/Default/RespondentAction.php:281
msgid "Rejection code"
msgstr "Rejection code"
-#: classes/Gems/Default/RespondentAction.php:242
+#: classes/Gems/Default/RespondentAction.php:288
msgid "Delete respondent"
msgstr "Delete patient"
-#: classes/Gems/Default/RespondentAction.php:274
+#: classes/Gems/Default/RespondentAction.php:320
msgid "Respondent deleted."
msgstr "Patient deleted"
-#: classes/Gems/Default/RespondentAction.php:278
+#: classes/Gems/Default/RespondentAction.php:324
msgid "Respondent tracks stopped."
msgstr "Patient tracks stopped."
-#: classes/Gems/Default/RespondentAction.php:282
+#: classes/Gems/Default/RespondentAction.php:328
msgid "Choose a reception code to delete."
msgstr "Choose a reception code to delete."
-#: classes/Gems/Default/RespondentAction.php:331
+#: classes/Gems/Default/RespondentAction.php:422
msgid "respondent"
msgid_plural "respondents"
msgstr[0] "patient"
msgstr[1] "patients"
-#: classes/Gems/Default/RespondentAction.php:404
+#: classes/Gems/Default/RespondentAction.php:497
msgid "Please settle the informed consent form for this respondent."
msgstr "Please settle the informed consent form for this patient."
-#: classes/Gems/Default/RespondentExportAction.php:74
+#: classes/Gems/Default/RespondentExportAction.php:61
msgid "Respondent number"
msgstr "Patient number"
-#: classes/Gems/Default/RespondentExportAction.php:78
+#: classes/Gems/Default/RespondentExportAction.php:65
msgid "Separate multiple respondents with a comma (,)"
msgstr "Separate multiple respondents with a comma (,)"
-#: classes/Gems/Default/RespondentExportAction.php:84
-msgid "Group surveys"
-msgstr "Group surveys"
-
-#: classes/Gems/Default/RespondentExportAction.php:89
-msgid "Output format"
-msgstr "Output format"
-
-#: classes/Gems/Default/RespondentExportAction.php:131
-#, php-format
-msgid "Unable to run PDF conversion: \"%s\""
-msgstr "Unable to run PDF conversion: \"%s\""
-
-#: classes/Gems/Default/RespondentExportAction.php:169
-msgid "Round"
-msgstr "Round"
-
-#: classes/Gems/Default/RespondentExportAction.php:180
-msgid "Open"
-msgstr "Open"
-
-#: classes/Gems/Default/RespondentExportAction.php:183
-msgid "Completed"
-msgstr "Completed"
-
-#: classes/Gems/Default/RespondentExportAction.php:189
-msgid "Missed"
-msgstr "Missed"
-
-#: classes/Gems/Default/RespondentExportAction.php:191
-#: classes/Gems/Default/RespondentExportAction.php:193
-msgid "Future"
-msgstr "Future"
-
-#: classes/Gems/Default/RespondentExportAction.php:198
-msgid "Single Survey"
-msgstr "Single Survey"
-
-#: classes/Gems/Default/RespondentExportAction.php:244
-msgid "Enter the particulars concerning the assignment to this respondent."
-msgstr "Enter the particulars concerning the assignment to this patient."
-
-#: classes/Gems/Default/RespondentExportAction.php:245
-msgid "Assigned by"
-msgstr "Assigned by"
-
-#: classes/Gems/Default/RespondentExportAction.php:246
-msgid "Start"
-msgstr "Start"
-
-#: classes/Gems/Default/RespondentExportAction.php:250
-msgid "Comment"
-msgstr "Comment"
-
-#: classes/Gems/Default/RespondentExportAction.php:258
-msgid "Track information"
-msgstr "Track information"
-
-#: classes/Gems/Default/RespondentExportAction.php:296
-#, php-format
-msgid "Unknown respondent %s"
-msgstr "Unknown respondent %s"
-
-#: classes/Gems/Default/RespondentExportAction.php:302
-#: classes/Gems/Default/RespondentExportAction.php:310
-msgid "Respondent information"
-msgstr "Patient information"
-
-#: classes/Gems/Default/RespondentExportAction.php:330
-msgid "Respondent report"
-msgstr "Respondent report"
-
-#: classes/Gems/Default/RespondentExportAction.php:334
-msgid "Report information"
-msgstr "Report information"
-
-#: classes/Gems/Default/RespondentExportAction.php:335
-msgid "Generated by"
-msgstr "Generated by"
-
-#: classes/Gems/Default/RespondentExportAction.php:337
-msgid "Generated on"
-msgstr "Generated on"
-
#: classes/Gems/Default/RespondentPlanAction.php:67
msgid "Show respondent"
msgstr "Show patient"
@@ -2456,26 +2382,30 @@
msgid "Answered"
msgstr "Answered"
+#: classes/Gems/Default/TokenPlanAction.php:327
+msgid "Missed"
+msgstr "Missed"
+
#: classes/Gems/Default/TokenPlanAction.php:341
msgid "(all fillers)"
msgstr "(all fillers)"
-#: classes/Gems/Default/TokenPlanAction.php:363
+#: classes/Gems/Default/TokenPlanAction.php:360
msgid "(all staff)"
msgstr "(all staff)"
-#: classes/Gems/Default/TokenPlanAction.php:474
+#: classes/Gems/Default/TokenPlanAction.php:471
msgid "+"
msgstr "+"
-#: classes/Gems/Default/TokenPlanAction.php:483
+#: classes/Gems/Default/TokenPlanAction.php:480
#: classes/Gems/Default/TrackAction.php:450
msgid "token"
msgid_plural "tokens"
msgstr[0] "token"
msgstr[1] "tokens"
-#: classes/Gems/Default/TokenPlanAction.php:488
+#: classes/Gems/Default/TokenPlanAction.php:485
msgid "Token planning"
msgstr "Token planning"
@@ -2548,32 +2478,48 @@
msgid "Available tracks"
msgstr "Available tracks"
-#: classes/Gems/Default/TrackActionAbstract.php:171
+#: classes/Gems/Default/TrackActionAbstract.php:163
#, php-format
msgid "Token answers: %s"
msgstr "Token answers: %s"
-#: classes/Gems/Default/TrackActionAbstract.php:197
+#: classes/Gems/Default/TrackActionAbstract.php:189
#, php-format
msgid "Adding the %s track to respondent %s"
msgstr "Adding the %s track to patient %s"
-#: classes/Gems/Default/TrackActionAbstract.php:303
+#: classes/Gems/Default/TrackActionAbstract.php:201
+msgid "Enter the particulars concerning the assignment to this respondent."
+msgstr "Enter the particulars concerning the assignment to this patient."
+
+#: classes/Gems/Default/TrackActionAbstract.php:202
+msgid "Assigned by"
+msgstr "Assigned by"
+
+#: classes/Gems/Default/TrackActionAbstract.php:203
+msgid "Start"
+msgstr "Start"
+
+#: classes/Gems/Default/TrackActionAbstract.php:208
+msgid "Comment"
+msgstr "Comment"
+
+#: classes/Gems/Default/TrackActionAbstract.php:295
#, php-format
msgid "Email %s %s"
msgstr "Email %s %s"
-#: classes/Gems/Default/TrackActionAbstract.php:309
+#: classes/Gems/Default/TrackActionAbstract.php:301
#, php-format
msgid "%s %s not found."
msgstr "%s %s not found."
-#: classes/Gems/Default/TrackActionAbstract.php:493
+#: classes/Gems/Default/TrackActionAbstract.php:481
#, php-format
msgid "Overview of %s track for respondent %s"
msgstr "Overview of %s track for patient %s"
-#: classes/Gems/Default/TrackActionAbstract.php:497
+#: classes/Gems/Default/TrackActionAbstract.php:485
msgid "This track is currently not assigned to this respondent."
msgstr "This track is currently not assigned to this patient."
@@ -2790,6 +2736,10 @@
msgid "Survey cannot be taken at this moment."
msgstr "Survey cannot be taken at this moment."
+#: classes/Gems/Email/OneMailForm.php:55
+msgid "Round"
+msgstr "Round"
+
#: classes/Gems/Email/OneMailForm.php:58
msgid "Last contact"
msgstr "Last contact"
@@ -2826,6 +2776,19 @@
msgid "Format answers"
msgstr "Format answers"
+#: classes/Gems/Export/RespondentExport.php:128
+#, php-format
+msgid "Unable to run PDF conversion: \"%s\""
+msgstr "Unable to run PDF conversion: \"%s\""
+
+#: classes/Gems/Export/RespondentExport.php:193
+msgid "Single Survey"
+msgstr "Single Survey"
+
+#: classes/Gems/Export/RespondentExport.php:254
+msgid "Track information"
+msgstr "Track information"
+
#: classes/Gems/Export/Spss.php:59
msgid "Which file"
msgstr "Which file"
@@ -2936,15 +2899,15 @@
msgid "Check all assignments"
msgstr "Check all assignments"
-#: classes/Gems/Menu/SubMenuItem.php:380
+#: classes/Gems/Menu/SubMenuItem.php:410
msgid "New"
msgstr "New"
-#: classes/Gems/Menu/SubMenuItem.php:434
+#: classes/Gems/Menu/SubMenuItem.php:464
msgid "Export the current data set to Excel"
msgstr "Export the current data set to Excel"
-#: classes/Gems/Menu/SubMenuItem.php:438
+#: classes/Gems/Menu/SubMenuItem.php:468
msgid "Excel export"
msgstr "Excel export"
@@ -3117,6 +3080,36 @@
msgid "Answered surveys"
msgstr "Answered surveys"
+#: classes/Gems/Snippets/Export/ReportFooterSnippet.php:55
+msgid "Report generation finished."
+msgstr "Report generation finished."
+
+#: classes/Gems/Snippets/Export/ReportHeaderSnippet.php:54
+msgid "Respondent report"
+msgstr "Respondent report"
+
+#: classes/Gems/Snippets/Export/ReportHeaderSnippet.php:58
+msgid "Report information"
+msgstr "Report information"
+
+#: classes/Gems/Snippets/Export/ReportHeaderSnippet.php:59
+msgid "Generated by"
+msgstr "Generated by"
+
+#: classes/Gems/Snippets/Export/ReportHeaderSnippet.php:61
+msgid "Generated on"
+msgstr "Generated on"
+
+#: classes/Gems/Snippets/Export/RespondentSnippet.php:75
+#, php-format
+msgid "Unknown respondent %s"
+msgstr "Unknown respondent %s"
+
+#: classes/Gems/Snippets/Export/RespondentSnippet.php:81
+#: classes/Gems/Snippets/Export/RespondentSnippet.php:89
+msgid "Respondent information"
+msgstr "Patient information"
+
#: classes/Gems/Task/Db/ExecutePatch.php:66
#, php-format
msgid "Executing patchlevel %d"
@@ -3191,6 +3184,20 @@
msgid "No tokens were changed."
msgstr "No tokens were changed."
+#: classes/Gems/Tracker/Token.php:956
+msgid "Open"
+msgstr "Open"
+
+#: classes/Gems/Tracker/Token.php:959
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:200
+msgid "Completed"
+msgstr "Completed"
+
+#: classes/Gems/Tracker/Token.php:967
+#: classes/Gems/Tracker/Token.php:969
+msgid "Future"
+msgstr "Future"
+
#: classes/Gems/Tracker/Batch/SynchronizeSourcesBatch.php:135
msgid "No surveys were changed."
msgstr "No surveys were changed."
@@ -3361,27 +3368,27 @@
msgid "Enter tokens as %s."
msgstr "Enter tokens as %s."
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:216
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:197
msgid "Measure(d) on"
msgstr "Measure(d) on"
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:220
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:201
msgid "Duration in seconds"
msgstr "Duration in seconds"
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:221
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:202
msgid "Score"
msgstr "Score"
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:230
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:211
msgid "Assigned to"
msgstr "Assigned to"
-#: classes/Gems/Tracker/Model/TrackModel.php:118
+#: classes/Gems/Tracker/Model/TrackModel.php:99
msgid "Track Engine"
msgstr "Track Engine"
-#: classes/Gems/Tracker/Model/TrackModel.php:123
+#: classes/Gems/Tracker/Model/TrackModel.php:104
msgid "Use until"
msgstr "Use until"
@@ -3401,12 +3408,14 @@
#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:240
#: classes/Gems/Tracker/Snippets/EditTokenSnippetAbstract.php:124
+#: classes/Gems/Tracker/Snippets/ShowTokenSnippetAbstract.php:164
#, php-format
msgid "Token %s not found."
msgstr "Token %s not found."
#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:244
#: classes/Gems/Tracker/Snippets/EditTokenSnippetAbstract.php:128
+#: classes/Gems/Tracker/Snippets/ShowTokenSnippetAbstract.php:168
msgid "No token specified."
msgstr "No token specified."
@@ -3754,21 +3763,20 @@
msgid "You are not allowed to login from this location."
msgstr "You are not allowed to login from this location."
-#: classes/Gems/User/User.php:1140
+#: classes/Gems/User/User.php:1160
msgid "Your birthday"
msgstr "Your birthday"
-#: classes/Gems/User/User.php:1156
-#: classes/Gems/User/Form/ChangePasswordForm.php:163
+#: classes/Gems/User/User.php:1176
#, php-format
msgid "%s is not correct."
msgstr "%s is not correct."
-#: classes/Gems/User/User.php:1238
+#: classes/Gems/User/User.php:1258
msgid "Trying to send a password reset to a user that cannot be reset."
msgstr "Trying to send a password reset to a user that cannot be reset."
-#: classes/Gems/User/User.php:1266
+#: classes/Gems/User/User.php:1286
msgid "Unable to send e-mail."
msgstr "Unable to send e-mail."
@@ -4113,19 +4121,19 @@
msgid "One or more IPs are illegal."
msgstr "One or more IPs are illegal."
-#: snippets/AddTracksSnippet.php:198
+#: snippets/AddTracksSnippet.php:211
msgid "info"
msgstr "info"
-#: snippets/AddTracksSnippet.php:203
+#: snippets/AddTracksSnippet.php:218
msgid "None available"
msgstr "None available"
-#: snippets/AddTracksSnippet.php:218
+#: snippets/AddTracksSnippet.php:233
msgid "by Respondents"
msgstr "by Patients"
-#: snippets/AddTracksSnippet.php:221
+#: snippets/AddTracksSnippet.php:236
msgid "by Staff"
msgstr "by Staff"
@@ -4166,7 +4174,6 @@
msgstr "Deleted token %s for survey %s."
#: snippets/DeleteTrackTokenSnippet.php:286
-#: snippets/EditTrackTokenSnippet.php:182
#, php-format
msgid "%d token changed by recalculation."
msgid_plural "%d tokens changed by recalculation."
@@ -4222,8 +4229,8 @@
msgid "Selected surveys"
msgstr "Selected surveys"
-#: snippets/ShowSingleSurveyTokenSnippet.php:76
-#: snippets/ShowTrackTokenSnippet.php:77
+#: snippets/ShowSingleSurveyTokenSnippet.php:79
+#: snippets/ShowTrackTokenSnippet.php:79
msgid "Actions"
msgstr "Actions"
@@ -4369,6 +4376,9 @@
msgstr[0] "After this survey there is one other survey we would like you to answer."
msgstr[1] "After this survey there are another %d surveys we would like you to answer."
+#~ msgid "Invalid organization."
+#~ msgstr "Invalid organization."
+
#~ msgid "Check all is answersed"
#~ msgstr "Check all is answersed"
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2012-06-26 13:56:06 UTC (rev 790)
+++ trunk/library/languages/default-nl.po 2012-06-27 11:34:34 UTC (rev 791)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-14 15:04+0100\n"
+"POT-Creation-Date: 2012-06-27 13:32+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -37,58 +37,58 @@
msgid "You are not logged in"
msgstr "U bent niet ingelogd"
-#: classes/GemsEscort.php:965
+#: classes/GemsEscort.php:968
#, php-format
msgid "User: %s"
msgstr "Login: %s"
-#: classes/GemsEscort.php:990
+#: classes/GemsEscort.php:993
msgid "version"
msgstr "versie"
-#: classes/GemsEscort.php:1432
+#: classes/GemsEscort.php:1435
msgid "Take note: your session has expired, your inputs were not saved. Please check the input data and try again"
msgstr "Let op: uw sessie is verlopen, uw invoer is niet opgeslagen. Controleer uw gegevens en probeer a.u.b. opnieuw."
-#: classes/GemsEscort.php:1563
+#: classes/GemsEscort.php:1564
msgid "Please check back later."
msgstr "Probeer het later opnieuw."
-#: classes/GemsEscort.php:1565
-#: classes/GemsEscort.php:1569
+#: classes/GemsEscort.php:1566
#: classes/GemsEscort.php:1570
+#: classes/GemsEscort.php:1571
msgid "System is in maintenance mode"
msgstr "Systeem is in onderhoudsmodus"
-#: classes/GemsEscort.php:1580
+#: classes/GemsEscort.php:1581
msgid "No access to site."
msgstr "Geen toegang tot website."
-#: classes/GemsEscort.php:1582
-#: classes/GemsEscort.php:1625
+#: classes/GemsEscort.php:1583
+#: classes/GemsEscort.php:1626
msgid "You have no access to this site."
msgstr "U heeft geen toegang tot deze website."
-#: classes/GemsEscort.php:1598
+#: classes/GemsEscort.php:1599
msgid "No access to page"
msgstr "Geen toegang tot pagina"
-#: classes/GemsEscort.php:1600
+#: classes/GemsEscort.php:1601
#, php-format
msgid "Access to this page is not allowed for current role: %s."
msgstr "U heeft geen toegang tot deze pagina. Uw huidige rol is: %s."
-#: classes/GemsEscort.php:1610
-#: classes/GemsEscort.php:1623
+#: classes/GemsEscort.php:1611
+#: classes/GemsEscort.php:1624
msgid "You are no longer logged in."
msgstr "U bent niet meer ingelogd."
-#: classes/GemsEscort.php:1611
+#: classes/GemsEscort.php:1612
msgid "You must login to access this page."
msgstr "U moet ingelogd zijn voor toegang tot deze pagina."
-#: classes/GemsEscort.php:1752
-#: classes/GemsEscort.php:1754
+#: classes/GemsEscort.php:1753
+#: classes/GemsEscort.php:1755
#, php-format
msgid "%d survey"
msgid_plural "%d surveys"
@@ -185,7 +185,7 @@
msgstr "Rollen"
#: classes/Gems/Menu.php:197
-#: classes/Gems/Menu.php:347
+#: classes/Gems/Menu.php:377
msgid "Assigned"
msgstr "Toegewezen"
@@ -218,7 +218,7 @@
msgstr "Upgrade"
#: classes/Gems/Menu.php:220
-#: classes/Gems/Menu.php:320
+#: classes/Gems/Menu.php:341
msgid "Show"
msgstr "Toon"
@@ -264,155 +264,159 @@
msgstr "Uw wachtwoord"
#: classes/Gems/Menu.php:248
-#: classes/Gems/Menu.php:289
-#: classes/Gems/Menu.php:324
+#: classes/Gems/Menu.php:301
+#: classes/Gems/Menu.php:347
msgid "Token"
msgstr "Kenmerk"
-#: classes/Gems/Menu.php:280
+#: classes/Gems/Menu.php:289
msgid "Export"
msgstr "Exporteer"
-#: classes/Gems/Menu.php:285
+#: classes/Gems/Menu.php:296
msgid "Track"
msgstr "Traject"
-#: classes/Gems/Menu.php:292
-#: classes/Gems/Menu.php:312
-#: classes/Gems/Menu.php:343
+#: classes/Gems/Menu.php:304
+#: classes/Gems/Menu.php:329
+#: classes/Gems/Menu.php:371
msgid "Add"
msgstr "Voeg toe"
-#: classes/Gems/Menu.php:296
-#: classes/Gems/Menu.php:378
+#: classes/Gems/Menu.php:310
+#: classes/Gems/Menu.php:410
msgid "Preview"
msgstr "Preview"
-#: classes/Gems/Menu.php:303
+#: classes/Gems/Menu.php:319
msgid "Tracks"
msgstr "Trajecten"
-#: classes/Gems/Menu.php:316
+#: classes/Gems/Menu.php:335
msgid "Assignments"
msgstr "Toewijzingen"
-#: classes/Gems/Menu.php:328
+#: classes/Gems/Menu.php:351
msgid "Edit"
msgstr "Wijzig"
-#: classes/Gems/Menu.php:332
+#: classes/Gems/Menu.php:357
msgid "Delete"
msgstr "Verwijder"
-#: classes/Gems/Menu.php:337
+#: classes/Gems/Menu.php:364
msgid "Surveys"
msgstr "Vragenlijsten"
-#: classes/Gems/Menu.php:369
+#: classes/Gems/Menu.php:401
msgid "Fill in"
msgstr "Vul in"
-#: classes/Gems/Menu.php:372
+#: classes/Gems/Menu.php:404
msgid "Print PDF"
msgstr "Print PDF"
-#: classes/Gems/Menu.php:375
+#: classes/Gems/Menu.php:407
msgid "E-Mail now!"
msgstr "Email nu!"
-#: classes/Gems/Menu.php:381
+#: classes/Gems/Menu.php:413
msgid "Answers"
msgstr "Antwoorden"
-#: classes/Gems/Menu.php:531
+#: classes/Gems/Menu.php:565
msgid "Respondents"
msgstr "Patiënten"
-#: classes/Gems/Menu.php:539
+#: classes/Gems/Menu.php:573
msgid "Overview"
msgstr "Overzicht"
-#: classes/Gems/Menu.php:546
+#: classes/Gems/Menu.php:580
msgid "Project"
msgstr "Project"
-#: classes/Gems/Menu.php:549
+#: classes/Gems/Menu.php:583
msgid "Setup"
msgstr "Beheer"
-#: classes/Gems/Menu.php:552
+#: classes/Gems/Menu.php:586
+msgid "Track Builder"
+msgstr "Traject bouwer"
+
+#: classes/Gems/Menu.php:589
msgid "Mail"
msgstr "Email"
-#: classes/Gems/Menu.php:555
-msgid "Track Builder"
-msgstr "Traject bouwer"
-
-#: classes/Gems/Menu.php:561
+#: classes/Gems/Menu.php:595
msgid "Export respondent"
msgstr "Exporteer patiënt"
-#: classes/Gems/Menu.php:567
+#: classes/Gems/Menu.php:601
msgid "Contact"
msgstr "Contact"
-#: classes/Gems/Menu.php:580
+#: classes/Gems/Menu.php:615
msgid "Changelog"
msgstr "Changelog"
-#: classes/Gems/Model.php:230
+#: classes/Gems/Model.php:206
msgid "Respondent nr"
msgstr "Patiënt nr"
-#: classes/Gems/Model.php:231
+#: classes/Gems/Model.php:209
+msgid "Organization"
+msgstr "Organisatie"
+
+#: classes/Gems/Model.php:211
msgid "Opened"
msgstr "Bekeken op"
-#: classes/Gems/Model.php:232
+#: classes/Gems/Model.php:212
msgid "Consent"
msgstr "Toestemming"
-#: classes/Gems/Model.php:234
+#: classes/Gems/Model.php:214
msgid "E-Mail"
msgstr "Email"
-#: classes/Gems/Model.php:239
+#: classes/Gems/Model.php:219
msgid "Gender"
msgstr "Geslacht"
-#: classes/Gems/Model.php:240
+#: classes/Gems/Model.php:220
msgid "First name"
msgstr "Voornaam"
-#: classes/Gems/Model.php:241
+#: classes/Gems/Model.php:221
msgid "Surname prefix"
msgstr "Tussenvoegsel"
-#: classes/Gems/Model.php:242
+#: classes/Gems/Model.php:222
msgid "Last name"
msgstr "Achternaam"
-#: classes/Gems/Model.php:244
+#: classes/Gems/Model.php:224
msgid "Name"
msgstr "Naam"
-#: classes/Gems/Model.php:247
+#: classes/Gems/Model.php:227
msgid "Street"
msgstr "Straat"
-#: classes/Gems/Model.php:248
+#: classes/Gems/Model.php:228
msgid "Zipcode"
msgstr "Postcode"
-#: classes/Gems/Model.php:249
+#: classes/Gems/Model.php:229
msgid "City"
msgstr "Woonplaats"
-#: classes/Gems/Model.php:251
+#: classes/Gems/Model.php:231
msgid "Phone"
msgstr "Telefoon"
-#: classes/Gems/Model.php:253
+#: classes/Gems/Model.php:233
msgid "Birthday"
msgstr "Geboren op"
@@ -987,11 +991,6 @@
msgid "%s records found."
msgstr "%s records gevonden."
-#: classes/Gems/Default/ExportAction.php:172
-#: classes/Gems/Default/LogAction.php:197
-msgid "Organization"
-msgstr "Organisatie"
-
#: classes/Gems/Default/ExportAction.php:181
msgid "Export to"
msgstr "Exporteer naar"
@@ -1420,6 +1419,7 @@
msgstr "Email servers"
#: classes/Gems/Default/MailTemplateAction.php:76
+#: classes/Gems/Default/RespondentAction.php:373
msgid "(all organizations)"
msgstr "(alle organisaties)"
@@ -1442,8 +1442,8 @@
msgstr "Login Naam"
#: classes/Gems/Default/OptionAction.php:136
-#: classes/Gems/Default/OrganizationAction.php:132
-#: classes/Gems/Default/RespondentAction.php:175
+#: classes/Gems/Default/OrganizationAction.php:135
+#: classes/Gems/Default/RespondentAction.php:221
msgid "Language"
msgstr "Taal"
@@ -1464,113 +1464,113 @@
msgid "Item"
msgstr "Item"
-#: classes/Gems/Default/OrganizationAction.php:91
-msgid "Invalid organization."
-msgstr "Ongeldige organisatie."
+#: classes/Gems/Default/OrganizationAction.php:92
+msgid "Inaccessible or unknown organization"
+msgstr "Ontoegankelijke of onbekende organisatie."
-#: classes/Gems/Default/OrganizationAction.php:113
+#: classes/Gems/Default/OrganizationAction.php:116
msgid "Url"
msgstr "Url"
-#: classes/Gems/Default/OrganizationAction.php:114
+#: classes/Gems/Default/OrganizationAction.php:117
msgid "Task"
msgstr "Taak"
-#: classes/Gems/Default/OrganizationAction.php:115
+#: classes/Gems/Default/OrganizationAction.php:118
msgid "Contact name"
msgstr "Contact naam"
-#: classes/Gems/Default/OrganizationAction.php:116
+#: classes/Gems/Default/OrganizationAction.php:119
msgid "Contact email"
msgstr "Contact email"
-#: classes/Gems/Default/OrganizationAction.php:119
+#: classes/Gems/Default/OrganizationAction.php:122
msgid "Style"
msgstr "Stijl"
-#: classes/Gems/Default/OrganizationAction.php:124
+#: classes/Gems/Default/OrganizationAction.php:127
msgid "Default url's"
msgstr "Standaard url's"
-#: classes/Gems/Default/OrganizationAction.php:126
+#: classes/Gems/Default/OrganizationAction.php:129
#, php-format
msgid "Always switch to this organization when %s is accessed from one of these space separated url's. The first is used for mails."
msgstr "Altijd naar deze organisatie overschakelen als %s vanaf één van deze door spatie gescheiden url's wordt aangeroepen. De eerste url wordt gebruikt voor emails."
-#: classes/Gems/Default/OrganizationAction.php:136
+#: classes/Gems/Default/OrganizationAction.php:139
msgid "Can the organization be used?"
msgstr "Is de organisatie in gebruik?"
-#: classes/Gems/Default/OrganizationAction.php:137
+#: classes/Gems/Default/OrganizationAction.php:140
msgid "Login"
msgstr "Inloggen"
-#: classes/Gems/Default/OrganizationAction.php:137
+#: classes/Gems/Default/OrganizationAction.php:140
msgid "Can people login for this organization?"
msgstr "Kunnen personen inloggen voor deze organisatie?"
-#: classes/Gems/Default/OrganizationAction.php:138
+#: classes/Gems/Default/OrganizationAction.php:141
msgid "Accepting"
msgstr "Accepteert"
-#: classes/Gems/Default/OrganizationAction.php:138
+#: classes/Gems/Default/OrganizationAction.php:141
msgid "Can new respondents be added to the organization?"
msgstr "Accepteert de organisatie nieuwe patiënten?"
-#: classes/Gems/Default/OrganizationAction.php:139
+#: classes/Gems/Default/OrganizationAction.php:142
msgid "Does the organization have respondents?"
msgstr "Heeft de organisatie patiënten?"
-#: classes/Gems/Default/OrganizationAction.php:140
+#: classes/Gems/Default/OrganizationAction.php:143
msgid "Respondent group"
msgstr "Patiënt groep"
-#: classes/Gems/Default/OrganizationAction.php:140
+#: classes/Gems/Default/OrganizationAction.php:143
msgid "Allows respondents to login."
msgstr "Patiënten toestaan in te loggen."
-#: classes/Gems/Default/OrganizationAction.php:144
+#: classes/Gems/Default/OrganizationAction.php:147
msgid "Greeting"
msgstr "Begroeting"
-#: classes/Gems/Default/OrganizationAction.php:144
-#: classes/Gems/Default/OrganizationAction.php:145
+#: classes/Gems/Default/OrganizationAction.php:147
+#: classes/Gems/Default/OrganizationAction.php:148
msgid "For emails and token forward screen."
msgstr "Voor emails en kenmerk scherm."
-#: classes/Gems/Default/OrganizationAction.php:145
+#: classes/Gems/Default/OrganizationAction.php:148
msgid "Signature"
msgstr "Handtekening"
-#: classes/Gems/Default/OrganizationAction.php:147
+#: classes/Gems/Default/OrganizationAction.php:150
msgid "Accessible by"
msgstr "Toegankelijk voor"
-#: classes/Gems/Default/OrganizationAction.php:147
+#: classes/Gems/Default/OrganizationAction.php:150
msgid "Checked organizations see this organizations respondents."
msgstr "Geselecteerde organizaties kunnen de patiënten van deze organisatie bekijken."
-#: classes/Gems/Default/OrganizationAction.php:157
+#: classes/Gems/Default/OrganizationAction.php:160
msgid "Code name"
msgstr "Code naam"
-#: classes/Gems/Default/OrganizationAction.php:157
+#: classes/Gems/Default/OrganizationAction.php:160
msgid "Only for programmers."
msgstr "Uitsluitend voor programmeurs."
-#: classes/Gems/Default/OrganizationAction.php:175
+#: classes/Gems/Default/OrganizationAction.php:178
msgid "This can not be changed yet"
msgstr "Dit kan nog niet gewijzigd worden"
-#: classes/Gems/Default/OrganizationAction.php:177
+#: classes/Gems/Default/OrganizationAction.php:180
msgid "User Definition"
msgstr "User Definition"
-#: classes/Gems/Default/OrganizationAction.php:207
+#: classes/Gems/Default/OrganizationAction.php:210
msgid "Participating organizations"
msgstr "Deelnemende organisaties"
-#: classes/Gems/Default/OrganizationAction.php:218
+#: classes/Gems/Default/OrganizationAction.php:221
msgid "organization"
msgid_plural "organizations"
msgstr[0] "organisatie"
@@ -1820,189 +1820,115 @@
msgstr[0] "Ontvangst code"
msgstr[1] "Ontvangst code"
-#: classes/Gems/Default/RespondentAction.php:119
+#: classes/Gems/Default/RespondentAction.php:77
+#: classes/Gems/Default/RespondentExportAction.php:71
+msgid "Group surveys"
+msgstr "Groepeer vragenlijsten"
+
+#: classes/Gems/Default/RespondentAction.php:82
+#: classes/Gems/Default/RespondentExportAction.php:76
+msgid "Output format"
+msgstr "Uitvoerformaat"
+
+#: classes/Gems/Default/RespondentAction.php:160
#, php-format
msgid "Random Example BSN: %s"
msgstr "Willekeurig voorbeeld BSN: %s"
-#: classes/Gems/Default/RespondentAction.php:122
+#: classes/Gems/Default/RespondentAction.php:162
msgid "Enter a 9-digit SSN number."
msgstr "Voer een BSN nummer van 9 cijfers in."
-#: classes/Gems/Default/RespondentAction.php:127
+#: classes/Gems/Default/RespondentAction.php:169
msgid "Identification"
msgstr "Identificatie"
-#: classes/Gems/Default/RespondentAction.php:134
+#: classes/Gems/Default/RespondentAction.php:180
msgid "SSN"
msgstr "SSN"
-#: classes/Gems/Default/RespondentAction.php:138
+#: classes/Gems/Default/RespondentAction.php:184
msgid "Patient number"
msgstr "Patiënt nummer"
-#: classes/Gems/Default/RespondentAction.php:147
+#: classes/Gems/Default/RespondentAction.php:193
msgid "Medical data"
msgstr "Medische gegevens"
-#: classes/Gems/Default/RespondentAction.php:154
+#: classes/Gems/Default/RespondentAction.php:200
msgid "DBC's, etc..."
msgstr "DBC's, etc..."
-#: classes/Gems/Default/RespondentAction.php:157
+#: classes/Gems/Default/RespondentAction.php:203
msgid "Contact information"
msgstr "Contact informatie"
-#: classes/Gems/Default/RespondentAction.php:162
+#: classes/Gems/Default/RespondentAction.php:208
msgid "Respondent has no e-mail"
msgstr "Patiënt zonder email"
-#: classes/Gems/Default/RespondentAction.php:163
+#: classes/Gems/Default/RespondentAction.php:209
msgid "With housenumber"
msgstr "Met huisnummer"
-#: classes/Gems/Default/RespondentAction.php:170
+#: classes/Gems/Default/RespondentAction.php:216
msgid "Country"
msgstr "Land"
-#: classes/Gems/Default/RespondentAction.php:174
+#: classes/Gems/Default/RespondentAction.php:220
msgid "Settings"
msgstr "Instellingen"
-#: classes/Gems/Default/RespondentAction.php:176
+#: classes/Gems/Default/RespondentAction.php:222
msgid "Has the respondent signed the informed consent letter?"
msgstr "Heeft de patiënt het \"informed consent\" formulier ondertekend?"
-#: classes/Gems/Default/RespondentAction.php:206
+#: classes/Gems/Default/RespondentAction.php:252
msgid "Comments"
msgstr "Opmerkingen"
-#: classes/Gems/Default/RespondentAction.php:207
+#: classes/Gems/Default/RespondentAction.php:253
msgid "Treatment"
msgstr "Behandeling"
-#: classes/Gems/Default/RespondentAction.php:235
+#: classes/Gems/Default/RespondentAction.php:281
msgid "Rejection code"
msgstr "Afkeuringscode"
-#: classes/Gems/Default/RespondentAction.php:242
+#: classes/Gems/Default/RespondentAction.php:288
msgid "Delete respondent"
msgstr "Verwijder patiënt"
-#: classes/Gems/Default/RespondentAction.php:274
+#: classes/Gems/Default/RespondentAction.php:320
msgid "Respondent deleted."
msgstr "Patiënt verwijderd"
-#: classes/Gems/Default/RespondentAction.php:278
+#: classes/Gems/Default/RespondentAction.php:324
msgid "Respondent tracks stopped."
msgstr "Trajecten van patiënt zijn gestopt."
-#: classes/Gems/Default/RespondentAction.php:282
+#: classes/Gems/Default/RespondentAction.php:328
msgid "Choose a reception code to delete."
msgstr "Kies een ontvangst code om te verwijderen."
-#: classes/Gems/Default/RespondentAction.php:331
+#: classes/Gems/Default/RespondentAction.php:422
msgid "respondent"
msgid_plural "respondents"
msgstr[0] "patiënt"
msgstr[1] "patiënten"
-#: classes/Gems/Default/RespondentAction.php:404
+#: classes/Gems/Default/RespondentAction.php:497
msgid "Please settle the informed consent form for this respondent."
msgstr "A.u.b. het informed consent formulier doornemen met deze patiënt"
-#: classes/Gems/Default/RespondentExportAction.php:74
+#: classes/Gems/Default/RespondentExportAction.php:61
msgid "Respondent number"
msgstr "Patiënt nummer"
-#: classes/Gems/Default/RespondentExportAction.php:78
+#: classes/Gems/Default/RespondentExportAction.php:65
msgid "Separate multiple respondents with a comma (,)"
msgstr "Scheid meerdere patienten met een comma (,)"
-#: classes/Gems/Default/RespondentExportAction.php:84
-msgid "Group surveys"
-msgstr "Groepeer vragenlijsten"
-
-#: classes/Gems/Default/RespondentExportAction.php:89
-msgid "Output format"
-msgstr "Uitvoerformaat"
-
-#: classes/Gems/Default/RespondentExportAction.php:131
-#, php-format
-msgid "Unable to run PDF conversion: \"%s\""
-msgstr "Kan PDF conversie niet starten: \"%s\""
-
-#: classes/Gems/Default/RespondentExportAction.php:169
-msgid "Round"
-msgstr "Ronde"
-
-#: classes/Gems/Default/RespondentExportAction.php:180
-msgid "Open"
-msgstr "Open"
-
-#: classes/Gems/Default/RespondentExportAction.php:183
-msgid "Completed"
-msgstr "Ingevuld"
-
-#: classes/Gems/Default/RespondentExportAction.php:189
-msgid "Missed"
-msgstr "Gemist"
-
-#: classes/Gems/Default/RespondentExportAction.php:191
-#: classes/Gems/Default/RespondentExportAction.php:193
-msgid "Future"
-msgstr "Toekomstig"
-
-#: classes/Gems/Default/RespondentExportAction.php:198
-msgid "Single Survey"
-msgstr "Losse vragenlijst"
-
-#: classes/Gems/Default/RespondentExportAction.php:244
-msgid "Enter the particulars concerning the assignment to this respondent."
-msgstr "Beschrijf de redenen om dit aan deze patiënt toe te wijzen."
-
-#: classes/Gems/Default/RespondentExportAction.php:245
-msgid "Assigned by"
-msgstr "Toewijzer"
-
-#: classes/Gems/Default/RespondentExportAction.php:246
-msgid "Start"
-msgstr "Aanvang"
-
-#: classes/Gems/Default/RespondentExportAction.php:250
-msgid "Comment"
-msgstr "Opmerkingen"
-
-#: classes/Gems/Default/RespondentExportAction.php:258
-msgid "Track information"
-msgstr "Traject informatie"
-
-#: classes/Gems/Default/RespondentExportAction.php:296
-#, php-format
-msgid "Unknown respondent %s"
-msgstr "Onbekende patiënt %s"
-
-#: classes/Gems/Default/RespondentExportAction.php:302
-#: classes/Gems/Default/RespondentExportAction.php:310
-msgid "Respondent information"
-msgstr "Patiënt informatie"
-
-#: classes/Gems/Default/RespondentExportAction.php:330
-msgid "Respondent report"
-msgstr "Patiënt rapportage"
-
-#: classes/Gems/Default/RespondentExportAction.php:334
-msgid "Report information"
-msgstr "Informatie over rapportage"
-
-#: classes/Gems/Default/RespondentExportAction.php:335
-msgid "Generated by"
-msgstr "Aangemaakt door"
-
-#: classes/Gems/Default/RespondentExportAction.php:337
-msgid "Generated on"
-msgstr "Aangemaakt op"
-
#: classes/Gems/Default/RespondentPlanAction.php:67
msgid "Show respondent"
msgstr "Toon patiënt"
@@ -2456,26 +2382,30 @@
msgid "Answered"
msgstr "Beantwoord"
+#: classes/Gems/Default/TokenPlanAction.php:327
+msgid "Missed"
+msgstr "Gemist"
+
#: classes/Gems/Default/TokenPlanAction.php:341
msgid "(all fillers)"
msgstr "(alle invullers)"
-#: classes/Gems/Default/TokenPlanAction.php:363
+#: classes/Gems/Default/TokenPlanAction.php:360
msgid "(all staff)"
msgstr "(alle medewerkers)"
-#: classes/Gems/Default/TokenPlanAction.php:474
+#: classes/Gems/Default/TokenPlanAction.php:471
msgid "+"
msgstr "+"
-#: classes/Gems/Default/TokenPlanAction.php:483
+#: classes/Gems/Default/TokenPlanAction.php:480
#: classes/Gems/Default/TrackAction.php:450
msgid "token"
msgid_plural "tokens"
msgstr[0] "kenmerk"
msgstr[1] "kenmerken"
-#: classes/Gems/Default/TokenPlanAction.php:488
+#: classes/Gems/Default/TokenPlanAction.php:485
msgid "Token planning"
msgstr "Per kenmerk plannen"
@@ -2548,32 +2478,48 @@
msgid "Available tracks"
msgstr "Beschikbare trajecten"
-#: classes/Gems/Default/TrackActionAbstract.php:171
+#: classes/Gems/Default/TrackActionAbstract.php:163
#, php-format
msgid "Token answers: %s"
msgstr "Kenmerk antwoorden: %s"
-#: classes/Gems/Default/TrackActionAbstract.php:197
+#: classes/Gems/Default/TrackActionAbstract.php:189
#, php-format
msgid "Adding the %s track to respondent %s"
msgstr "Traject %s toewijzen aan patiënt %s."
-#: classes/Gems/Default/TrackActionAbstract.php:303
+#: classes/Gems/Default/TrackActionAbstract.php:201
+msgid "Enter the particulars concerning the assignment to this respondent."
+msgstr "Beschrijf de redenen om dit aan deze patiënt toe te wijzen."
+
+#: classes/Gems/Default/TrackActionAbstract.php:202
+msgid "Assigned by"
+msgstr "Toewijzer"
+
+#: classes/Gems/Default/TrackActionAbstract.php:203
+msgid "Start"
+msgstr "Aanvang"
+
+#: classes/Gems/Default/TrackActionAbstract.php:208
+msgid "Comment"
+msgstr "Opmerkingen"
+
+#: classes/Gems/Default/TrackActionAbstract.php:295
#, php-format
msgid "Email %s %s"
msgstr "Email %s %s"
-#: classes/Gems/Default/TrackActionAbstract.php:309
+#: classes/Gems/Default/TrackActionAbstract.php:301
#, php-format
msgid "%s %s not found."
msgstr "%s %s niet gevonden."
-#: classes/Gems/Default/TrackActionAbstract.php:493
+#: classes/Gems/Default/TrackActionAbstract.php:481
#, php-format
msgid "Overview of %s track for respondent %s"
msgstr "Overzicht van het %s traject voor patiënt %s "
-#: classes/Gems/Default/TrackActionAbstract.php:497
+#: classes/Gems/Default/TrackActionAbstract.php:485
msgid "This track is currently not assigned to this respondent."
msgstr "Dit traject is nog niet aan deze patiënt toegewezen."
@@ -2790,6 +2736,10 @@
msgid "Survey cannot be taken at this moment."
msgstr "Deze vragenlijst kan op dit moment niet afgenomen worden."
+#: classes/Gems/Email/OneMailForm.php:55
+msgid "Round"
+msgstr "Ronde"
+
#: classes/Gems/Email/OneMailForm.php:58
msgid "Last contact"
msgstr "Contactdatum"
@@ -2826,6 +2776,19 @@
msgid "Format answers"
msgstr "Antwoorden opmaken"
+#: classes/Gems/Export/RespondentExport.php:128
+#, php-format
+msgid "Unable to run PDF conversion: \"%s\""
+msgstr "Kan PDF conversie niet starten: \"%s\""
+
+#: classes/Gems/Export/RespondentExport.php:193
+msgid "Single Survey"
+msgstr "Losse vragenlijst"
+
+#: classes/Gems/Export/RespondentExport.php:254
+msgid "Track information"
+msgstr "Traject informatie"
+
#: classes/Gems/Export/Spss.php:59
msgid "Which file"
msgstr "Kies bestand"
@@ -2936,15 +2899,15 @@
msgid "Check all assignments"
msgstr "Controleer alle toewijzingen"
-#: classes/Gems/Menu/SubMenuItem.php:380
+#: classes/Gems/Menu/SubMenuItem.php:410
msgid "New"
msgstr "Nieuw"
-#: classes/Gems/Menu/SubMenuItem.php:434
+#: classes/Gems/Menu/SubMenuItem.php:464
msgid "Export the current data set to Excel"
msgstr "Exporteer de huidige gegevens naar Excel"
-#: classes/Gems/Menu/SubMenuItem.php:438
+#: classes/Gems/Menu/SubMenuItem.php:468
msgid "Excel export"
msgstr "Excel export"
@@ -3117,6 +3080,36 @@
msgid "Answered surveys"
msgstr "Beantwoorde vragenlijsten"
+#: classes/Gems/Snippets/Export/ReportFooterSnippet.php:55
+msgid "Report generation finished."
+msgstr "Rapport is aangemaakt."
+
+#: classes/Gems/Snippets/Export/ReportHeaderSnippet.php:54
+msgid "Respondent report"
+msgstr "Patiënt rapportage"
+
+#: classes/Gems/Snippets/Export/ReportHeaderSnippet.php:58
+msgid "Report information"
+msgstr "Informatie over rapportage"
+
+#: classes/Gems/Snippets/Export/ReportHeaderSnippet.php:59
+msgid "Generated by"
+msgstr "Aangemaakt door"
+
+#: classes/Gems/Snippets/Export/ReportHeaderSnippet.php:61
+msgid "Generated on"
+msgstr "Aangemaakt op"
+
+#: classes/Gems/Snippets/Export/RespondentSnippet.php:75
+#, php-format
+msgid "Unknown respondent %s"
+msgstr "Onbekende patiënt %s"
+
+#: classes/Gems/Snippets/Export/RespondentSnippet.php:81
+#: classes/Gems/Snippets/Export/RespondentSnippet.php:89
+msgid "Respondent information"
+msgstr "Patiënt informatie"
+
#: classes/Gems/Task/Db/ExecutePatch.php:66
#, php-format
msgid "Executing patchlevel %d"
@@ -3191,6 +3184,20 @@
msgid "No tokens were changed."
msgstr "Geen kenmerken veranderd."
+#: classes/Gems/Tracker/Token.php:956
+msgid "Open"
+msgstr "Open"
+
+#: classes/Gems/Tracker/Token.php:959
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:200
+msgid "Completed"
+msgstr "Ingevuld"
+
+#: classes/Gems/Tracker/Token.php:967
+#: classes/Gems/Tracker/Token.php:969
+msgid "Future"
+msgstr "Toekomstig"
+
#: classes/Gems/Tracker/Batch/SynchronizeSourcesBatch.php:135
msgid "No surveys were changed."
msgstr "Geen vragenlijsten veranderd."
@@ -3361,27 +3368,27 @@
msgid "Enter tokens as %s."
msgstr "Kenmerk invoeren als %s."
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:216
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:197
msgid "Measure(d) on"
msgstr "Afname op"
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:220
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:201
msgid "Duration in seconds"
msgstr "Antwoordtijd (in sec.)"
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:221
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:202
msgid "Score"
msgstr "Score"
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:230
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:211
msgid "Assigned to"
msgstr "invuller"
-#: classes/Gems/Tracker/Model/TrackModel.php:118
+#: classes/Gems/Tracker/Model/TrackModel.php:99
msgid "Track Engine"
msgstr "Traject type"
-#: classes/Gems/Tracker/Model/TrackModel.php:123
+#: classes/Gems/Tracker/Mode...
[truncated message content] |
|
From: <gem...@li...> - 2012-06-26 13:56:16
|
Revision: 790
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=790&view=rev
Author: mennodekker
Date: 2012-06-26 13:56:06 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
Seems strange that min and max of slider and manual entry are different
Modified Paths:
--------------
trunk/library/classes/Gems/Default/TokenPlanAction.php
Modified: trunk/library/classes/Gems/Default/TokenPlanAction.php
===================================================================
--- trunk/library/classes/Gems/Default/TokenPlanAction.php 2012-06-26 13:13:53 UTC (rev 789)
+++ trunk/library/classes/Gems/Default/TokenPlanAction.php 2012-06-26 13:56:06 UTC (rev 790)
@@ -225,8 +225,8 @@
}
// Create date range elements
- $min = -91;
- $max = 91;
+ $min = $this->minPeriod;
+ $max = $this->maxPeriod;
$size = max(strlen($min), strlen($max));
$options = array(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-26 13:14:04
|
Revision: 789
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=789&view=rev
Author: matijsdejong
Date: 2012-06-26 13:13:53 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
Last step in multi organization display
- Respondent/MultiOrganizationTab.php displays a tabbed row of organizations at the top when a resp exist in more than 1 organization the user has access to
- gems__user_logins is now editable in respondent action as otherwise user id changes are not updated
- cached getRespondentOrganizations added to User
Small bug in TokenPlanAction.php: alt attribute not specified
Modified Paths:
--------------
trunk/library/classes/Gems/Default/RespondentAction.php
trunk/library/classes/Gems/Default/TokenPlanAction.php
trunk/library/classes/Gems/Model/RespondentModel.php
trunk/library/classes/Gems/User/User.php
trunk/library/classes/MUtil/Snippets/TabSnippetAbstract.php
trunk/library/snippets/Respondent/MultiOrganizationTab.php
Modified: trunk/library/classes/Gems/Default/RespondentAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RespondentAction.php 2012-06-26 11:05:22 UTC (rev 788)
+++ trunk/library/classes/Gems/Default/RespondentAction.php 2012-06-26 13:13:53 UTC (rev 789)
@@ -47,6 +47,7 @@
abstract class Gems_Default_RespondentAction extends Gems_Controller_BrowseEditAction implements Gems_Menu_ParameterSourceInterface
{
public $showSnippets = array(
+ 'Respondent_MultiOrganizationTab',
'RespondentDetailsSnippet',
'AddTracksSnippet',
'RespondentTokenTabsSnippet',
@@ -172,6 +173,9 @@
$bridge->addHidden( 'gr2o_id_organization');
$bridge->addHidden( $model->getKeyCopyName('gr2o_patient_nr'));
$bridge->addHidden( $model->getKeyCopyName('gr2o_id_organization'));
+ if (isset($data['gul_id_user'])) {
+ $bridge->addHidden('gul_id_user');
+ }
$bridge->addText( 'grs_ssn', 'label', $this->_('SSN'), 'size', 10, 'maxlength', 12)
->addValidator( new MUtil_Validate_Dutch_Burgerservicenummer())
@@ -364,11 +368,8 @@
$elements = parent::getAutoSearchElements($model, $data);
if ($model->isMultiOrganization()) {
- $availableOrganizations = $this->util->getDbLookup()->getOrganizationsWithRespondents();
- $allowedOrganizations = $this->loader->getCurrentUser()->getAllowedOrganizations();
+ $options = $this->loader->getCurrentUser()->getRespondentOrganizations();
- $options = array_intersect($availableOrganizations, $allowedOrganizations);
-
$elements[] = $this->_createSelectElement(MUtil_Model::REQUEST_ID2, $options, $this->_('(all organizations)'));
}
Modified: trunk/library/classes/Gems/Default/TokenPlanAction.php
===================================================================
--- trunk/library/classes/Gems/Default/TokenPlanAction.php 2012-06-26 11:05:22 UTC (rev 788)
+++ trunk/library/classes/Gems/Default/TokenPlanAction.php 2012-06-26 13:13:53 UTC (rev 789)
@@ -342,11 +342,8 @@
// Select organisation
if (($this->escort instanceof Gems_Project_Organization_MultiOrganizationInterface)) {
- $availableOrganizations = $this->util->getDbLookup()->getOrganizationsWithRespondents();
- $allowedOrganizations = $this->loader->getCurrentUser()->getAllowedOrganizations();
+ $options = $this->loader->getCurrentUser()->getRespondentOrganizations();
- $options = array_intersect($availableOrganizations, $allowedOrganizations);
-
$elements[] = $this->_createSelectElement('gto_id_organization', $options);
}
Modified: trunk/library/classes/Gems/Model/RespondentModel.php
===================================================================
--- trunk/library/classes/Gems/Model/RespondentModel.php 2012-06-26 11:05:22 UTC (rev 788)
+++ trunk/library/classes/Gems/Model/RespondentModel.php 2012-06-26 13:13:53 UTC (rev 789)
@@ -126,7 +126,7 @@
*/
public function addLoginCheck()
{
- $this->addLeftTable('gems__user_logins', array('gr2o_patient_nr' => 'gul_login', 'gr2o_id_organization' => 'gul_id_organization'), 'gul', false);
+ $this->addLeftTable('gems__user_logins', array('gr2o_patient_nr' => 'gul_login', 'gr2o_id_organization' => 'gul_id_organization'), 'gul');
$this->addColumn("CASE WHEN gul_id_user IS NULL OR gul_user_class = 'NoLogin' OR gul_can_login = 0 THEN 0 ELSE 1 END", 'has_login');
return $this;
Modified: trunk/library/classes/Gems/User/User.php
===================================================================
--- trunk/library/classes/Gems/User/User.php 2012-06-26 11:05:22 UTC (rev 788)
+++ trunk/library/classes/Gems/User/User.php 2012-06-26 13:13:53 UTC (rev 789)
@@ -854,6 +854,26 @@
}
/**
+ * Get an array of OrgId => Org Name for all allowed organizations that can have
+ * respondents for the current logged in user
+ *
+ * @return array
+ */
+ public function getRespondentOrganizations()
+ {
+
+ if (! $this->_hasVar('__allowedRespOrgs')) {
+ $availableOrganizations = $this->util->getDbLookup()->getOrganizationsWithRespondents();
+ $allowedOrganizations = $this->getAllowedOrganizations();
+
+ $this->_setVar('__allowedRespOrgs', array_intersect($availableOrganizations, $allowedOrganizations));
+ }
+ // MUtil_Echo::track($this->_getVar('__allowedOrgs'));
+
+ return $this->_getVar('__allowedRespOrgs');
+ }
+
+ /**
* Returns the current user role.
*
* @return string
Modified: trunk/library/classes/MUtil/Snippets/TabSnippetAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Snippets/TabSnippetAbstract.php 2012-06-26 11:05:22 UTC (rev 788)
+++ trunk/library/classes/MUtil/Snippets/TabSnippetAbstract.php 2012-06-26 13:13:53 UTC (rev 789)
@@ -3,7 +3,7 @@
/**
* Copyright (c) 2011, Erasmus MC
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
@@ -14,7 +14,7 @@
* * Neither the name of Erasmus MC nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -25,8 +25,8 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
+ *
+ *
* @package MUtil
* @subpackage Snippets
* @author Menoo Dekker <men...@er...>
@@ -36,9 +36,9 @@
*/
/**
- * Abstract class for quickly creating a tabbed bar, or rather a div that contains a number
+ * Abstract class for quickly creating a tabbed bar, or rather a div that contains a number
* of links, adding specific classes for display.
- *
+ *
* @package MUtil
* @subpackage Snippets
* @copyright Copyright (c) 2011 Erasmus MC
@@ -49,11 +49,11 @@
{
/**
* Optional standard url parts
- *
+ *
* @var array
*/
protected $baseurl = array();
-
+
/**
* Shortfix to add class attribute
*
@@ -63,12 +63,25 @@
/**
*
- * @var string
+ * @var string Id of the current tab
*/
+ protected $currentTab;
+
+ /**
+ *
+ * @var string Id of default tab
+ */
protected $defaultTab;
/**
+ * Show bar when there is only a single tab
*
+ * @var boolean
+ */
+ protected $displaySingleTab = false;
+
+ /**
+ *
* @var array
*/
protected $href = array();
@@ -80,10 +93,51 @@
*/
protected $request;
+ /**
+ *
+ * @var string Class attribute for active tab
+ */
protected $tabActiveClass = 'active';
+
+ /**
+ *
+ * @var string Class attribute for all tabs
+ */
protected $tabClass = 'tab';
- abstract protected function getParameterKey();
+ /**
+ * Return optionally the single parameter key which should left out for the default value,
+ * but is added for all other tabs.
+ *
+ * @return mixed
+ */
+ protected function getParameterKey()
+ {
+ return null;
+ }
+
+ /**
+ * Return the parameters that should be used for this tabId
+ *
+ * @param string $tabId
+ * @return array
+ */
+ protected function getParameterKeysFor($tabId)
+ {
+ $paramKey = $this->getParameterKey();
+
+ if ($paramKey && ($tabId != $this->defaultTab)) {
+ return array($paramKey => $tabId);
+ }
+
+ return array();
+ }
+
+ /**
+ * Function used to fill the tab bar
+ *
+ * @return array tabId => label
+ */
abstract protected function getTabs();
/**
@@ -96,37 +150,39 @@
*/
public function getHtmlOutput(Zend_View_Abstract $view)
{
- if (isset($parameters['baseurl']) && is_array($this->baseurl)) {
- $this->href = $this->href + $this->baseurl;
- }
+ $tabs = $this->getTabs();
- $param = $this->getParameterKey();
- $tabs = $this->getTabs();
+ if ($tabs && ($this->displaySingleTab || count($tabs) > 1)) {
+ // Let loose
+ if (isset($parameters['baseurl']) && is_array($this->baseurl)) {
+ $this->href = $this->href + $this->baseurl;
+ }
- // When empty, first is default
- if (null === $this->defaultTab) {
- reset($tabs);
- $this->defaultTab = key($tabs);
- }
+ // When empty, first is default
+ if (null === $this->defaultTab) {
+ reset($tabs);
+ $this->defaultTab = key($tabs);
+ }
+ if (null === $this->currentTab) {
+ $this->currentTab = $this->request->getParam($this->getParameterKey(), $this->defaultTab);
+ }
- $argFilter = $this->request->getParam($param);
- $argFilter = $argFilter ? $argFilter : $this->defaultTab;
+ $tabRow = MUtil_Html::create()->div();
- $tabRow = MUtil_Html::create()->div();
+ foreach ($tabs as $tabId => $content) {
- foreach ($tabs as $tabName => $content) {
- $this->href[$param] = ($tabName == $this->defaultTab) ? null : $tabName;
+ $div = $tabRow->div(array('class' => $this->tabClass));
- $div = $tabRow->div(array('class' => $this->tabClass));
- $div->a($this->href, $content);
+ $div->a($this->getParameterKeysFor($tabId) + $this->href, $content);
- if ($argFilter == $tabName) {
- $div->appendAttrib('class', $this->tabActiveClass);
+ if ($this->currentTab == $tabId) {
+ $div->appendAttrib('class', $this->tabActiveClass);
+ }
}
+
+ return $tabRow;
+ } else {
+ return null;
}
-
- return $tabRow;
}
-
-
}
Modified: trunk/library/snippets/Respondent/MultiOrganizationTab.php
===================================================================
--- trunk/library/snippets/Respondent/MultiOrganizationTab.php 2012-06-26 11:05:22 UTC (rev 788)
+++ trunk/library/snippets/Respondent/MultiOrganizationTab.php 2012-06-26 13:13:53 UTC (rev 789)
@@ -46,7 +46,7 @@
*/
class Respondent_MultiOrganizationTab extends MUtil_Snippets_TabSnippetAbstract
{
- protected $href = array('page' => null);
+ protected $href = array();
/**
* Required
@@ -56,6 +56,12 @@
protected $db;
/**
+ *
+ * @var array id specific hrefs
+ */
+ protected $hrefs;
+
+ /**
* Required
*
* @var Gems_Loader
@@ -69,26 +75,38 @@
*/
protected $respondentData;
- protected function getParameterKey()
+ /**
+ * Return the parameters that should be used for this tabId
+ *
+ * @param string $tabId
+ * @return array
+ */
+ protected function getParameterKeysFor($tabId)
{
- return 'id2';
+ return $this->hrefs[$tabId];
}
+ /**
+ * Function used to fill the tab bar
+ *
+ * @return array tabId => label
+ */
protected function getTabs()
{
$user = $this->loader->getCurrentUser();
- $orgs = $user->getAllowedOrganizations();
- $sql = "SELECT gr2o_patient_nr FROM gems__respondent2org WHERE gr2o_id_user = ? AND gr2o_id_organization = ?";
- $resp = $this->respondentData['grs_id_user'];
- // TODO:
- // Shows tabs only for existing respondents
- // Tabslinks should contain two parameters
- // No option for difference active / inactive
-
- foreach ($orgs as $orgId => $name) {
- if ($patientNr = $this->db->fetchOne($sql, array($resp, $orgId))) {
+ $sql = "SELECT gr2o_id_organization, gr2o_patient_nr FROM gems__respondent2org WHERE gr2o_id_user = ?";
+
+ $this->defaultTab = $user->getCurrentOrganizationId();
+ $this->currentTab = $this->request->getParam(MUtil_Model::REQUEST_ID2);
+
+ $allowedOrgs = $user->getRespondentOrganizations();
+ $existingOrgs = $this->db->fetchPairs($sql, $this->respondentData['grs_id_user']);
+
+ foreach ($allowedOrgs as $orgId => $name) {
+ if (isset($existingOrgs[$orgId])) {
$tabs[$orgId] = $name;
+ $this->hrefs[$orgId] = array(MUtil_Model::REQUEST_ID1 => $existingOrgs[$orgId], MUtil_Model::REQUEST_ID2 => $orgId);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-26 11:05:28
|
Revision: 788
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=788&view=rev
Author: mennodekker
Date: 2012-06-26 11:05:22 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
css print-fix
Modified Paths:
--------------
trunk/new_project/htdocs/gems/css/gems_print.css
Modified: trunk/new_project/htdocs/gems/css/gems_print.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems_print.css 2012-06-26 10:52:57 UTC (rev 787)
+++ trunk/new_project/htdocs/gems/css/gems_print.css 2012-06-26 11:05:22 UTC (rev 788)
@@ -33,6 +33,7 @@
table, tr, th, td {
border: 1px solid #000;
+ text-align: left;
}
table td.selectedColumn, table th.selectedColumn {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-26 10:53:03
|
Revision: 787
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=787&view=rev
Author: mennodekker
Date: 2012-06-26 10:52:57 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
Some extra css to help table printing
Modified Paths:
--------------
trunk/new_project/htdocs/gems/css/gems_print.css
Modified: trunk/new_project/htdocs/gems/css/gems_print.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems_print.css 2012-06-26 09:22:49 UTC (rev 786)
+++ trunk/new_project/htdocs/gems/css/gems_print.css 2012-06-26 10:52:57 UTC (rev 787)
@@ -2,7 +2,7 @@
@media print {
/* Setting font-size */
body, table { font-size: 9pt; }
-
+
body {
font-family: Arial,Verdana,Helvetica,Sans-serif;
}
@@ -14,6 +14,19 @@
p.description { display: inline; }
+ /* Some generic table printing stuff
+ *
+ * Chrome 19 seems to have issues printing tables when the total output is more than
+ * three pages, but maybe one day they will fix that. In the mean time the settings
+ * below will help printing of tables in FireFox, Opera and possibly others.
+ */
+ table { page-break-inside:auto; }
+ tr { page-break-inside:avoid; page-break-after:auto; }
+ td { page-break-inside:avoid; page-break-after:auto; }
+ thead { display:table-header-group; }
+ tfoot { display:table-footer-group; }
+ tbody { display: table-row-group; }
+
table {
border-collapse: collapse;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-26 09:22:55
|
Revision: 786
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=786&view=rev
Author: mennodekker
Date: 2012-06-26 09:22:49 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
improved display of tableforms in print
Modified Paths:
--------------
trunk/library/classes/Gems/Form/TableForm.php
trunk/library/classes/Gems/Tracker/SurveyModel.php
Modified: trunk/library/classes/Gems/Form/TableForm.php
===================================================================
--- trunk/library/classes/Gems/Form/TableForm.php 2012-06-26 09:22:13 UTC (rev 785)
+++ trunk/library/classes/Gems/Form/TableForm.php 2012-06-26 09:22:49 UTC (rev 786)
@@ -225,11 +225,16 @@
if ($this->loadDefaultDecoratorsIsDisabled()) {
return $this;
}
+
+ $class = $this->getAttrib('class');
+ if (empty($class)) {
+ $class = 'formTable';
+ }
$decorators = $this->getDecorators();
if (empty($decorators)) {
$this->addDecorator('FormElements')
- ->addDecorator(array('table' => 'HtmlTag'), array('tag' => 'table', 'class'=>'formTable'))
+ ->addDecorator(array('table' => 'HtmlTag'), array('tag' => 'table', 'class'=>$class))
->addDecorator(array('tab' => 'HtmlTag'), array('tag' => 'div', 'class' => 'displayGroup'))
->addDecorator('Form');
}
Modified: trunk/library/classes/Gems/Tracker/SurveyModel.php
===================================================================
--- trunk/library/classes/Gems/Tracker/SurveyModel.php 2012-06-26 09:22:13 UTC (rev 785)
+++ trunk/library/classes/Gems/Tracker/SurveyModel.php 2012-06-26 09:22:49 UTC (rev 786)
@@ -133,7 +133,8 @@
*/
public function loadFirst($filter = true, $sort = true)
{
- return reset($this->addAnswers(array(parent::loadFirst($filter, $sort))));
+ $result = $this->addAnswers(array(parent::loadFirst($filter, $sort)));
+ return reset($result);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-26 09:22:24
|
Revision: 785
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=785&view=rev
Author: mennodekker
Date: 2012-06-26 09:22:13 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
improved display of tableforms in print
Modified Paths:
--------------
trunk/new_project/htdocs/gems/css/gems_print.css
Modified: trunk/new_project/htdocs/gems/css/gems_print.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems_print.css 2012-06-25 08:41:31 UTC (rev 784)
+++ trunk/new_project/htdocs/gems/css/gems_print.css 2012-06-26 09:22:13 UTC (rev 785)
@@ -39,5 +39,10 @@
width: 100%;
}
+ .tab-displaygroup {
+ float: left;
+ margin-right: 3em;
+ }
+
.print-only { display: inline; }
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-25 08:41:38
|
Revision: 784
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=784&view=rev
Author: mennodekker
Date: 2012-06-25 08:41:31 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
Quickfix: throw error when requesting org that is not allowed
Modified Paths:
--------------
trunk/library/classes/Gems/Model/HiddenOrganizationModel.php
Modified: trunk/library/classes/Gems/Model/HiddenOrganizationModel.php
===================================================================
--- trunk/library/classes/Gems/Model/HiddenOrganizationModel.php 2012-06-25 08:37:12 UTC (rev 783)
+++ trunk/library/classes/Gems/Model/HiddenOrganizationModel.php 2012-06-25 08:41:31 UTC (rev 784)
@@ -55,6 +55,12 @@
/**
*
+ * @var Zend_Translate
+ */
+ protected $translate;
+
+ /**
+ *
* @var Gems_User_User
*/
protected $user;
@@ -100,6 +106,13 @@
unset($parameters[MUtil_Model::REQUEST_ID]);
}
+ if (isset($parameters[MUtil_Model::REQUEST_ID2]) &&
+ !array_key_exists($parameters[MUtil_Model::REQUEST_ID2], $this->user->getAllowedOrganizations())
+ ) {
+
+ throw new Exception($this->translate->_('Invalid organization.'));
+ }
+
return parent::applyParameters($parameters);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-25 08:37:18
|
Revision: 783
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=783&view=rev
Author: mennodekker
Date: 2012-06-25 08:37:12 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
fixed a warning
Modified Paths:
--------------
trunk/library/classes/GemsEscort.php
Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php 2012-06-22 12:25:39 UTC (rev 782)
+++ trunk/library/classes/GemsEscort.php 2012-06-25 08:37:12 UTC (rev 783)
@@ -876,6 +876,7 @@
$orgSwitch = MUtil_Html::create('div', array('id' => 'organizations'));
$currentId = $user->getCurrentOrganizationId();
$params = $this->request->getParams();
+ unset($params['error_handler']); // If present, this is an object and causes a warning
unset($params[Gems_Util_RequestCache::RESET_PARAM]);
$currentUri = $this->view->url($params, null, true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-06-22 12:25:45
|
Revision: 782
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=782&view=rev
Author: matijsdejong
Date: 2012-06-22 12:25:39 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
Fixed bug in survey return urls and made the hidden model slightly more adapted to the current situation
Modified Paths:
--------------
trunk/library/classes/Gems/Model/HiddenOrganizationModel.php
trunk/library/classes/Gems/Tracker/Token.php
Modified: trunk/library/classes/Gems/Model/HiddenOrganizationModel.php
===================================================================
--- trunk/library/classes/Gems/Model/HiddenOrganizationModel.php 2012-06-22 10:46:48 UTC (rev 781)
+++ trunk/library/classes/Gems/Model/HiddenOrganizationModel.php 2012-06-22 12:25:39 UTC (rev 782)
@@ -83,7 +83,7 @@
{
if ($parameters) {
// Allow use when passed only an ID value
- if (isset($parameters[MUtil_Model::REQUEST_ID])) {
+ if (isset($parameters[MUtil_Model::REQUEST_ID]) && (! isset($parameters[MUtil_Model::REQUEST_ID1], $parameters[MUtil_Model::REQUEST_ID2]))) {
$id = $parameters[MUtil_Model::REQUEST_ID];
$keys = $this->getKeys();
Modified: trunk/library/classes/Gems/Tracker/Token.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Token.php 2012-06-22 10:46:48 UTC (rev 781)
+++ trunk/library/classes/Gems/Tracker/Token.php 2012-06-22 12:25:39 UTC (rev 782)
@@ -367,6 +367,10 @@
// Do not show the base url as it is in $currentUri
$surveyReturn['NoBase'] = true;
+ // Add route reset to prevet the current parameters to be
+ // added to the url.
+ $surveyReturn['RouteReset'] = true;
+
return $currentUri . MUtil_Html::urlString($surveyReturn);
// MUtil_Echo::track($currentUri . MUtil_Html::urlString($surveyReturn));
}
@@ -1084,6 +1088,8 @@
$values['gto_by'] = $userId;
$values['gto_return_url'] = $this->calculateReturnUrl();
+ // MUtil_Echo::track($values);
+
$this->_updateToken($values, $userId);
$this->handleBeforeAnswering();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
