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...> - 2011-10-17 11:22:57
|
Revision: 105
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=105&view=rev
Author: mennodekker
Date: 2011-10-17 11:22:46 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
Removed some duplicate code that was replaced by a method
Modified Paths:
--------------
trunk/library/classes/Gems/Event/EventCalculations.php
Modified: trunk/library/classes/Gems/Event/EventCalculations.php
===================================================================
--- trunk/library/classes/Gems/Event/EventCalculations.php 2011-10-14 15:06:50 UTC (rev 104)
+++ trunk/library/classes/Gems/Event/EventCalculations.php 2011-10-17 11:22:46 UTC (rev 105)
@@ -209,16 +209,8 @@
protected function sumInt(array $tokenAnswers, $fieldNames)
{
if (is_string($fieldNames)) {
- $startName = $fieldNames;
- $fieldNames = array();
-
- foreach ($tokenAnswers as $fieldName => $value) {
- if (strpos($fieldName, $startName) !== false) {
- $fieldNames[] = $fieldName;
- }
- }
+ $fieldNames = $this->_arrayFindName($tokenAnswers, $fieldNames);
}
- // MUtil_Echo::track($fieldNames);
$sum = 0;
foreach ($fieldNames as $name) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-10-14 15:07:01
|
Revision: 104
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=104&view=rev
Author: matijsdejong
Date: 2011-10-14 15:06:50 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
Redo & copy answers #16
Modified Paths:
--------------
trunk/library/classes/Gems/Default/ReceptionAction.php
trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9Database.php
trunk/library/classes/Gems/Tracker/Token.php
trunk/library/classes/Gems/Util/Translated.php
trunk/library/configs/db/tables/gems__reception_codes.10.sql
trunk/library/languages/default-en.mo
trunk/library/languages/default-en.po
trunk/library/languages/default-nl.mo
trunk/library/languages/default-nl.po
trunk/library/snippets/DeleteTrackTokenSnippet.php
Modified: trunk/library/classes/Gems/Default/ReceptionAction.php
===================================================================
--- trunk/library/classes/Gems/Default/ReceptionAction.php 2011-10-14 10:43:36 UTC (rev 103)
+++ trunk/library/classes/Gems/Default/ReceptionAction.php 2011-10-14 15:06:50 UTC (rev 104)
@@ -1,10 +1,9 @@
<?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
@@ -15,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
@@ -26,35 +25,34 @@
* 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.
- */
-
-/**
- *
- * @author Matijs de Jong
- * @since 1.0
- * @version 1.1
- * @package Gems
+ *
+ *
+ * @package Gems
* @subpackage Default
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
/**
- *
- * @author Matijs de Jong
- * @package Gems
+ * Controller for maintaining reception codes.
+ *
+ * @package Gems
* @subpackage Default
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
*/
class Gems_Default_ReceptionAction extends Gems_Controller_BrowseEditAction
{
- public $sortKey = array('grc_active' => SORT_DESC,
- 'grc_success' => SORT_DESC,
- 'grc_for_respondents' => SORT_DESC,
- 'grc_for_tracks' => SORT_DESC,
- 'grc_for_surveys' => SORT_DESC,
- 'grc_description' => SORT_ASC);
-
- public function addFormElements(MUtil_Model_FormBridge $bridge, MUtil_Model_ModelAbstract $model, array $data, $new = false) {
+ public $sortKey = array('grc_id_reception_code' => SORT_ASC);
+
+ public function addFormElements(MUtil_Model_FormBridge $bridge, MUtil_Model_ModelAbstract $model, array $data, $new = false)
+ {
$model->set('desc1', 'elementClass', 'Html', 'order', 55, 'label', $this->_('Can be assigned to'));
$model->set('desc2', 'elementClass', 'Html', 'order', 85, 'label', $this->_('Additional action'));
+
parent::addFormElements($bridge, $model, $data, $new);
}
@@ -101,9 +99,9 @@
'elementClass', 'CheckBox',
'description', $this->_('This reception code can be assigned to a survey.'));
$model->set('grc_redo_survey', 'label', $this->_('Redo survey'),
- 'multiOptions', $yesNo ,
- 'elementClass', 'CheckBox',
- 'description', $this->_('Redo a survey on this reception code.'));
+ 'multiOptions', $this->util->getTranslated()->getRedoCodes(),
+ 'elementClass', 'Select',
+ 'description', $this->_('Redo a survey on this reception code.'));
$model->set('grc_overwrite_answers', 'label', $this->_('Overwrite ansers'),
'multiOptions', $yesNo ,
'elementClass', 'CheckBox',
Modified: trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9Database.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9Database.php 2011-10-14 10:43:36 UTC (rev 103)
+++ trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9Database.php 2011-10-14 15:06:50 UTC (rev 104)
@@ -106,6 +106,28 @@
protected $util;
/**
+ * Filters an answers array, return only those fields that where answered by the user.
+ *
+ * @param int $sourceSurveyId Survey ID
+ * @param array $answers
+ * @return array
+ */
+ protected function _filterAnswersOnly($sourceSurveyId, array $answers)
+ {
+ $s = $sourceSurveyId . 'X';
+ $l = strlen($s);
+
+ $results = array();
+ foreach ($answers as $key => $value) {
+ if (substr($key, 0, $l) == $s) {
+ $results[$key] = $value;
+ }
+ }
+
+ return $results;
+ }
+
+ /**
* Return a fieldmap object
*
* @param int $sourceSurveyId Survey ID
@@ -822,6 +844,7 @@
$lsTokenId = $this->_getToken($token->getTokenId());
$answers = $this->_getFieldMap($sourceSurveyId)->mapTitlesToKeys($answers);
+ $answers = $this->_filterAnswersOnly($sourceSurveyId, $answers);
if ($lsDb->fetchOne("SELECT token FROM $lsTab WHERE token = ?", $lsTokenId)) {
$where = $lsDb->quoteInto("token = ?", $lsTokenId);
Modified: trunk/library/classes/Gems/Tracker/Token.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Token.php 2011-10-14 10:43:36 UTC (rev 103)
+++ trunk/library/classes/Gems/Tracker/Token.php 2011-10-14 15:06:50 UTC (rev 104)
@@ -987,13 +987,27 @@
$this->_ensureReceptionCode();
}
- return $this->_gemsData['grc_redo_survey'];
+ return (boolean) $this->_gemsData['grc_redo_survey'];
}
/**
+ * True if the reception code is a redo survey copy.
*
* @return boolean
*/
+ public function hasRedoCopyCode()
+ {
+ if (! isset($this->_gemsData['grc_redo_survey'])) {
+ $this->_ensureReceptionCode();
+ }
+
+ return Gems_Util_Translated::REDO_COPY == $this->_gemsData['grc_redo_survey'];
+ }
+
+ /**
+ *
+ * @return boolean
+ */
public function hasSuccesCode()
{
if (! isset($this->_gemsData['grc_success'])) {
Modified: trunk/library/classes/Gems/Util/Translated.php
===================================================================
--- trunk/library/classes/Gems/Util/Translated.php 2011-10-14 10:43:36 UTC (rev 103)
+++ trunk/library/classes/Gems/Util/Translated.php 2011-10-14 15:06:50 UTC (rev 104)
@@ -2,7 +2,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
@@ -13,7 +13,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
@@ -42,6 +42,10 @@
*/
class Gems_Util_Translated extends Gems_Registry_TargetAbstract
{
+ const REDO_NONE = 0;
+ const REDO_ONLY = 1;
+ const REDO_COPY = 2;
+
protected $phpDateFormatString = 'd-m-Y';
/**
@@ -78,7 +82,7 @@
}
}
self::$emptyDropdownArray = array('' => $this->_('-'));
-
+
return parent::checkRegistryRequestsAnswers();
}
@@ -128,11 +132,11 @@
if ($dateTimeValue) {
//$dateTime = strtotime($dateTimeValue);
// MUtil_Echo::track($dateTimeValue, date('c', $dateTime), $dateTime / 86400, date('c', time()), time() / 86400);
- // TODO: Timezone seems to screw this one up
- //$days = floor($dateTime / 86400) - floor(time() / 86400); // 86400 = 24*60*60
+ // TODO: Timezone seems to screw this one up
+ //$days = floor($dateTime / 86400) - floor(time() / 86400); // 86400 = 24*60*60
$dateTime = new MUtil_Date($dateTimeValue, Zend_Date::ISO_8601);
$days = $dateTime->diffDays(new MUtil_Date());
-
+
switch ($days) {
case -2:
return $this->_('2 days ago');
@@ -167,7 +171,7 @@
/**
* Get a translated empty value for usage in dropdowns
- *
+ *
* On instantiation of the class via Gems_Loader this variable will be populated
* in checkRegistryRequestsAnswers
*
@@ -193,6 +197,27 @@
return array('M' => $this->_('Mr.'), 'F' => $this->_('Mrs.'), 'U' => $this->_('Mr./Mrs.'));
}
+ /**
+ * Return the field values for the redo code.
+ *
+ * <ul><li>0: do not redo</li>
+ * <li>1: redo but do not copy answers</li>
+ * <li>2: redo and copy answers</li></ul>
+ *
+ * @staticvar array $data
+ * @return array
+ */
+ public function getRedoCodes()
+ {
+ static $data;
+
+ if (! $data) {
+ $data = array(self::REDO_NONE => $this->_('No'), self::REDO_ONLY => $this->_('Yes (forget answers)'), self::REDO_COPY => $this->_('Yes (keep answers)'));
+ }
+
+ return $data;
+ }
+
public function getYesNo()
{
static $data;
Modified: trunk/library/configs/db/tables/gems__reception_codes.10.sql
===================================================================
--- trunk/library/configs/db/tables/gems__reception_codes.10.sql 2011-10-14 10:43:36 UTC (rev 103)
+++ trunk/library/configs/db/tables/gems__reception_codes.10.sql 2011-10-14 15:06:50 UTC (rev 104)
@@ -4,14 +4,14 @@
grc_description varchar(40) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
grc_success boolean not null default 0,
-
- grc_for_surveys boolean not null default 0,
- grc_redo_survey boolean not null default 0,
- grc_for_tracks boolean not null default 0,
- grc_for_respondents boolean not null default 0,
- grc_overwrite_answers boolean not null default 0,
- grc_active boolean not null default 1,
+ grc_for_surveys boolean not null default 0,
+ grc_redo_survey tinyint not null default 0,
+ grc_for_tracks boolean not null default 0,
+ grc_for_respondents boolean not null default 0,
+ grc_overwrite_answers boolean not null default 0,
+ grc_active boolean not null default 1,
+
grc_changed timestamp not null default current_timestamp on update current_timestamp,
grc_changed_by bigint unsigned not null,
grc_created timestamp not null,
@@ -24,9 +24,9 @@
auto_increment = 1
CHARACTER SET 'utf8' COLLATE 'utf8_general_ci';
-INSERT INTO gems__reception_codes (grc_id_reception_code, grc_description, grc_success,
- grc_for_surveys, grc_redo_survey, grc_for_tracks, grc_for_respondents, grc_active,
- grc_changed, grc_changed_by, grc_created, grc_created_by)
+INSERT INTO gems__reception_codes (grc_id_reception_code, grc_description, grc_success,
+ grc_for_surveys, grc_redo_survey, grc_for_tracks, grc_for_respondents, grc_active,
+ grc_changed, grc_changed_by, grc_created, grc_created_by)
VALUES
('OK', '', 1, 1, 0, 1, 1, 1, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
('skip', 'Skipped by calculation', 0, 1, 0, 0, 0, 0, 0, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1);
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2011-10-14 10:43:36 UTC (rev 103)
+++ trunk/library/languages/default-en.po 2011-10-14 15:06:50 UTC (rev 104)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: Pulse EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-11 18:18+0100\n"
+"POT-Creation-Date: 2011-10-14 17:00+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -32,34 +32,34 @@
msgid "version"
msgstr "version"
-#: classes/GemsEscort.php:1421
+#: classes/GemsEscort.php:1410
msgid "Take note: your session has expired, your inputs where not saved. Please check the input data and try again"
msgstr "Take note: your session has expired, your inputs where not saved. Please check the input data and try again"
-#: classes/GemsEscort.php:1543
+#: classes/GemsEscort.php:1532
msgid "No access to site."
msgstr "No access to site."
-#: classes/GemsEscort.php:1545
-#: classes/GemsEscort.php:1581
+#: classes/GemsEscort.php:1534
+#: classes/GemsEscort.php:1570
msgid "You have no access to this site."
msgstr "You have no access to this site."
-#: classes/GemsEscort.php:1561
+#: classes/GemsEscort.php:1550
msgid "No access to page"
msgstr "No access to page"
-#: classes/GemsEscort.php:1563
+#: classes/GemsEscort.php:1552
#, 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:1557
#: classes/GemsEscort.php:1568
-#: classes/GemsEscort.php:1579
msgid "You are no longer logged in."
msgstr "You are no longer logged in."
-#: classes/GemsEscort.php:1569
+#: classes/GemsEscort.php:1558
msgid "You must login to access this page."
msgstr "You must login to access this page."
@@ -165,158 +165,153 @@
msgstr "Roles"
#: classes/Gems/Menu.php:196
-msgid "ACL"
-msgstr "ACL"
-
-#: classes/Gems/Menu.php:197
-#: classes/Gems/Menu.php:338
+#: classes/Gems/Menu.php:337
msgid "Assigned"
msgstr "Assigned"
-#: classes/Gems/Menu.php:198
+#: classes/Gems/Menu.php:197
msgid "Privileges"
msgstr "Privileges"
-#: classes/Gems/Menu.php:201
+#: classes/Gems/Menu.php:200
msgid "Groups"
msgstr "Groups"
-#: classes/Gems/Menu.php:204
+#: classes/Gems/Menu.php:203
msgid "Organizations"
msgstr "Organizations"
-#: classes/Gems/Menu.php:207
-#: classes/Gems/Menu.php:524
+#: classes/Gems/Menu.php:206
msgid "Staff"
msgstr "Staff"
-#: classes/Gems/Menu.php:210
+#: classes/Gems/Menu.php:209
msgid "Logging"
msgstr "Logging"
-#: classes/Gems/Menu.php:214
+#: classes/Gems/Menu.php:213
msgid "Maintenance"
msgstr "Maintenance"
-#: classes/Gems/Menu.php:228
+#: classes/Gems/Menu.php:227
#, php-format
msgid "Stand-alone privilige: %s"
msgstr "Stand-alone privilige: %s"
-#: classes/Gems/Menu.php:235
+#: classes/Gems/Menu.php:234
msgid "Logon"
msgstr "Logon"
-#: classes/Gems/Menu.php:236
+#: classes/Gems/Menu.php:235
msgid "Lost password"
msgstr "Lost password"
-#: classes/Gems/Menu.php:237
+#: classes/Gems/Menu.php:236
msgid "Your account"
msgstr "Your account"
-#: classes/Gems/Menu.php:238
+#: classes/Gems/Menu.php:237
msgid "Activity overview"
msgstr "Activity overview"
-#: classes/Gems/Menu.php:239
+#: classes/Gems/Menu.php:238
msgid "Change password"
msgstr "Change password"
-#: classes/Gems/Menu.php:240
-#: classes/Gems/Menu.php:280
-#: classes/Gems/Menu.php:315
+#: classes/Gems/Menu.php:239
+#: classes/Gems/Menu.php:279
+#: classes/Gems/Menu.php:314
msgid "Token"
msgstr "Token"
-#: classes/Gems/Menu.php:241
+#: classes/Gems/Menu.php:240
msgid "Logoff"
msgstr "Logoff"
-#: classes/Gems/Menu.php:276
+#: classes/Gems/Menu.php:275
msgid "Track"
msgstr "Track"
-#: classes/Gems/Menu.php:283
-#: classes/Gems/Menu.php:303
-#: classes/Gems/Menu.php:334
+#: classes/Gems/Menu.php:282
+#: classes/Gems/Menu.php:302
+#: classes/Gems/Menu.php:333
msgid "Add"
msgstr "Add"
-#: classes/Gems/Menu.php:287
-#: classes/Gems/Menu.php:370
+#: classes/Gems/Menu.php:286
+#: classes/Gems/Menu.php:369
msgid "Preview"
msgstr "Preview"
-#: classes/Gems/Menu.php:294
+#: classes/Gems/Menu.php:293
msgid "Tracks"
msgstr "Tracks"
-#: classes/Gems/Menu.php:307
+#: classes/Gems/Menu.php:306
msgid "Assignments"
msgstr "Assignments"
-#: classes/Gems/Menu.php:311
+#: classes/Gems/Menu.php:310
msgid "Show"
msgstr "Show"
-#: classes/Gems/Menu.php:319
+#: classes/Gems/Menu.php:318
msgid "Edit"
msgstr "Edit"
-#: classes/Gems/Menu.php:323
+#: classes/Gems/Menu.php:322
msgid "Delete"
msgstr "Delete"
-#: classes/Gems/Menu.php:328
+#: classes/Gems/Menu.php:327
msgid "Surveys"
msgstr "Surveys"
-#: classes/Gems/Menu.php:360
+#: classes/Gems/Menu.php:359
msgid "Fill in"
msgstr "Fill in"
-#: classes/Gems/Menu.php:364
+#: classes/Gems/Menu.php:363
msgid "Print PDF"
msgstr "Print PDF"
-#: classes/Gems/Menu.php:367
+#: classes/Gems/Menu.php:366
msgid "E-Mail now!"
msgstr "E-Mail now!"
-#: classes/Gems/Menu.php:373
+#: classes/Gems/Menu.php:372
msgid "Answers"
msgstr "Answers"
-#: classes/Gems/Menu.php:511
+#: classes/Gems/Menu.php:510
msgid "Respondents"
msgstr "Patients"
-#: classes/Gems/Menu.php:514
+#: classes/Gems/Menu.php:513
msgid "Overview"
msgstr "Overview"
-#: classes/Gems/Menu.php:521
+#: classes/Gems/Menu.php:520
msgid "Project"
msgstr "Project"
-#: classes/Gems/Menu.php:527
+#: classes/Gems/Menu.php:523
msgid "Setup"
msgstr "Setup"
-#: classes/Gems/Menu.php:530
+#: classes/Gems/Menu.php:526
msgid "Mail"
msgstr "Mail"
-#: classes/Gems/Menu.php:533
+#: classes/Gems/Menu.php:529
msgid "Track Builder"
msgstr "Track Builder"
-#: classes/Gems/Menu.php:542
+#: classes/Gems/Menu.php:538
msgid "Contact"
msgstr "Contact"
-#: classes/Gems/Menu.php:555
+#: classes/Gems/Menu.php:551
msgid "Changelog"
msgstr "Changelog"
@@ -380,89 +375,89 @@
msgid "Checks performed"
msgstr "Checks performed"
-#: classes/Gems/Controller/BrowseEditAction.php:342
+#: classes/Gems/Controller/BrowseEditAction.php:344
#, php-format
msgid "New %s..."
msgstr "New %s..."
-#: classes/Gems/Controller/BrowseEditAction.php:374
+#: classes/Gems/Controller/BrowseEditAction.php:376
#, php-format
msgid "Delete %s"
msgstr "Delete %s"
-#: classes/Gems/Controller/BrowseEditAction.php:378
+#: classes/Gems/Controller/BrowseEditAction.php:380
#, php-format
msgid "%2$u %1$s deleted"
msgstr "%2$u %1$s deleted"
-#: classes/Gems/Controller/BrowseEditAction.php:392
+#: classes/Gems/Controller/BrowseEditAction.php:394
#, php-format
msgid "Edit %s"
msgstr "Edit %s"
-#: classes/Gems/Controller/BrowseEditAction.php:489
+#: classes/Gems/Controller/BrowseEditAction.php:491
msgid "Free search text"
msgstr "Free search text"
-#: classes/Gems/Controller/BrowseEditAction.php:560
+#: classes/Gems/Controller/BrowseEditAction.php:562
msgid "Search"
msgstr "Search"
-#: classes/Gems/Controller/BrowseEditAction.php:576
+#: classes/Gems/Controller/BrowseEditAction.php:578
#, php-format
msgid "No %s found"
msgstr "No %s found"
-#: classes/Gems/Controller/BrowseEditAction.php:649
+#: classes/Gems/Controller/BrowseEditAction.php:651
#, php-format
msgid "No %s found."
msgstr "No %s found."
-#: classes/Gems/Controller/BrowseEditAction.php:764
+#: classes/Gems/Controller/BrowseEditAction.php:766
msgid "Are you sure?"
msgstr "Are you sure?"
-#: classes/Gems/Controller/BrowseEditAction.php:780
+#: classes/Gems/Controller/BrowseEditAction.php:782
msgid "Yes"
msgstr "Yes"
-#: classes/Gems/Controller/BrowseEditAction.php:781
+#: classes/Gems/Controller/BrowseEditAction.php:783
msgid "No"
msgstr "No"
-#: classes/Gems/Controller/BrowseEditAction.php:834
+#: classes/Gems/Controller/BrowseEditAction.php:836
#, php-format
msgid "Unknown %s requested"
msgstr "Unknown %s requested"
-#: classes/Gems/Controller/BrowseEditAction.php:857
+#: classes/Gems/Controller/BrowseEditAction.php:859
#, php-format
msgid "New %1$s..."
msgstr "New %1$s..."
-#: classes/Gems/Controller/BrowseEditAction.php:865
+#: classes/Gems/Controller/BrowseEditAction.php:867
msgid "Save"
msgstr "Save"
-#: classes/Gems/Controller/BrowseEditAction.php:901
+#: classes/Gems/Controller/BrowseEditAction.php:903
#, php-format
msgid "%2$u %1$s saved"
msgstr "%2$u %1$s saved"
-#: classes/Gems/Controller/BrowseEditAction.php:904
+#: classes/Gems/Controller/BrowseEditAction.php:906
msgid "No changes to save."
msgstr "No changes to save."
-#: classes/Gems/Controller/BrowseEditAction.php:913
+#: classes/Gems/Controller/BrowseEditAction.php:915
msgid "Input error! No changes saved!"
msgstr "Input error! No changes saved!"
-#: classes/Gems/Controller/BrowseEditAction.php:941
+#: classes/Gems/Controller/BrowseEditAction.php:943
#, php-format
msgid "Show %s"
msgstr "Show %s"
-#: classes/Gems/Controller/BrowseEditAction.php:948
+#: classes/Gems/Controller/BrowseEditAction.php:950
#, php-format
msgid "Unknown %s."
msgstr "Unknown %s."
@@ -944,20 +939,20 @@
msgid "Export data"
msgstr "Export data"
-#: classes/Gems/Default/ExportAction.php:161
+#: classes/Gems/Default/ExportAction.php:155
msgid "Survey"
msgstr "Survey"
-#: classes/Gems/Default/ExportAction.php:178
+#: classes/Gems/Default/ExportAction.php:170
#, php-format
msgid "%s records found."
msgstr "%s records found."
-#: classes/Gems/Default/ExportAction.php:182
+#: classes/Gems/Default/ExportAction.php:174
msgid "Organization"
msgstr "Organization"
-#: classes/Gems/Default/ExportAction.php:190
+#: classes/Gems/Default/ExportAction.php:183
msgid "Export to"
msgstr "Export to"
@@ -1271,12 +1266,12 @@
#: classes/Gems/Default/OptionAction.php:73
#: classes/Gems/Default/OrganizationAction.php:128
#: classes/Gems/Default/RespondentAction.php:173
-#: classes/Gems/Default/StaffAction.php:193
+#: classes/Gems/Default/StaffAction.php:188
msgid "Language"
msgstr "Language"
#: classes/Gems/Default/OptionAction.php:74
-#: classes/Gems/Default/StaffAction.php:194
+#: classes/Gems/Default/StaffAction.php:189
msgid "Logout on survey"
msgstr "Logout on survey"
@@ -1560,71 +1555,71 @@
msgid "Track %s does not exist."
msgstr "Track %s does not exist."
-#: classes/Gems/Default/ReceptionAction.php:56
+#: classes/Gems/Default/ReceptionAction.php:53
msgid "Can be assigned to"
msgstr "Can be assigned to"
-#: classes/Gems/Default/ReceptionAction.php:57
+#: classes/Gems/Default/ReceptionAction.php:54
msgid "Additional action"
msgstr "Additional action"
-#: classes/Gems/Default/ReceptionAction.php:79
+#: classes/Gems/Default/ReceptionAction.php:77
msgid "Code"
msgstr "Code"
-#: classes/Gems/Default/ReceptionAction.php:82
+#: classes/Gems/Default/ReceptionAction.php:80
msgid "Is success code"
msgstr "Is success code"
-#: classes/Gems/Default/ReceptionAction.php:86
+#: classes/Gems/Default/ReceptionAction.php:84
msgid "This reception code is a success code."
msgstr "This reception code is a success code."
-#: classes/Gems/Default/ReceptionAction.php:90
+#: classes/Gems/Default/ReceptionAction.php:88
msgid "Only active codes can be selected."
msgstr "Only active codes can be selected."
-#: classes/Gems/Default/ReceptionAction.php:91
+#: classes/Gems/Default/ReceptionAction.php:89
msgid "For respondents"
msgstr "For patients"
-#: classes/Gems/Default/ReceptionAction.php:94
+#: classes/Gems/Default/ReceptionAction.php:92
msgid "This reception code can be assigned to a respondent."
msgstr "This reception code can be assigned to a respondent."
-#: classes/Gems/Default/ReceptionAction.php:95
+#: classes/Gems/Default/ReceptionAction.php:93
msgid "For tracks"
msgstr "For tracks"
-#: classes/Gems/Default/ReceptionAction.php:98
+#: classes/Gems/Default/ReceptionAction.php:96
msgid "This reception code can be assigned to a track."
msgstr "This reception code can be assigned to a track."
-#: classes/Gems/Default/ReceptionAction.php:99
+#: classes/Gems/Default/ReceptionAction.php:97
msgid "For surveys"
msgstr "For surveys"
-#: classes/Gems/Default/ReceptionAction.php:102
+#: classes/Gems/Default/ReceptionAction.php:100
msgid "This reception code can be assigned to a survey."
msgstr "This reception code can be assigned to a survey."
-#: classes/Gems/Default/ReceptionAction.php:103
+#: classes/Gems/Default/ReceptionAction.php:101
msgid "Redo survey"
msgstr "Redo survey"
-#: classes/Gems/Default/ReceptionAction.php:106
+#: classes/Gems/Default/ReceptionAction.php:104
msgid "Redo a survey on this reception code."
msgstr "Redo a survey on this reception code."
-#: classes/Gems/Default/ReceptionAction.php:107
+#: classes/Gems/Default/ReceptionAction.php:105
msgid "Overwrite ansers"
msgstr "Overwrite ansers"
-#: classes/Gems/Default/ReceptionAction.php:110
+#: classes/Gems/Default/ReceptionAction.php:108
msgid "Remove the consent from already answered surveys."
msgstr "Remove the consent from already answered surveys."
-#: classes/Gems/Default/ReceptionAction.php:128
+#: classes/Gems/Default/ReceptionAction.php:126
msgid "reception code"
msgid_plural "reception codes"
msgstr[0] "reception code"
@@ -1745,48 +1740,40 @@
msgid "Respondent planning"
msgstr "Respondent planning"
-#: classes/Gems/Default/RoleAction.php:58
-msgid "Access Control Lists"
-msgstr "Access Control Lists"
-
-#: classes/Gems/Default/RoleAction.php:59
-msgid "ACL's"
-msgstr "ACL's"
-
-#: classes/Gems/Default/RoleAction.php:172
-#: classes/Gems/Default/RoleAction.php:213
+#: classes/Gems/Default/RoleAction.php:166
+#: classes/Gems/Default/RoleAction.php:207
msgid "Parents"
msgstr "Parents"
-#: classes/Gems/Default/RoleAction.php:191
+#: classes/Gems/Default/RoleAction.php:185
msgid "role"
msgid_plural "roles"
msgstr[0] "role"
msgstr[1] "roles"
-#: classes/Gems/Default/RoleAction.php:196
+#: classes/Gems/Default/RoleAction.php:190
msgid "Administrative roles"
msgstr "Administrative roles"
-#: classes/Gems/Default/RoleAction.php:214
-#: classes/Gems/Default/RoleAction.php:230
+#: classes/Gems/Default/RoleAction.php:208
+#: classes/Gems/Default/RoleAction.php:224
msgid "Allowed"
msgstr "Allowed"
-#: classes/Gems/Default/RoleAction.php:215
-#: classes/Gems/Default/RoleAction.php:231
+#: classes/Gems/Default/RoleAction.php:209
+#: classes/Gems/Default/RoleAction.php:225
msgid "Denied"
msgstr "Denied"
-#: classes/Gems/Default/RoleAction.php:219
+#: classes/Gems/Default/RoleAction.php:213
msgid "Project role overview"
msgstr "Project role overview"
-#: classes/Gems/Default/RoleAction.php:229
+#: classes/Gems/Default/RoleAction.php:223
msgid "Privilege"
msgstr "Privilege"
-#: classes/Gems/Default/RoleAction.php:235
+#: classes/Gems/Default/RoleAction.php:229
msgid "Project privileges"
msgstr "Project privileges"
@@ -1871,19 +1858,19 @@
msgid "Are you sure you want to synchronize all survey sources?"
msgstr "Are you sure you want to synchronize all survey sources?"
-#: classes/Gems/Default/StaffAction.php:138
+#: classes/Gems/Default/StaffAction.php:133
msgid "If checked the user will logoff when answering a survey."
msgstr "If checked the user will logoff when answering a survey."
-#: classes/Gems/Default/StaffAction.php:154
+#: classes/Gems/Default/StaffAction.php:149
msgid "You are not allowed to edit this staff member."
msgstr "You are not allowed to edit this staff member."
-#: classes/Gems/Default/StaffAction.php:189
+#: classes/Gems/Default/StaffAction.php:184
msgid "Primary function"
msgstr "Primary function"
-#: classes/Gems/Default/StaffAction.php:274
+#: classes/Gems/Default/StaffAction.php:269
msgid "staff member"
msgid_plural "staff members"
msgstr[0] "staff member"
@@ -2781,96 +2768,96 @@
msgid "This track type does not allow the creation of new rounds."
msgstr "This track type does not allow the creation of new rounds."
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:360
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:363
msgid "Track start"
msgstr "Track start"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:361
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:364
msgid "Track end"
msgstr "Track end"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:369
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:372
msgid "Start time"
msgstr "Start time"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:370
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:373
msgid "Completion time"
msgstr "Completion time"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:385
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:388
msgid "Minutes"
msgstr "Minutes"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:386
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:389
msgid "Hours"
msgstr "Hours"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:387
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:390
msgid "Days"
msgstr "Days"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:388
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:391
msgid "Weeks"
msgstr "Weeks"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:389
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:392
msgid "Months"
msgstr "Months"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:390
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:393
msgid "Quarters"
msgstr "Quarters"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:391
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:394
msgid "Years"
msgstr "Years"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:425
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:428
msgid "Valid from calculation"
msgstr "Valid from calculation"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:426
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:434
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:429
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:437
msgid "Date source"
msgstr "Date source"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:427
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:435
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:430
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:438
msgid "Round used"
msgstr "Round used"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:428
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:436
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:431
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:439
msgid "Date used"
msgstr "Date used"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:429
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:437
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:432
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:440
msgid "Add to date"
msgstr "Add to date"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:430
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:438
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:433
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:441
msgid "Add to date unit"
msgstr "Add to date unit"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:433
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:436
msgid "Valid for calculation"
msgstr "Valid for calculation"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:467
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:470
msgid "Does not expire"
msgstr "Does not expire"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:470
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:473
msgid "Use an answer from a survey."
msgstr "Use an answer from a survey."
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:471
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:474
msgid "Use a standard token date."
msgstr "Use a standard token date."
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:473
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:476
msgid "Use a track level date."
msgstr "Use a track level date."
@@ -2959,53 +2946,53 @@
msgid "Next >"
msgstr "Next >"
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:485
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:507
msgid "Submitdate"
msgstr "Submitdate"
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:860
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:883
#, php-format
msgid "Updated %d Gems tokens to new token definition."
msgstr "Updated %d Gems tokens to new token definition."
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:880
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:903
#, php-format
msgid "The '%s' survey is no longer active. The survey was removed from LimeSurvey!"
msgstr "The '%s' survey is no longer active. The survey was removed from LimeSurvey!"
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:997
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1020
#, php-format
msgid "Updated %d token to new token definition in survey '%s'."
msgid_plural "Updated %d tokens to new token definition in survey '%s'."
msgstr[0] "Updated %d token to new token definition in survey '%s'."
msgstr[1] "Updated %d tokens to new token definition in survey '%s'."
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1015
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1038
#, php-format
msgid "The status of the '%s' survey has changed."
msgstr "The status of the '%s' survey has changed."
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1021
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1044
#, php-format
msgid "Survey '%s' IS NO LONGER ACTIVE!!!"
msgstr "Survey '%s' IS NO LONGER ACTIVE!!!"
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1027
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1050
#, php-format
msgid "The status of the '%s' survey has changed to '%s'."
msgstr "The status of the '%s' survey has changed to '%s'."
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1030
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1053
#, php-format
msgid "The status warning for the '%s' survey was removed."
msgstr "The status warning for the '%s' survey was removed."
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1036
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1059
#, php-format
msgid "The name of the '%s' survey has changed to '%s'."
msgstr "The name of the '%s' survey has changed to '%s'."
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1046
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1069
#, php-format
msgid "Imported the '%s' survey."
msgstr "Imported the '%s' survey."
@@ -3086,76 +3073,84 @@
msgid "- %s"
msgstr "- %s"
-#: classes/Gems/Util/Translated.php:95
+#: classes/Gems/Util/Translated.php:99
msgid "forever"
msgstr "forever"
-#: classes/Gems/Util/Translated.php:104
+#: classes/Gems/Util/Translated.php:108
msgid "n/a"
msgstr "n/a"
-#: classes/Gems/Util/Translated.php:113
+#: classes/Gems/Util/Translated.php:117
msgid "never"
msgstr "never"
-#: classes/Gems/Util/Translated.php:138
+#: classes/Gems/Util/Translated.php:142
msgid "2 days ago"
msgstr "2 days ago"
-#: classes/Gems/Util/Translated.php:141
+#: classes/Gems/Util/Translated.php:145
msgid "Yesterday"
msgstr "Yesterday"
-#: classes/Gems/Util/Translated.php:144
+#: classes/Gems/Util/Translated.php:148
msgid "Today"
msgstr "Today"
-#: classes/Gems/Util/Translated.php:147
+#: classes/Gems/Util/Translated.php:151
msgid "Tomorrow"
msgstr "Tomorrow"
-#: classes/Gems/Util/Translated.php:150
+#: classes/Gems/Util/Translated.php:154
msgid "Over 2 days"
msgstr "Over 2 days"
-#: classes/Gems/Util/Translated.php:155
+#: classes/Gems/Util/Translated.php:159
#, php-format
msgid "Over %d days"
msgstr "Over %d days"
-#: classes/Gems/Util/Translated.php:157
+#: classes/Gems/Util/Translated.php:161
#, php-format
msgid "%d days ago"
msgstr "%d days ago"
-#: classes/Gems/Util/Translated.php:183
+#: classes/Gems/Util/Translated.php:187
msgid "Unknown"
msgstr "Unknown"
-#: classes/Gems/Util/Translated.php:188
+#: classes/Gems/Util/Translated.php:192
msgid "mr."
msgstr "Mr."
-#: classes/Gems/Util/Translated.php:188
+#: classes/Gems/Util/Translated.php:192
msgid "mrs."
msgstr "Mrs."
-#: classes/Gems/Util/Translated.php:188
+#: classes/Gems/Util/Translated.php:192
msgid "mr./mrs."
msgstr "Mr./Mrs."
-#: classes/Gems/Util/Translated.php:193
+#: classes/Gems/Util/Translated.php:197
msgid "Mr."
msgstr "Mr."
-#: classes/Gems/Util/Translated.php:193
+#: classes/Gems/Util/Translated.php:197
msgid "Mrs."
msgstr "Mrs."
-#: classes/Gems/Util/Translated.php:193
+#: classes/Gems/Util/Translated.php:197
msgid "Mr./Mrs."
msgstr "Mr./Mrs."
+#: classes/Gems/Util/Translated.php:215
+msgid "Yes (forget answers)"
+msgstr "Yes (forget answers)"
+
+#: classes/Gems/Util/Translated.php:215
+msgid "Yes (keep answers)"
+msgstr "Yes (keep answers)"
+
#: classes/MUtil/Date.php:209
#, php-format
msgid "%s ago"
@@ -3413,7 +3408,7 @@
msgid "Deleted token %s for survey %s."
msgstr "Deleted token %s for survey %s."
-#: snippets/DeleteTrackTokenSnippet.php:269
+#: snippets/DeleteTrackTokenSnippet.php:277
#: snippets/EditTrackTokenSnippet.php:174
#, php-format
msgid "%d token changed by recalculation."
@@ -3532,6 +3527,15 @@
msgid "This track can be assigned since %s."
msgstr "This track can be assigned since %s."
+#~ msgid "ACL"
+#~ msgstr "ACL"
+
+#~ msgid "Access Control Lists"
+#~ msgstr "Access Control Lists"
+
+#~ msgid "ACL's"
+#~ msgstr "ACL's"
+
#~ msgid "In EU"
#~ msgstr "In EU"
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2011-10-14 10:43:36 UTC (rev 103)
+++ trunk/library/languages/default-nl.po 2011-10-14 15:06:50 UTC (rev 104)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: Pulse NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-11 18:17+0100\n"
+"POT-Creation-Date: 2011-10-14 17:00+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -32,34 +32,34 @@
msgid "version"
msgstr "versie"
-#: classes/GemsEscort.php:1421
+#: classes/GemsEscort.php:1410
msgid "Take note: your session has expired, your inputs where not saved. Please check the input data and try again"
msgstr "Let op: uw sessie is verlopen, uw invoer is niet opgeslagen. Controleer de gegevens en probeer a.u.b. opnieuw."
-#: classes/GemsEscort.php:1543
+#: classes/GemsEscort.php:1532
msgid "No access to site."
msgstr "Geen toegang tot website."
-#: classes/GemsEscort.php:1545
-#: classes/GemsEscort.php:1581
+#: classes/GemsEscort.php:1534
+#: classes/GemsEscort.php:1570
msgid "You have no access to this site."
msgstr "U heeft geen toegang tot deze website."
-#: classes/GemsEscort.php:1561
+#: classes/GemsEscort.php:1550
msgid "No access to page"
msgstr "Geen toegang tot pagina"
-#: classes/GemsEscort.php:1563
+#: classes/GemsEscort.php:1552
#, 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:1557
#: classes/GemsEscort.php:1568
-#: classes/GemsEscort.php:1579
msgid "You are no longer logged in."
msgstr "U bent niet meer ingelogd."
-#: classes/GemsEscort.php:1569
+#: classes/GemsEscort.php:1558
msgid "You must login to access this page."
msgstr "U moet ingelogd zijn voor toegang tot deze pagina."
@@ -165,158 +165,153 @@
msgstr "Rollen"
#: classes/Gems/Menu.php:196
-msgid "ACL"
-msgstr "ACL"
-
-#: classes/Gems/Menu.php:197
-#: classes/Gems/Menu.php:338
+#: classes/Gems/Menu.php:337
msgid "Assigned"
msgstr "Toegewezen"
-#: classes/Gems/Menu.php:198
+#: classes/Gems/Menu.php:197
msgid "Privileges"
msgstr "Priviléges"
-#: classes/Gems/Menu.php:201
+#: classes/Gems/Menu.php:200
msgid "Groups"
msgstr "Groepen"
-#: classes/Gems/Menu.php:204
+#: classes/Gems/Menu.php:203
msgid "Organizations"
msgstr "Organisaties"
-#: classes/Gems/Menu.php:207
-#: classes/Gems/Menu.php:524
+#: classes/Gems/Menu.php:206
msgid "Staff"
msgstr "Medewerkers"
-#: classes/Gems/Menu.php:210
+#: classes/Gems/Menu.php:209
msgid "Logging"
msgstr "Logboek"
-#: classes/Gems/Menu.php:214
+#: classes/Gems/Menu.php:213
msgid "Maintenance"
msgstr "Onderhoud"
-#: classes/Gems/Menu.php:228
+#: classes/Gems/Menu.php:227
#, php-format
msgid "Stand-alone privilige: %s"
msgstr "Zelfstandig privilege: %s"
-#: classes/Gems/Menu.php:235
+#: classes/Gems/Menu.php:234
msgid "Logon"
msgstr "Login"
-#: classes/Gems/Menu.php:236
+#: classes/Gems/Menu.php:235
msgid "Lost password"
msgstr "Wachtwoord zoek"
-#: classes/Gems/Menu.php:237
+#: classes/Gems/Menu.php:236
msgid "Your account"
msgstr "Uw account"
-#: classes/Gems/Menu.php:238
+#: classes/Gems/Menu.php:237
msgid "Activity overview"
msgstr "Activiteiten overzicht"
-#: classes/Gems/Menu.php:239
+#: classes/Gems/Menu.php:238
msgid "Change password"
msgstr "Uw wachtwoord"
-#: classes/Gems/Menu.php:240
-#: classes/Gems/Menu.php:280
-#: classes/Gems/Menu.php:315
+#: classes/Gems/Menu.php:239
+#: classes/Gems/Menu.php:279
+#: classes/Gems/Menu.php:314
msgid "Token"
msgstr "Kenmerk"
-#: classes/Gems/Menu.php:241
+#: classes/Gems/Menu.php:240
msgid "Logoff"
msgstr "Uitloggen"
-#: classes/Gems/Menu.php:276
+#: classes/Gems/Menu.php:275
msgid "Track"
msgstr "Traject"
-#: classes/Gems/Menu.php:283
-#: classes/Gems/Menu.php:303
-#: classes/Gems/Menu.php:334
+#: classes/Gems/Menu.php:282
+#: classes/Gems/Menu.php:302
+#: classes/Gems/Menu.php:333
msgid "Add"
msgstr "Voeg toe"
-#: classes/Gems/Menu.php:287
-#: classes/Gems/Menu.php:370
+#: classes/Gems/Menu.php:286
+#: classes/Gems/Menu.php:369
msgid "Preview"
msgstr "Preview"
-#: classes/Gems/Menu.php:294
+#: classes/Gems/Menu.php:293
msgid "Tracks"
msgstr "Trajecten"
-#: classes/Gems/Menu.php:307
+#: classes/Gems/Menu.php:306
msgid "Assignments"
msgstr "Toewijzingen"
-#: classes/Gems/Menu.php:311
+#: classes/Gems/Menu.php:310
msgid "Show"
msgstr "Toon"
-#: classes/Gems/Menu.php:319
+#: classes/Gems/Menu.php:318
msgid "Edit"
msgstr "Wijzig"
-#: classes/Gems/Menu.php:323
+#: classes/Gems/Menu.php:322
msgid "Delete"
msgstr "Verwijder"
-#: classes/Gems/Menu.php:328
+#: classes/Gems/Menu.php:327
msgid "Surveys"
msgstr "Vragenlijsten"
-#: classes/Gems/Menu.php:360
+#: classes/Gems/Menu.php:359
msgid "Fill in"
msgstr "Vul in"
-#: classes/Gems/Menu.php:364
+#: classes/Gems/Menu.php:363
msgid "Print PDF"
msgstr "Print PDF"
-#: classes/Gems/Menu.php:367
+#: classes/Gems/Menu.php:366
msgid "E-Mail now!"
msgstr "Email nu!"
-#: classes/Gems/Menu.php:373
+#: classes/Gems/Menu.php:372
msgid "Answers"
msgstr "Antwoorden"
-#: classes/Gems/Menu.php:511
+#: classes/Gems/Menu.php:510
msgid "Respondents"
msgstr "Patiënten"
-#: classes/Gems/Menu.php:514
+#: classes/Gems/Menu.php:513
msgid "Overview"
msgstr "Overzicht"
-#: classes/Gems/Menu.php:521
+#: classes/Gems/Menu.php:520
msgid "Project"
msgstr "Project"
-#: classes/Gems/Menu.php:527
+#: classes/Gems/Menu.php:523
msgid "Setup"
msgstr "Beheer"
-#: classes/Gems/Menu.php:530
+#: classes/Gems/Menu.php:526
msgid "Mail"
msgstr "Email"
-#: classes/Gems/Menu.php:533
+#: classes/Gems/Menu.php:529
msgid "Track Builder"
msgstr "Traject bouwer"
-#: classes/Gems/Menu.php:542
+#: classes/Gems/Menu.php:538
msgid "Contact"
msgstr "Contact"
-#: classes/Gems/Menu.php:555
+#: classes/Gems/Menu.php:551
msgid "Changelog"
msgstr "Changelog"
@@ -380,89 +375,89 @@
msgid "Checks performed"
msgstr "Controle uitgevoerd"
-#: classes/Gems/Controller/BrowseEditAction.php:342
+#: classes/Gems/Controller/BrowseEditAction.php:344
#, php-format
msgid "New %s..."
msgstr "Nieuwe %s..."
-#: classes/Gems/Controller/BrowseEditAction.php:374
+#: classes/Gems/Controller/BrowseEditAction.php:376
#, php-format
msgid "Delete %s"
msgstr "Verwijder %s"
-#: classes/Gems/Controller/BrowseEditAction.php:378
+#: classes/Gems/Controller/BrowseEditAction.php:380
#, php-format
msgid "%2$u %1$s deleted"
msgstr "%2$u %1$s verwijderd"
-#: classes/Gems/Controller/BrowseEditAction.php:392
+#: classes/Gems/Controller/BrowseEditAction.php:394
#, php-format
msgid "Edit %s"
msgstr "Bewerk %s"
-#: classes/Gems/Controller/BrowseEditAction.php:489
+#: classes/Gems/Controller/BrowseEditAction.php:491
msgid "Free search text"
msgstr "Vrije zoek tekst"
-#: classes/Gems/Controller/BrowseEditAction.php:560
+#: classes/Gems/Controller/BrowseEditAction.php:562
msgid "Search"
msgstr "Zoeken"
-#: classes/Gems/Controller/BrowseEditAction.php:576
+#: classes/Gems/Controller/BrowseEditAction.php:578
#, php-format
msgid "No %s found"
msgstr "Geen %s gevonden"
-#: classes/Gems/Controller/BrowseEditAction.php:649
+#: classes/Gems/Controller/BrowseEditAction.php:651
#, php-format
msgid "No %s found."
msgstr "Geen %s gevonden."
-#: classes/Gems/Controller/BrowseEditAction.php:764
+#: classes/Gems/Controller/BrowseEditAction.php:766
msgid "Are you sure?"
msgstr "Weet u het zeker?"
-#: classes/Gems/Controller/BrowseEditAction.php:780
+#: classes/Gems/Controller/BrowseEditAction.php:782
msgid "Yes"
msgstr "Ja"
-#: classes/Gems/Controller/BrowseEditAction.php:781
+#: classes/Gems/Controller/BrowseEditAction.php:783
msgid "No"
msgstr "Nee"
-#: classes/Gems/Controller/BrowseEditAction.php:834
+#: classes/Gems/Controller/BrowseEditAction.php:836
#, php-format
msgid "Unknown %s requested"
msgstr "Onjuist %s verzoek"
-#: classes/Gems/Controller/BrowseEditAction.php:857
+#: classes/Gems/Controller/BrowseEditAction.php:859
#, php-format
msgid "New %1$s..."
msgstr "Nieuwe %1$s..."
-#: classes/Gems/Controller/BrowseEditAction.php:865
+#: classes/Gems/Controller/BrowseEditAction.php:867
msgid "Save"
msgstr "Opslaan"
-#: classes/Gems/Controller/BrowseEditAction.php:901
+#: classes/Gems/Controller/BrowseEditAction.php:903
#, php-format
msgid "%2$u %1$s saved"
msgstr "%2$u %1$s opgeslagen"
-#: classes/Gems/Controller/BrowseEditAction.php:904
+#: classes/Gems/Controller/BrowseEditAction.php:906
msgid "No changes to save."
msgstr "Geen verandering om op te slaan."
-#: classes/Gems/Controller/BrowseEditAction.php:913
+#: classes/Gems/Controller/BrowseEditAction.php:915
msgid "Input error! No changes saved!"
msgstr "Invoer fout! Veranderingen niet opgeslagen!"
-#: classes/Gems/Controller/BrowseEditAction.php:941
+#: classes/Gems/Controller/BrowseEditAction.php:943
#, php-format
msgid "Show %s"
msgstr "Toon %s"
-#: classes/Gems/Controller/BrowseEditAction.php:948
+#: classes/Gems/Controller/BrowseEditAction.php:950
#, php-format
msgid "Unknown %s."
msgstr "%s is onbekend."
@@ -944,20 +939,20 @@
msgid "Export data"
msgstr "Exporteer gegevens"
-#: classes/Gems/Default/ExportAction.php:161
+#: classes/Gems/Default/ExportAction.php:155
msgid "Survey"
msgstr "Vragenlijst"
-#: classes/Gems/Default/ExportAction.php:178
+#: classes/Gems/Default/ExportAction.php:170
#, php-format
msgid "%s records found."
msgstr "%s records gevonden."
-#: classes/Gems/Default/ExportAction.php:182
+#: classes/Gems/Default/ExportAction.php:174
msgid "Organization"
msgstr "Organisatie"
-#: classes/Gems/Default/ExportAction.php:190
+#: classes/Gems/Default/ExportAction.php:183
msgid "Export to"
msgstr "Exporteer naar"
@@ -1271,12 +1266,12 @@
#: classes/Gems/Default/OptionAction.php:73
#: classes/Gems/Default/OrganizationAction.php:128
#: classes/Gems/Default/RespondentAction.php:173
-#: classes/Gems/Default/StaffAction.php:193
+#: classes/Gems/Default/StaffAction.php:188
msgid "Language"
msgstr "Taal"
#: classes/Gems/Default/OptionAction.php:74
-#: classes/Gems/Default/StaffAction.php:194
+#: classes/Gems/Default/StaffAction.php:189
msgid "Logout on survey"
msgstr "Logout bij beantwoorden vragenlijst"
@@ -1560,71 +1555,71 @@
msgid "Track %s does not exist."
msgstr "Trajectnummer %s bestaat niet."
-#: classes/Gems/Default/ReceptionAction.php:56
+#: classes/Gems/Default/ReceptionAction.php:53
msgid "Can be assigned to"
msgstr "Kan toegewezen worden aan"
-#: classes/Gems/Default/ReceptionAction.php:57
+#: classes/Gems/Default/ReceptionAction.php:54
msgid "Additional action"
msgstr "Aanvullende actie"
-#: classes/Gems/Default/ReceptionAction.php:79
+#: classes/Gems/Default/ReceptionAction.php:77
msgid "Code"
msgstr "Code"
-#: classes/Gems/Default/ReceptionAction.php:82
+#: classes/Gems/Default/ReceptionAction.php:80
msgid "Is success code"
msgstr "Is succes code"
-#: classes/Gems/Default/ReceptionAction.php:86
+#: classes/Gems/Default/ReceptionAction.php:84
msgid "This reception code is a success code."
msgstr "Aanzetten als deze ontvangst code positief is."
-#: classes/Gems/Default/ReceptionAction.php:90
+#: classes/Gems/Default/ReceptionAction.php:88
msgid "Only active codes can be selected."
msgstr "Alleen actieve codes kunnen geselecteerd worden."
-#: classes/Gems/Default/ReceptionAction.php:91
+#: classes/Gems/Default/ReceptionAction.php:89
msgid "For respondents"
msgstr "Voor patiënten"
-#: classes/Gems/Default/ReceptionAction.php:94
+#: classes/Gems/Default/ReceptionAction.php:92
msgid "This reception code can be assigned to a respondent."
msgstr "Deze ontvangstcode kan aan een patiënt toegewezen worden."
-#: classes/Gems/Default/ReceptionAction.php:95
+#: classes/Gems/Default/ReceptionAction.php:93
msgid "For tracks"
msgstr "Voor trajecten"
-#: classes/Gems/Default/ReceptionAction.php:98
+#: classes/Gems/Default/ReceptionAction.php:96
msgid "This reception code can be assigned to a track."
msgstr "Deze ontvangstcode kan aan een traject toegewezen worden."
-#: classes/Gems/Default/ReceptionAction.php:99
+#: classes/Gems/Default/ReceptionAction.php:97
msgid "For surveys"
msgstr "Voor vragenlijsten"
-#: classes/Gems/Default/ReceptionAction.php:102
+#: classes/Gems/Default/ReceptionAction.php:100
msgid "This reception code can be assigned to a survey."
msgstr "Deze ontvangstcode kan aan een vragenlijst toegewezen worden."
-#: classes/Gems/Default/ReceptionAction.php:103
+#: classes/Gems/Default/ReceptionAction.php:101
msgid "Redo survey"
msgstr "Vragenlijsten herhalen"
-#: classes/Gems/Default/ReceptionAction.php:106
+#: classes/Gems/Default/ReceptionAction.php:104
msgid "Redo a survey on this reception code."
msgstr "Herhaal vragenlijst bij deze ontvangstcode."
-#: classes/Gems/Default/ReceptionAction.php:107
+#: classes/Gems/Default/ReceptionAction.php:105
msgid "Overwrite ansers"
msgstr "Overschrijf bestaande antwoorden"
-#: classes/Gems/Default/ReceptionAction.php:110
+#: classes/Gems/Default/ReceptionAction.php:108
msgid "Remove the consent from already answered surveys."
msgstr "Verwijder \"informed consent\" van beantwoorde vragenlijsten"
-#: classes/Gems/Default/ReceptionAction.php:128
+#: classes/Gems/Default/ReceptionAction.php:126
msgid "reception code"
msgid_plural "reception codes"
msgstr[0] "Ontvangst code"
@@ -1745,48 +1740,40 @@
msgid "Respondent planning"
msgstr "Per patiënt plannen"
-#: classes/Gems/Default/RoleAction.php:58
-msgid "Access Control Lists"
-msgstr "Access Control Lists"
-
-#: classes/Gems/Default/RoleAction.php:59
-msgid "ACL's"
-msgstr "ACL's"
-
-#: classes/Gems/Default/RoleAction.php:172
-#: classes/Gems/Default/RoleAction.php:213
+#: classes/Gems/Default/RoleAction.php:166
+#: classes/Gems/Default/RoleAction.php:207
msgid "Parents"
msgstr "Afgeleid van"
-#: classes/Gems/Default/RoleAction.php:191
+#: classes/Gems/Default/RoleAction.php:185
msgid "role"
msgid_plural "roles"
msgstr[0] "Rol"
msgstr[1] "Rollen"
-#: classes/Gems/Default/RoleAction.php:196
+#: classes/Gems/Default/RoleAction.php:190
msgid "Administrative roles"
msgstr "Beheer rollen en rechten"
-#: classes/Gems/Default/RoleAction.php:214
-#: classes/Gems/Default/RoleAction.php:230
+#: classes/Gems/Default/RoleAction.php:208
+#: classes/Gems/Default/RoleAction.php:224
msgid "Allowed"
msgstr "Toegestaan"
-#: classes/Gems/Default/RoleAction.php:215
-#: classes/Gems/Default/RoleAction.php:231
+#: classes/Gems/Default/RoleAction.php:209
+#: classes/Gems/Default/RoleAction.php:225
msgid "Denied"
msgstr "Geweigerd"
-#: classes/Gems/Default/RoleAction.php:219
+#: classes/Gems/Default/RoleAction.php:213
msgid "Project role overview"
msgstr "Project rollen"
-#: classes/Gems/Default/RoleAction.php:229
+#: classes/Gems/Default/RoleAction.php:223
msgid "Privilege"
msgstr "Privilége"
-#: classes/Gems/Default/RoleAction.php:235
+#: classes/Gems/Default/RoleAction.php:229
msgid "Project privileges"
msgstr "Project priviléges"
@@ -1871,19 +1858,19 @@
msgid "Are you sure you want to synchronize all survey sources?"
msgstr "Weet je zeker dat je alle bronnen wil synchroniseren?"
-#: classes/Gems/Default/StaffAction.php:138
+#: classes/Gems/Default/StaffAction.php:133
msgid "If checked the user will logoff when answering a survey."
msgstr "Indien actief, dan logt de gebruiker uit voor het beantwoorden van een vragenlijst."
-#: classes/Gems/Default/StaffAction.php:154
+#: classes/Gems/Default/StaffAction.php:149
msgid "You are not allowed to edit this staff member."
msgstr "U mag deze medewerker niet wijzigen."
-#: classes/Gems/Default/StaffAction.php:189
+#: classes/Gems/Default/StaffAction.php:184
msgid "Primary function"
msgstr "Primaire functie"
-#: classes/Gems/Default/StaffAction.php:274
+#: classes/Gems/Default/StaffAction.php:269
msgid "staff member"
msgid_plural "staff members"
msgstr[0] "medewerker"
@@ -2781,96 +2768,96 @@
msgid "This track type does not allow the creation of new rounds."
msgstr "Dit type traject staat het niet toe dat nieuwe rondes aangemaakt worden."
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:360
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:363
msgid "Track start"
msgstr "Traject start"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:361
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:364
msgid "Track end"
msgstr "Traject einde"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:369
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:372
msgid "Start time"
msgstr "Starten tijd"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:370
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:373
msgid "Completion time"
msgstr "Datum invullen"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:385
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:388
msgid "Minutes"
msgstr "Minuten"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:386
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:389
msgid "Hours"
msgstr "Uren"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:387
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:390
msgid "Days"
msgstr "Dagen"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:388
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:391
msgid "Weeks"
msgstr "Weken"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:389
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:392
msgid "Months"
msgstr "Maanden"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:390
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:393
msgid "Quarters"
msgstr "Kwartieren"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:391
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:394
msgid "Years"
msgstr "Jaren"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:425
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:428
msgid "Valid from calculation"
msgstr "Berekening datum geldig vanaf"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:426
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:434
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:429
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:437
msgid "Date source"
msgstr "Datum bron"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:427
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:435
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:430
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:438
msgid "Round used"
msgstr "Gebruikte ronde"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:428
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:436
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:431
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:439
msgid "Date used"
msgstr "Gebruikte datum"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:429
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:437
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:432
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:440
msgid "Add to date"
msgstr "Optellen bij datum"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:430
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:438
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:433
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:441
msgid "Add to date unit"
msgstr "Datumoptel eenheid"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:433
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:436
msgid "Valid for calculation"
msgstr "Berekening datum geldig tot"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:467
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:470
msgid "Does not expire"
msgstr "Blijft altijd geldig"
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:470
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:473
msgid "Use an answer from a survey."
msgstr "Gebruikt een antwoord uit een vragenlijst."
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:471
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:474
msgid "Use a standard token date."
msgstr "Gebruik een datum uit een kenmerk."
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:473
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:476
msgid "Use a track level date."
msgstr "Gebruik een op traject niveau ingestelde datum."
@@ -2959,53 +2946,53 @@
msgid "Next >"
msgstr "Verder >"
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:485
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:507
msgid "Submitdate"
msgstr "Invoerdatum"
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:860
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:883
#, php-format
msgid "Updated %d Gems tokens to new token definition."
msgstr "%d Gems kenmerken zijn aangepast aan de nieuwe kenmerk definitie."
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:880
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:903
#, php-format
msgid "The '%s' survey is no longer active. The survey was removed from LimeSurvey!"
msgstr "De vragenlijst '%s' is niet meer actief. De vragenlijst is verwijderd uit LimeSurvey!"
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:997
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1020
#, php-format
msgid "Updated %d token to new token definition in survey '%s'."
msgid_plural "Updated %d tokens to new token definition in survey '%s'."
msgstr[0] "%d kenmerk in de vragenlijst '%s' is aangepast aan de...
[truncated message content] |
|
From: <gem...@li...> - 2011-10-14 10:43:42
|
Revision: 103
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=103&view=rev
Author: matijsdejong
Date: 2011-10-14 10:43:36 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
Added information on LS 1.91 activation for #15
Modified Paths:
--------------
trunk/library/docs/gems_survey_activation.doc
Modified: trunk/library/docs/gems_survey_activation.doc
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-10-14 10:00:19
|
Revision: 102
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=102&view=rev
Author: mennodekker
Date: 2011-10-14 10:00:12 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
Removed usesleft fix, as usesleft is only updated on survey completion
Modified Paths:
--------------
trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m91Database.php
Modified: trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m91Database.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m91Database.php 2011-10-13 15:30:30 UTC (rev 101)
+++ trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m91Database.php 2011-10-14 10:00:12 UTC (rev 102)
@@ -54,58 +54,4 @@
*/
protected $_anonymizedField = 'anonymized';
- /**
- * Sets the answers passed on.
- *
- * With the 'usesleft' feature in 1.91 we should decrease the usesleft with 1 when we insert answers
- *
- * @param Gems_Tracker_Token $token Gems token object
- * @param $answers array Field => Value array
- * @param int $surveyId Gems Survey Id
- * @param string $sourceSurveyId Optional Survey Id used by source
- */
- public function setRawTokenAnswers(Gems_Tracker_Token $token, array $answers, $surveyId, $sourceSurveyId = null)
- {
- if (null === $sourceSurveyId) {
- $sourceSurveyId = $this->_getSid($surveyId);
- }
-
- $lsDb = $this->getSourceDatabase();
- $lsSurveyTable = $this->_getSurveyTableName($sourceSurveyId);
- $lsTokenTable = $this->_getTokenTableName($sourceSurveyId);
- $lsTokenId = $this->_getToken($token->getTokenId());
-
- $answers = $this->_getFieldMap($sourceSurveyId)->mapTitlesToKeys($answers);
-
- if ($lsDb->fetchOne("SELECT token FROM $lsSurveyTable WHERE token = ?", $lsTokenId)) {
- $where = $lsDb->quoteInto("token = ?", $lsTokenId);
- $lsDb->update($lsSurveyTable, $answers, $where);
- } else {
- //No existing record, so we should insert a new row and update the 'usesleft'
- //in the token table
- $sql = $lsDb->select()
- ->from($lsTokenTable, array('usesleft'))
- ->where('token = ?', $lsTokenId);
-
- $usesLeft = $lsDb->fetchOne($sql);
-
- if ($usesLeft > 0) {
- $usesLeft--;
- $where = $lsDb->quoteInto("token = ?", $lsTokenId);
- $lsDb->update($lsTokenTable, array('usesleft' => $usesLeft), $where);
- } else {
- //This is an error condition, should not occur
- throw new Gems_Exception('Not allowed to use this token');
- }
-
- $current = new Zend_Db_Expr('CURRENT_TIMESTAMP');
-
- $answers['token'] = $lsTokenId;
- $answers['startlanguage'] = $this->locale->getLanguage();
- $answers['datestamp'] = $current;
- $answers['startdate'] = $current;
-
- $lsDb->insert($lsSurveyTable, $answers);
- }
- }
}
\ 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...> - 2011-10-13 15:30:41
|
Revision: 101
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=101&view=rev
Author: matijsdejong
Date: 2011-10-13 15:30:30 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
Some fixes in LS1.91 code for #15 but no yet a solution.
Modified Paths:
--------------
trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m91Database.php
Modified: trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m91Database.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m91Database.php 2011-10-13 10:58:05 UTC (rev 100)
+++ trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m91Database.php 2011-10-13 15:30:30 UTC (rev 101)
@@ -53,10 +53,10 @@
* @var string The LS version dependent field name for anonymized surveys
*/
protected $_anonymizedField = 'anonymized';
-
+
/**
* Sets the answers passed on.
- *
+ *
* With the 'usesleft' feature in 1.91 we should decrease the usesleft with 1 when we insert answers
*
* @param Gems_Tracker_Token $token Gems token object
@@ -86,18 +86,18 @@
$sql = $lsDb->select()
->from($lsTokenTable, array('usesleft'))
->where('token = ?', $lsTokenId);
-
- $usesLeft = $lsdb->fetchOne($sql);
-
+
+ $usesLeft = $lsDb->fetchOne($sql);
+
if ($usesLeft > 0) {
$usesLeft--;
$where = $lsDb->quoteInto("token = ?", $lsTokenId);
- $lsDb->update($table, array('usesleft'=>$usesLeft), $where);
+ $lsDb->update($lsTokenTable, array('usesleft' => $usesLeft), $where);
} else {
//This is an error condition, should not occur
throw new Gems_Exception('Not allowed to use this token');
}
-
+
$current = new Zend_Db_Expr('CURRENT_TIMESTAMP');
$answers['token'] = $lsTokenId;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-10-13 10:58:11
|
Revision: 100
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=100&view=rev
Author: mennodekker
Date: 2011-10-13 10:58:05 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
Quickfix: surveycompleted event now gets the right completion date/time
Modified Paths:
--------------
trunk/library/classes/Gems/Tracker/Token.php
Modified: trunk/library/classes/Gems/Tracker/Token.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Token.php 2011-10-13 10:37:10 UTC (rev 99)
+++ trunk/library/classes/Gems/Tracker/Token.php 2011-10-13 10:58:05 UTC (rev 100)
@@ -348,6 +348,12 @@
}
}
+ //Set completion time for completion event
+ if ($setCompletionTime) {
+ $values['gto_completion_time'] = $complTime->toString(Gems_Tracker::DB_DATETIME_FORMAT);
+ $this->_gemsData['gto_completion_time'] = $values['gto_completion_time'];
+ }
+
// Process any Gems side survey dependent changes
if ($changed = $this->handleAfterCompletion()) {
@@ -360,7 +366,8 @@
}
if ($setCompletionTime) {
- $values['gto_completion_time'] = $complTime->toString(Gems_Tracker::DB_DATETIME_FORMAT);
+ //Make sure to unset otherwise it won't get saved
+ $this->_gemsData['gto_completion_time'] = null;
}
$values['gto_duration_in_sec'] = max($complTime->diffSeconds($startTime), 0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-10-13 10:37:16
|
Revision: 99
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=99&view=rev
Author: mennodekker
Date: 2011-10-13 10:37:10 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
Staff edit now can only assign groups he is in or that he inherits from
Modified Paths:
--------------
trunk/library/classes/Gems/Controller/BrowseEditAction.php
trunk/library/classes/Gems/Default/StaffAction.php
trunk/library/classes/Gems/Util/DbLookup.php
trunk/library/classes/MUtil/Acl.php
Modified: trunk/library/classes/Gems/Controller/BrowseEditAction.php
===================================================================
--- trunk/library/classes/Gems/Controller/BrowseEditAction.php 2011-10-13 10:30:21 UTC (rev 98)
+++ trunk/library/classes/Gems/Controller/BrowseEditAction.php 2011-10-13 10:37:10 UTC (rev 99)
@@ -294,7 +294,9 @@
{
if ($this->useTabbedForms) {
//Create the tabs tried in $form->render() but somehow that is never reached
- Gems_TabForm::htmlElementsToTabs($form);
+ if ($form instanceof Gems_TabForm) {
+ Gems_TabForm::htmlElementsToTabs($form);
+ }
//If needed, add a row of link buttons to the bottom of the form
if ($links = $this->createMenuLinks($isNew ? $this->menuCreateIncludeLevel : $this->menuEditIncludeLevel)) {
Modified: trunk/library/classes/Gems/Default/StaffAction.php
===================================================================
--- trunk/library/classes/Gems/Default/StaffAction.php 2011-10-13 10:30:21 UTC (rev 98)
+++ trunk/library/classes/Gems/Default/StaffAction.php 2011-10-13 10:37:10 UTC (rev 99)
@@ -124,16 +124,11 @@
$bridge->addText( 'gsf_email', array('size' => 30))->addValidator('SimpleEmail')->addValidator($model->createUniqueValidator('gsf_email'));
if ($this->escort->hasPrivilege('pr.staff.edit.all')) {
- $this->_groups = MUtil_Lazy::call($dbLookup->getStaffGroups);
-
$bridge->addSelect('gsf_id_organization');
$bridge->addSelect('gsf_id_primary_group');
} else {
- $sql = "SELECT ggp_id_group, ggp_name FROM gems__groups WHERE ggp_group_active=1 AND ggp_staff_members=1 AND ggp_role != 'super' ORDER BY ggp_name";
- $this->_groups = MUtil_Lazy::call(array($this->db, 'fetchPairs'), $sql);
-
$bridge->addExhibitor('gsf_id_organization');
- $bridge->addSelect( 'gsf_id_primary_group', 'multiOptions', $dbLookup->getStaffGroupsNoSuper());
+ $bridge->addSelect( 'gsf_id_primary_group', 'multiOptions', $dbLookup->getAllowedStaffGroups());
}
$bridge->addCheckbox('gsf_logout_on_survey', 'description', $this->_('If checked the user will logoff when answering a survey.'));
Modified: trunk/library/classes/Gems/Util/DbLookup.php
===================================================================
--- trunk/library/classes/Gems/Util/DbLookup.php 2011-10-13 10:30:21 UTC (rev 98)
+++ trunk/library/classes/Gems/Util/DbLookup.php 2011-10-13 10:37:10 UTC (rev 99)
@@ -69,6 +69,12 @@
*/
protected $util;
+ /**
+ *
+ * @var Zend_Session
+ */
+ protected $session;
+
public function getActiveOrganizations()
{
static $organizations;
@@ -186,19 +192,31 @@
return $groups;
}
- public function getStaffGroupsNoSuper()
+ /**
+ * Retrieve an array of groups the user is allowed to assign: his own group and all groups
+ * he inherits rights from
+ *
+ * @return array
+ */
+ public function getAllowedStaffGroups()
{
$groups = $this->getActiveStaffGroups();
- $roles = $this->db->fetchPairs('SELECT ggp_id_group, ggp_role FROM gems__groups WHERE ggp_group_active=1 AND ggp_staff_members=1 ORDER BY ggp_name');
- $result = array();
+ if ($this->session->user_role === 'super') {
+ return $groups;
- foreach ($roles as $id => $role) {
- if (($role !== 'super') && isset($groups[$id])) {
- $result[$id] = $groups[$id];
+ } else {
+ $rolesAllowed = $this->acl->getRoleAndParents($this->session->user_role);
+ $roles = $this->db->fetchPairs('SELECT ggp_id_group, ggp_role FROM gems__groups WHERE ggp_group_active=1 AND ggp_staff_members=1 ORDER BY ggp_name');
+ $result = array();
+
+ foreach ($roles as $id => $role) {
+ if ((in_array($role, $rolesAllowed)) && isset($groups[$id])) {
+ $result[$id] = $groups[$id];
+ }
}
+
+ return $result;
}
-
- return $result;
}
public function getUserConsents()
Modified: trunk/library/classes/MUtil/Acl.php
===================================================================
--- trunk/library/classes/MUtil/Acl.php 2011-10-13 10:30:21 UTC (rev 98)
+++ trunk/library/classes/MUtil/Acl.php 2011-10-13 10:37:10 UTC (rev 99)
@@ -1,31 +1,31 @@
<?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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
- *
+
+/**
+ * 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ *
* @author Matijs de Jong
* @since 1.0
* @version $Id$
@@ -37,7 +37,7 @@
/**
* Extends Zend_Acl with a couple of overview functions/
- *
+ *
* @author Matijs de Jong
* @package MUtil
* @subpackage Acl
@@ -80,14 +80,14 @@
foreach ($rule['byPrivilegeId'] as $privilege => $pdata) {
if (! isset($results[$privilege])) {
$results[$privilege] = array(
- parent::TYPE_ALLOW => array(),
+ parent::TYPE_ALLOW => array(),
parent::TYPE_DENY => array());
}
if (isset($pdata['type'])) {
if ($pdata['type'] === parent::TYPE_ALLOW) {
$results[$privilege][parent::TYPE_ALLOW][] = $role;
- } elseif ($pdata['type'] === parent::TYPE_DENY) {
+ } elseif ($pdata['type'] === parent::TYPE_DENY) {
$results[$privilege][parent::TYPE_DENY][] = $role;
}
}
@@ -101,6 +101,26 @@
}
/**
+ * Retrieve an array of the current role and all parents
+ *
+ * @param string $role
+ * @param array $parents
+ * @return array
+ */
+ public function getRoleAndParents($role, $parents = array()) {
+ $results = $parents;
+ $result = $this->_getRoleRegistry()->getParents($role);
+ foreach($result as $roleId => $selRole) {
+ if (!in_array($roleId, $results)) {
+ $results = $this->getRoleAndParents($roleId, $results);
+ }
+ $results[$roleId] = $roleId;
+ }
+ $results[$role] = $role;
+ return $results;
+ }
+
+ /**
* Returns an array of roles with all direct and inherited privileges
*
* Sample output:
@@ -147,15 +167,15 @@
/**
* Returns all allow and deny rules for a given role
- *
+ *
* Sample output:
* <code>
* [Zend_Acl::TYPE_ALLOW]=>array(<index>=>privilege),
* [Zend_Acl::TYPE_DENY]=>array(<index>=>privilege)
* </code>
- *
+ *
* @param string $role
- * @return array
+ * @return array
*/
public function getPrivileges ($role) {
$rule = $this->_getRules(null, $this->getRole($role));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-10-13 10:30:32
|
Revision: 98
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=98&view=rev
Author: mennodekker
Date: 2011-10-13 10:30:21 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
Quickfix for completion time in aftersurveycompleted event
Modified Paths:
--------------
tags/1.4.2/library/classes/Gems/Tracker/Token.php
Modified: tags/1.4.2/library/classes/Gems/Tracker/Token.php
===================================================================
--- tags/1.4.2/library/classes/Gems/Tracker/Token.php 2011-10-13 07:21:45 UTC (rev 97)
+++ tags/1.4.2/library/classes/Gems/Tracker/Token.php 2011-10-13 10:30:21 UTC (rev 98)
@@ -348,6 +348,11 @@
}
}
+ if ($setCompletionTime) {
+ $values['gto_completion_time'] = $complTime->toString(Gems_Tracker::DB_DATETIME_FORMAT);
+ $this->_gemsData['gto_completion_time'] = $values['gto_completion_time'];
+ }
+
// Process any Gems side survey dependent changes
if ($changed = $this->handleAfterCompletion()) {
@@ -360,8 +365,9 @@
}
if ($setCompletionTime) {
- $values['gto_completion_time'] = $complTime->toString(Gems_Tracker::DB_DATETIME_FORMAT);
+ $this->_gemsData['gto_completion_time'] = null;
}
+
$values['gto_duration_in_sec'] = max($complTime->diffSeconds($startTime), 0);
//If the survey has a resultfield, store it
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-10-13 07:21:51
|
Revision: 97
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=97&view=rev
Author: mennodekker
Date: 2011-10-13 07:21:45 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
removed obsolete line
Modified Paths:
--------------
trunk/library/classes/Gems/Default/ExportAction.php
Modified: trunk/library/classes/Gems/Default/ExportAction.php
===================================================================
--- trunk/library/classes/Gems/Default/ExportAction.php 2011-10-13 07:21:15 UTC (rev 96)
+++ trunk/library/classes/Gems/Default/ExportAction.php 2011-10-13 07:21:45 UTC (rev 97)
@@ -149,7 +149,6 @@
//Create the basic form
$form = new Gems_Form_TableForm();
- $form->removeDecorator('TabPane');
//Start adding elements
$element = new Zend_Form_Element_Select('sid');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-10-13 07:21:21
|
Revision: 96
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=96&view=rev
Author: mennodekker
Date: 2011-10-13 07:21:15 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
cancel old request when we make a new one, fixes problem in export when checking multiple boxes
Modified Paths:
--------------
trunk/new_project/htdocs/gems/js/autoSubmitForm.js
Modified: trunk/new_project/htdocs/gems/js/autoSubmitForm.js
===================================================================
--- trunk/new_project/htdocs/gems/js/autoSubmitForm.js 2011-10-12 13:14:19 UTC (rev 95)
+++ trunk/new_project/htdocs/gems/js/autoSubmitForm.js 2011-10-13 07:21:15 UTC (rev 96)
@@ -13,29 +13,29 @@
var self = this;
/*
- console.log(this.element); // Firebug console
- console.log(this.options.submitUrl); // Firebug console
+ console.log(this.element); // Firebug console
+ console.log(this.options.submitUrl); // Firebug console
console.log(this.options.targetId); // Firebug console */
// Bind the events
- jQuery('input:text, select, textarea', this.element).keyup(function(e) {self.filter();});
- jQuery('select', this.element).change(function(e) {self.filter();});
- jQuery('input:checkbox, input:radio', this.element).click(function(e) {self.filter();});
+ jQuery('input:text, select, textarea', this.element).keyup(function(e) {self.filter();});
+ jQuery('select', this.element).change(function(e) {self.filter();});
+ jQuery('input:checkbox, input:radio', this.element).click(function(e) {self.filter();});
// Set the initial value
- this.lastQuery = this.value();
+ this.lastQuery = this.value();
},
complete: function (request, status) {
this.request = null;
-
+
// Check for changes
- // - if the input field was changed since the last request
+ // - if the input field was changed since the last request
// filter() will search on the new value
// - if the input field has not changed, then no new request
// is made.
- this.filter();
- },
+ this.filter();
+ },
destroy: function() {
if (this.request != null) {
@@ -46,18 +46,21 @@
filter: function () {
+ //If we have a pending request and want to create a new one, cancel the first
+ this.destroy();
+
if (this.request == null) {
// var name = this.options.elementName ? this.options.elementName : this.element.attr('name');
-
+
var postData = this.value();
-
+
if (this.options.targetId && this.options.submitUrl) {
// Prevent double dipping when e.g. the arrow keys were used.
if (jQuery.param(postData) != jQuery.param(this.lastQuery))
{
this.lastQuery = postData;
//console.log(postData);
-
+
//*
var self = this;
this.request = jQuery.ajax({
@@ -70,20 +73,20 @@
});
// */
}
- }
+ }
}
},
success: function (data, status, request) {
jQuery(this.options.targetId).html(data);
- },
+ },
value: function () {
return $(this.element[0]).serializeArray();
- },
+ },
lastQuery: null,
request: null
-});
+});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-10-12 13:14:25
|
Revision: 95
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=95&view=rev
Author: mennodekker
Date: 2011-10-12 13:14:19 +0000 (Wed, 12 Oct 2011)
Log Message:
-----------
cleanup exportaction
stepengine only looks at rounds when a round id is present
Modified Paths:
--------------
trunk/library/classes/Gems/Default/ExportAction.php
trunk/library/classes/Gems/Tracker/Engine/StepEngineAbstract.php
Modified: trunk/library/classes/Gems/Default/ExportAction.php
===================================================================
--- trunk/library/classes/Gems/Default/ExportAction.php 2011-10-12 08:40:10 UTC (rev 94)
+++ trunk/library/classes/Gems/Default/ExportAction.php 2011-10-12 13:14:19 UTC (rev 95)
@@ -96,7 +96,7 @@
//Now add all onload actions to make the form still work
$actions = $this->view->jQuery()->getOnLoadActions();
$this->html->raw('<script type="text/javascript">');
- foreach($actions as $action) {
+ foreach ($actions as $action) {
$this->html->raw($action);
}
$this->html->raw('</script>');
@@ -161,11 +161,9 @@
//then remove it or make it more efficient
unset($data['records']);
if (isset($data['sid'])) {
- $gsu_id = intval($data['sid']);
- $survey = $this->loader->getTracker()->getSurvey($gsu_id);
-
- $filter = $this->_getFilter($data);
- $answers = $survey->getRawTokenAnswerRows($filter);
+ $survey = $this->loader->getTracker()->getSurvey(intval($data['sid']));
+ $filter = $this->_getFilter($data);
+ $answers = $survey->getRawTokenAnswerRows($filter);
} else {
$answers = array();
}
@@ -226,11 +224,8 @@
*/
public function handleExport($data)
{
- $language = $this->locale->getLanguage();
- $emptyMsg = sprintf($this->_('No %s found.'), $this->getTopic(0));
- $gsu_id = intval($data['sid']);
- $survey = $this->loader->getTracker()->getSurvey($gsu_id);
-
+ $language = $this->locale->getLanguage();
+ $survey = $this->loader->getTracker()->getSurvey($data['sid']);
$filter = $this->_getFilter($data);
$answers = $survey->getRawTokenAnswerRows($filter);
$answerModel = $survey->getAnswerModel($language);
@@ -239,7 +234,7 @@
$answerModel->set('organizationid', 'multiOptions', $this->escort->getAllowedOrganizations());
if (count($answers) === 0) {
- $answers[0] = array('' => $emptyMsg);
+ $answers[0] = array('' => sprintf($this->_('No %s found.'), $this->getTopic(0)));
}
if (isset($data['type'])) {
Modified: trunk/library/classes/Gems/Tracker/Engine/StepEngineAbstract.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Engine/StepEngineAbstract.php 2011-10-12 08:40:10 UTC (rev 94)
+++ trunk/library/classes/Gems/Tracker/Engine/StepEngineAbstract.php 2011-10-12 13:14:19 UTC (rev 95)
@@ -281,17 +281,20 @@
if ($token->hasSuccesCode() &&
(! $token->isCompleted())) {
- $round = $this->_rounds[$token->getRoundId()];
+ //Only process the token when linked to a round
+ if(array_key_exists($token->getRoundId(), $this->_rounds)) {
+ $round = $this->_rounds[$token->getRoundId()];
- $fromDate = $this->getValidFromDate($round['grp_valid_after_source'], $round['grp_valid_after_field'], $round['grp_valid_after_id'], $token, $respTrack);
- $validFrom = $this->calculateFromDate($fromDate, $round['grp_valid_after_unit'], $round['grp_valid_after_length']);
+ $fromDate = $this->getValidFromDate($round['grp_valid_after_source'], $round['grp_valid_after_field'], $round['grp_valid_after_id'], $token, $respTrack);
+ $validFrom = $this->calculateFromDate($fromDate, $round['grp_valid_after_unit'], $round['grp_valid_after_length']);
- // MUtil_Echo::track($round, (string) $fromDate, $validFrom);
+ // MUtil_Echo::track($round, (string) $fromDate, $validFrom);
- $untilDate = $this->getValidUntilDate($round['grp_valid_for_source'], $round['grp_valid_for_field'], $round['grp_valid_for_id'], $token, $respTrack, $validFrom);
- $validUntil = $this->calculateUntilDate($untilDate, $round['grp_valid_for_unit'], $round['grp_valid_for_length']);
+ $untilDate = $this->getValidUntilDate($round['grp_valid_for_source'], $round['grp_valid_for_field'], $round['grp_valid_for_id'], $token, $respTrack, $validFrom);
+ $validUntil = $this->calculateUntilDate($untilDate, $round['grp_valid_for_unit'], $round['grp_valid_for_length']);
- $changed += $token->setValidFrom($validFrom, $validUntil, $userId);
+ $changed += $token->setValidFrom($validFrom, $validUntil, $userId);
+ }
}
$token = $token->getNextToken();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-10-12 08:40:16
|
Revision: 94
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=94&view=rev
Author: mennodekker
Date: 2011-10-12 08:40:10 +0000 (Wed, 12 Oct 2011)
Log Message:
-----------
Some cleanup and a little formatting
Modified Paths:
--------------
trunk/library/classes/Gems/Default/ExportAction.php
Modified: trunk/library/classes/Gems/Default/ExportAction.php
===================================================================
--- trunk/library/classes/Gems/Default/ExportAction.php 2011-10-12 08:26:48 UTC (rev 93)
+++ trunk/library/classes/Gems/Default/ExportAction.php 2011-10-12 08:40:10 UTC (rev 94)
@@ -124,14 +124,10 @@
$form = $this->getForm($data);
+ //Make the form 'autosubmit' so it can refresh
$form->setAttrib('id', 'autosubmit');
$form->setAutoSubmit(MUtil_Html::attrib('href', array('action' => 'index', MUtil_Model::TEXT_FILTER => null, 'RouteReset' => true)), 'mainform');
- //$this->html[] = new Gems_JQuery_AutoSubmitForm(MUtil_Html::attrib('href', array('action' => 'index', MUtil_Model::TEXT_FILTER => null, 'RouteReset' => true)), 'mainform', $form);
- if ($request->isPost()) {
- $form->populate($data);
- }
-
if ($data) {
$form->populate($data);
}
@@ -147,19 +143,18 @@
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->db->fetchPairs('SELECT gsu_id_survey, gsu_survey_name FROM gems__surveys WHERE gsu_active = 1 ORDER BY gsu_survey_name');
$organizations = $this->escort->getAllowedOrganizations();
- $types = $this->export->getExportClasses();
+ $types = $this->export->getExportClasses();
//Create the basic form
$form = new Gems_Form_TableForm();
- $form->loadDefaultDecorators();
$form->removeDecorator('TabPane');
//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
@@ -180,15 +175,16 @@
$element = new Zend_Form_Element_MultiCheckbox('oid');
$element->setLabel($this->_('Organization'))
- ->setMultiOptions($organizations);
+ ->setMultiOptions($organizations);
$elements[] = $element;
+
$element = new Gems_JQuery_Form_Element_ToggleCheckboxes('toggleOrg', array('selector'=>'input[name^=oid]'));
$element->setLabel('Toggle');
$elements[] = $element;
$element = new Zend_Form_Element_Select('type');
$element->setLabel($this->_('Export to'))
- ->setMultiOptions($types);
+ ->setMultiOptions($types);
$elements[] = $element;
//Add all elements to the form
@@ -198,8 +194,9 @@
//Now make a change for the selected export type
if (isset($data['type'])) {
$exportClass = $this->export->getExport($data['type']);
- $formFields = $exportClass->getFormElements($form, $data);
- $exportName = $exportClass->getName();
+ $formFields = $exportClass->getFormElements($form, $data);
+ $exportName = $exportClass->getName();
+
//Now add a hidden field so we know that when this is present in the $data
//we don't need to set the defaults
$formFields[] = new Zend_Form_Element_Hidden($exportName);
@@ -216,7 +213,7 @@
//Finally create a submit button and add to the form
$element = new Zend_Form_Element_Submit('export');
$element->setLabel('Export')
- ->setAttrib('class', 'button');
+ ->setAttrib('class', 'button');
$form->addElement($element);
return $form;
@@ -231,12 +228,13 @@
{
$language = $this->locale->getLanguage();
$emptyMsg = sprintf($this->_('No %s found.'), $this->getTopic(0));
- $gsu_id = intval($data['sid']);
- $survey = $this->loader->getTracker()->getSurvey($gsu_id);
+ $gsu_id = intval($data['sid']);
+ $survey = $this->loader->getTracker()->getSurvey($gsu_id);
- $filter = $this->_getFilter($data);
- $answers = $survey->getRawTokenAnswerRows($filter);
+ $filter = $this->_getFilter($data);
+ $answers = $survey->getRawTokenAnswerRows($filter);
$answerModel = $survey->getAnswerModel($language);
+
//Now add the organization id => name mapping
$answerModel->set('organizationid', 'multiOptions', $this->escort->getAllowedOrganizations());
@@ -255,6 +253,15 @@
}
}
+ /**
+ * Convert the submitted form-data to a filter to be used for retrieving the data to export
+ *
+ * Now only handles the organization ID and consent codes, but can be extended to
+ * include track info or perform some checks
+ *
+ * @param array $data
+ * @return array
+ */
public function _getFilter($data) {
$filter = array();
if (isset($data['oid'])) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-10-12 08:26:55
|
Revision: 93
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=93&view=rev
Author: mennodekker
Date: 2011-10-12 08:26:48 +0000 (Wed, 12 Oct 2011)
Log Message:
-----------
Removed obsolete hook, use track-events now
Modified Paths:
--------------
trunk/library/classes/GemsEscort.php
Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php 2011-10-12 07:55:30 UTC (rev 92)
+++ trunk/library/classes/GemsEscort.php 2011-10-12 08:26:48 UTC (rev 93)
@@ -925,17 +925,6 @@
}
/**
- * Hook to do project specific handling after a round was completed
- *
- * The tokendata array will be passed and the values to be saved, including a possible calculated
- * result. We can calculate results here, and maybe add extra surveys or present a warning screen.
- *
- * @param array $tokenData
- * @param array $values
- */
- public function afterRoundCompleted($tokenData, $values) {}
-
- /**
* Hook 2: Called in $this->run().
*
* This->init() has ran and the constructor has finisched so all _init{name} and application.ini
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-10-12 07:55:37
|
Revision: 92
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=92&view=rev
Author: mennodekker
Date: 2011-10-12 07:55:30 +0000 (Wed, 12 Oct 2011)
Log Message:
-----------
Menu updates:
-Removed duplicate 'staff' item that caused jumping branches when clicked from within setup item
-Removed 'acl' as it provides no useful information not mentioned elsewhere
Modified Paths:
--------------
trunk/library/classes/Gems/Default/RoleAction.php
trunk/library/classes/Gems/Menu.php
Modified: trunk/library/classes/Gems/Default/RoleAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RoleAction.php 2011-10-11 16:24:36 UTC (rev 91)
+++ trunk/library/classes/Gems/Default/RoleAction.php 2011-10-12 07:55:30 UTC (rev 92)
@@ -53,12 +53,6 @@
$this->html[] = $table;
}
- public function aclAction()
- {
- $this->html->h2($this->_('Access Control Lists'));
- $this->_showTable($this->_('ACL\'s'), $this->acl->getRoles());
- }
-
/**
* Adds elements from the model to the bridge that creates the form.
*
Modified: trunk/library/classes/Gems/Menu.php
===================================================================
--- trunk/library/classes/Gems/Menu.php 2011-10-11 16:24:36 UTC (rev 91)
+++ trunk/library/classes/Gems/Menu.php 2011-10-12 07:55:30 UTC (rev 92)
@@ -193,7 +193,6 @@
// ROLES CONTROLLER
$page = $setup->addBrowsePage($this->_('Roles'), 'pr.role', 'role');
- $page->addAction($this->_('ACL'), null, 'acl');
$page->addAction($this->_('Assigned'), null, 'overview');
$page->addAction($this->_('Privileges'), null, 'privilege');
@@ -520,9 +519,6 @@
// PROJECT INFO
$this->addProjectPage($this->_('Project'));
- // MAIN STAFF ITEM
- $this->addStaffPage($this->_('Staff'), array('order'=>40));
-
// SETUP CONTAINER
$this->addGemsSetupContainer($this->_('Setup'));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-10-11 16:24:44
|
Revision: 91
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=91&view=rev
Author: matijsdejong
Date: 2011-10-11 16:24:36 +0000 (Tue, 11 Oct 2011)
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 2011-10-11 16:00:46 UTC (rev 90)
+++ trunk/library/languages/default-en.po 2011-10-11 16:24:36 UTC (rev 91)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: Pulse EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-20 17:39+0100\n"
+"POT-Creation-Date: 2011-10-11 18:18+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -18,48 +18,48 @@
"X-Poedit-KeywordsList: plural:1,2\n"
"X-Poedit-SearchPath-0: .\n"
-#: classes/GemsEscort.php:160
+#: classes/GemsEscort.php:155
#, php-format
msgid "Path %s not writable"
msgstr "Path %s not writable"
-#: classes/GemsEscort.php:841
+#: classes/GemsEscort.php:840
#, php-format
msgid "User: %s"
msgstr "User: %s"
-#: classes/GemsEscort.php:865
+#: classes/GemsEscort.php:864
msgid "version"
msgstr "version"
-#: classes/GemsEscort.php:1422
+#: classes/GemsEscort.php:1421
msgid "Take note: your session has expired, your inputs where not saved. Please check the input data and try again"
msgstr "Take note: your session has expired, your inputs where not saved. Please check the input data and try again"
-#: classes/GemsEscort.php:1544
+#: classes/GemsEscort.php:1543
msgid "No access to site."
msgstr "No access to site."
-#: classes/GemsEscort.php:1546
-#: classes/GemsEscort.php:1582
+#: classes/GemsEscort.php:1545
+#: classes/GemsEscort.php:1581
msgid "You have no access to this site."
msgstr "You have no access to this site."
-#: classes/GemsEscort.php:1562
+#: classes/GemsEscort.php:1561
msgid "No access to page"
msgstr "No access to page"
-#: classes/GemsEscort.php:1564
+#: classes/GemsEscort.php:1563
#, 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:1569
-#: classes/GemsEscort.php:1580
+#: classes/GemsEscort.php:1568
+#: classes/GemsEscort.php:1579
msgid "You are no longer logged in."
msgstr "You are no longer logged in."
-#: classes/GemsEscort.php:1570
+#: classes/GemsEscort.php:1569
msgid "You must login to access this page."
msgstr "You must login to access this page."
@@ -120,263 +120,203 @@
msgid "Support"
msgstr "Support"
-#: classes/Gems/Menu.php:167
+#: classes/Gems/Menu.php:166
+msgid "Project setup"
+msgstr "Project setup"
+
+#: classes/Gems/Menu.php:169
msgid "Database"
msgstr "Database"
-#: classes/Gems/Menu.php:171
+#: classes/Gems/Menu.php:173
msgid "Content"
msgstr "Content"
-#: classes/Gems/Menu.php:174
+#: classes/Gems/Menu.php:176
msgid "Execute"
msgstr "Execute"
-#: classes/Gems/Menu.php:179
+#: classes/Gems/Menu.php:181
msgid "Patches"
msgstr "Patches"
-#: classes/Gems/Menu.php:180
+#: classes/Gems/Menu.php:182
msgid "Execute new"
msgstr "Execute new"
-#: classes/Gems/Menu.php:182
+#: classes/Gems/Menu.php:184
msgid "Refresh translateables"
msgstr "Refresh translateables"
-#: classes/Gems/Menu.php:184
+#: classes/Gems/Menu.php:186
msgid "Run SQL"
msgstr "Run SQL"
-#: classes/Gems/Menu.php:187
-msgid "Project setup"
-msgstr "Project setup"
-
-#: classes/Gems/Menu.php:188
-msgid "Errors"
-msgstr "Errors"
-
#: classes/Gems/Menu.php:189
-msgid "PHP"
-msgstr "PHP"
+msgid "Reception codes"
+msgstr "Reception codes"
-#: classes/Gems/Menu.php:190
-#: classes/Gems/Menu.php:581
-msgid "Project"
-msgstr "Project"
-
-#: classes/Gems/Menu.php:191
-msgid "Session"
-msgstr "Session"
-
-#: classes/Gems/Menu.php:200
+#: classes/Gems/Menu.php:192
msgid "Consents"
msgstr "Consents"
-#: classes/Gems/Menu.php:203
-msgid "Organizations"
-msgstr "Organizations"
-
-#: classes/Gems/Menu.php:206
-msgid "Groups"
-msgstr "Groups"
-
-#: classes/Gems/Menu.php:209
+#: classes/Gems/Menu.php:195
msgid "Roles"
msgstr "Roles"
-#: classes/Gems/Menu.php:210
+#: classes/Gems/Menu.php:196
msgid "ACL"
msgstr "ACL"
-#: classes/Gems/Menu.php:211
-#: classes/Gems/Menu.php:398
+#: classes/Gems/Menu.php:197
+#: classes/Gems/Menu.php:338
msgid "Assigned"
msgstr "Assigned"
-#: classes/Gems/Menu.php:212
+#: classes/Gems/Menu.php:198
msgid "Privileges"
msgstr "Privileges"
-#: classes/Gems/Menu.php:215
-msgid "Reception codes"
-msgstr "Reception codes"
+#: classes/Gems/Menu.php:201
+msgid "Groups"
+msgstr "Groups"
-#: classes/Gems/Menu.php:218
-msgid "Survey Sources"
-msgstr "Survey Sources"
+#: classes/Gems/Menu.php:204
+msgid "Organizations"
+msgstr "Organizations"
-#: classes/Gems/Menu.php:220
-msgid "Check status"
-msgstr "Check status"
+#: classes/Gems/Menu.php:207
+#: classes/Gems/Menu.php:524
+msgid "Staff"
+msgstr "Staff"
-#: classes/Gems/Menu.php:221
-msgid "Synchronize surveys"
-msgstr "Synchronize surveys"
-
-#: classes/Gems/Menu.php:222
-#: classes/Gems/Menu.php:233
-msgid "Check answers"
-msgstr "Check answers"
-
-#: classes/Gems/Menu.php:223
-msgid "Synchronize all surveys"
-msgstr "Synchronize all surveys"
-
-#: classes/Gems/Menu.php:224
-#: classes/Gems/Menu.php:234
-msgid "Check all answers"
-msgstr "Check all answers"
-
-#: classes/Gems/Menu.php:227
-#: classes/Gems/Menu.php:388
-msgid "Surveys"
-msgstr "Surveys"
-
-#: classes/Gems/Menu.php:230
-msgid "PDF"
-msgstr "PDF"
-
-#: classes/Gems/Menu.php:239
-#: classes/Gems/Menu.php:354
-msgid "Tracks"
-msgstr "Tracks"
-
-#: classes/Gems/Menu.php:242
-msgid "Fields"
-msgstr "Fields"
-
-#: classes/Gems/Menu.php:249
-msgid "Rounds"
-msgstr "Rounds"
-
-#: classes/Gems/Menu.php:258
-msgid "Round"
-msgstr "Round"
-
-#: classes/Gems/Menu.php:264
-msgid "Check assignments"
-msgstr "Check assignments"
-
-#: classes/Gems/Menu.php:267
-msgid "Check all assignments"
-msgstr "Check all assignments"
-
-#: classes/Gems/Menu.php:270
+#: classes/Gems/Menu.php:210
msgid "Logging"
msgstr "Logging"
-#: classes/Gems/Menu.php:274
+#: classes/Gems/Menu.php:214
msgid "Maintenance"
msgstr "Maintenance"
-#: classes/Gems/Menu.php:288
+#: classes/Gems/Menu.php:228
#, php-format
msgid "Stand-alone privilige: %s"
msgstr "Stand-alone privilige: %s"
-#: classes/Gems/Menu.php:295
+#: classes/Gems/Menu.php:235
msgid "Logon"
msgstr "Logon"
-#: classes/Gems/Menu.php:296
+#: classes/Gems/Menu.php:236
msgid "Lost password"
msgstr "Lost password"
-#: classes/Gems/Menu.php:297
+#: classes/Gems/Menu.php:237
msgid "Your account"
msgstr "Your account"
-#: classes/Gems/Menu.php:298
+#: classes/Gems/Menu.php:238
msgid "Activity overview"
msgstr "Activity overview"
-#: classes/Gems/Menu.php:299
+#: classes/Gems/Menu.php:239
msgid "Change password"
msgstr "Change password"
-#: classes/Gems/Menu.php:300
-#: classes/Gems/Menu.php:340
-#: classes/Gems/Menu.php:375
+#: classes/Gems/Menu.php:240
+#: classes/Gems/Menu.php:280
+#: classes/Gems/Menu.php:315
msgid "Token"
msgstr "Token"
-#: classes/Gems/Menu.php:301
+#: classes/Gems/Menu.php:241
msgid "Logoff"
msgstr "Logoff"
-#: classes/Gems/Menu.php:336
+#: classes/Gems/Menu.php:276
msgid "Track"
msgstr "Track"
-#: classes/Gems/Menu.php:343
-#: classes/Gems/Menu.php:363
-#: classes/Gems/Menu.php:394
+#: classes/Gems/Menu.php:283
+#: classes/Gems/Menu.php:303
+#: classes/Gems/Menu.php:334
msgid "Add"
msgstr "Add"
-#: classes/Gems/Menu.php:347
-#: classes/Gems/Menu.php:430
+#: classes/Gems/Menu.php:287
+#: classes/Gems/Menu.php:370
msgid "Preview"
msgstr "Preview"
-#: classes/Gems/Menu.php:367
+#: classes/Gems/Menu.php:294
+msgid "Tracks"
+msgstr "Tracks"
+
+#: classes/Gems/Menu.php:307
msgid "Assignments"
msgstr "Assignments"
-#: classes/Gems/Menu.php:371
+#: classes/Gems/Menu.php:311
msgid "Show"
msgstr "Show"
-#: classes/Gems/Menu.php:379
+#: classes/Gems/Menu.php:319
msgid "Edit"
msgstr "Edit"
-#: classes/Gems/Menu.php:383
+#: classes/Gems/Menu.php:323
msgid "Delete"
msgstr "Delete"
-#: classes/Gems/Menu.php:420
+#: classes/Gems/Menu.php:328
+msgid "Surveys"
+msgstr "Surveys"
+
+#: classes/Gems/Menu.php:360
msgid "Fill in"
msgstr "Fill in"
-#: classes/Gems/Menu.php:424
+#: classes/Gems/Menu.php:364
msgid "Print PDF"
msgstr "Print PDF"
-#: classes/Gems/Menu.php:427
+#: classes/Gems/Menu.php:367
msgid "E-Mail now!"
msgstr "E-Mail now!"
-#: classes/Gems/Menu.php:433
+#: classes/Gems/Menu.php:373
msgid "Answers"
msgstr "Answers"
-#: classes/Gems/Menu.php:571
+#: classes/Gems/Menu.php:511
msgid "Respondents"
msgstr "Patients"
-#: classes/Gems/Menu.php:574
+#: classes/Gems/Menu.php:514
msgid "Overview"
msgstr "Overview"
-#: classes/Gems/Menu.php:584
-msgid "Staff"
-msgstr "Staff"
+#: classes/Gems/Menu.php:521
+msgid "Project"
+msgstr "Project"
-#: classes/Gems/Menu.php:587
+#: classes/Gems/Menu.php:527
msgid "Setup"
msgstr "Setup"
-#: classes/Gems/Menu.php:590
+#: classes/Gems/Menu.php:530
msgid "Mail"
msgstr "Mail"
-#: classes/Gems/Menu.php:599
+#: classes/Gems/Menu.php:533
+msgid "Track Builder"
+msgstr "Track Builder"
+
+#: classes/Gems/Menu.php:542
msgid "Contact"
msgstr "Contact"
-#: classes/Gems/Menu.php:612
+#: classes/Gems/Menu.php:555
msgid "Changelog"
msgstr "Changelog"
@@ -473,56 +413,56 @@
msgid "No %s found"
msgstr "No %s found"
-#: classes/Gems/Controller/BrowseEditAction.php:635
+#: classes/Gems/Controller/BrowseEditAction.php:649
#, php-format
msgid "No %s found."
msgstr "No %s found."
-#: classes/Gems/Controller/BrowseEditAction.php:750
+#: classes/Gems/Controller/BrowseEditAction.php:764
msgid "Are you sure?"
msgstr "Are you sure?"
-#: classes/Gems/Controller/BrowseEditAction.php:766
+#: classes/Gems/Controller/BrowseEditAction.php:780
msgid "Yes"
msgstr "Yes"
-#: classes/Gems/Controller/BrowseEditAction.php:767
+#: classes/Gems/Controller/BrowseEditAction.php:781
msgid "No"
msgstr "No"
-#: classes/Gems/Controller/BrowseEditAction.php:820
+#: classes/Gems/Controller/BrowseEditAction.php:834
#, php-format
msgid "Unknown %s requested"
msgstr "Unknown %s requested"
-#: classes/Gems/Controller/BrowseEditAction.php:843
+#: classes/Gems/Controller/BrowseEditAction.php:857
#, php-format
msgid "New %1$s..."
msgstr "New %1$s..."
-#: classes/Gems/Controller/BrowseEditAction.php:851
+#: classes/Gems/Controller/BrowseEditAction.php:865
msgid "Save"
msgstr "Save"
-#: classes/Gems/Controller/BrowseEditAction.php:887
+#: classes/Gems/Controller/BrowseEditAction.php:901
#, php-format
msgid "%2$u %1$s saved"
msgstr "%2$u %1$s saved"
-#: classes/Gems/Controller/BrowseEditAction.php:890
+#: classes/Gems/Controller/BrowseEditAction.php:904
msgid "No changes to save."
msgstr "No changes to save."
-#: classes/Gems/Controller/BrowseEditAction.php:899
+#: classes/Gems/Controller/BrowseEditAction.php:913
msgid "Input error! No changes saved!"
msgstr "Input error! No changes saved!"
-#: classes/Gems/Controller/BrowseEditAction.php:927
+#: classes/Gems/Controller/BrowseEditAction.php:941
#, php-format
msgid "Show %s"
msgstr "Show %s"
-#: classes/Gems/Controller/BrowseEditAction.php:934
+#: classes/Gems/Controller/BrowseEditAction.php:948
#, php-format
msgid "Unknown %s."
msgstr "Unknown %s."
@@ -532,6 +472,10 @@
msgid "Cancel"
msgstr "Cancel"
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:164
+msgid "No data found."
+msgstr "No data found."
+
#: classes/Gems/Default/AskAction.php:127
#, php-format
msgid "Welcome %s,"
@@ -629,7 +573,6 @@
msgstr "The number zero and the letter O are treated as the same; the same goes for the number one and the letter L."
#: classes/Gems/Default/ConsentAction.php:66
-#: classes/Gems/Default/CountryAction.php:67
#: classes/Gems/Default/GroupAction.php:87
msgid "Description"
msgstr "Description"
@@ -689,28 +632,6 @@
msgid "Links concerning this web application:"
msgstr "Links concerning this web application:"
-#: classes/Gems/Default/CountryAction.php:66
-msgid "Code"
-msgstr "Code"
-
-#: classes/Gems/Default/CountryAction.php:68
-msgid "In EU"
-msgstr "In EU"
-
-#: classes/Gems/Default/CountryAction.php:72
-msgid "Notes"
-msgstr "Notes"
-
-#: classes/Gems/Default/CountryAction.php:86
-msgid "country"
-msgid_plural "countries"
-msgstr[0] "country"
-msgstr[1] "countries"
-
-#: classes/Gems/Default/CountryAction.php:91
-msgid "Countries"
-msgstr "Countries"
-
#: classes/Gems/Default/DatabaseAction.php:64
#, php-format
msgid "Executed %2$s creation script %1$s:"
@@ -1069,6 +990,7 @@
msgstr "Username"
#: classes/Gems/Default/IndexAction.php:105
+#: classes/Gems/Default/MailServerAction.php:88
msgid "Password"
msgstr "Password"
@@ -1136,95 +1058,95 @@
msgid "Invalid language setting."
msgstr "Invalid language setting."
-#: classes/Gems/Default/LogAction.php:54
+#: classes/Gems/Default/LogAction.php:61
msgid "from"
msgstr "from"
-#: classes/Gems/Default/LogAction.php:59
+#: classes/Gems/Default/LogAction.php:66
msgid "until"
msgstr "until"
-#: classes/Gems/Default/LogAction.php:65
+#: classes/Gems/Default/LogAction.php:72
msgid "days"
msgstr "days"
-#: classes/Gems/Default/LogAction.php:66
+#: classes/Gems/Default/LogAction.php:73
msgid "weeks"
msgstr "weeks"
-#: classes/Gems/Default/LogAction.php:67
+#: classes/Gems/Default/LogAction.php:74
msgid "months"
msgstr "months"
-#: classes/Gems/Default/LogAction.php:68
+#: classes/Gems/Default/LogAction.php:75
msgid "years"
msgstr "years"
-#: classes/Gems/Default/LogAction.php:89
+#: classes/Gems/Default/LogAction.php:96
msgid "Staff:"
msgstr "Staff:"
-#: classes/Gems/Default/LogAction.php:93
+#: classes/Gems/Default/LogAction.php:100
msgid "All staff"
msgstr "All staff"
-#: classes/Gems/Default/LogAction.php:95
+#: classes/Gems/Default/LogAction.php:102
msgid "Patient:"
msgstr "Patient:"
-#: classes/Gems/Default/LogAction.php:99
+#: classes/Gems/Default/LogAction.php:106
msgid "All patients"
msgstr "All patients"
-#: classes/Gems/Default/LogAction.php:102
+#: classes/Gems/Default/LogAction.php:109
msgid "Action:"
msgstr "Action:"
-#: classes/Gems/Default/LogAction.php:105
+#: classes/Gems/Default/LogAction.php:112
msgid "All actions"
msgstr "All actions"
-#: classes/Gems/Default/LogAction.php:156
+#: classes/Gems/Default/LogAction.php:163
msgid "Date"
msgstr "Date"
-#: classes/Gems/Default/LogAction.php:157
-#: classes/Gems/Default/LogMaintenanceAction.php:44
+#: classes/Gems/Default/LogAction.php:164
+#: classes/Gems/Default/LogMaintenanceAction.php:52
msgid "Action"
msgstr "Action"
-#: classes/Gems/Default/LogAction.php:158
+#: classes/Gems/Default/LogAction.php:165
#: classes/Gems/Default/MailAction.php:65
msgid "Message"
msgstr "Message"
-#: classes/Gems/Default/LogAction.php:160
+#: classes/Gems/Default/LogAction.php:167
msgid "Respondent"
msgstr "Patient"
-#: classes/Gems/Default/LogAction.php:166
-#: classes/Gems/Default/LogMaintenanceAction.php:45
+#: classes/Gems/Default/LogAction.php:173
+#: classes/Gems/Default/LogMaintenanceAction.php:53
msgid "Log"
msgstr "Log"
-#: classes/Gems/Default/LogMaintenanceAction.php:62
+#: classes/Gems/Default/LogMaintenanceAction.php:70
msgid "Log:"
msgstr "Log:"
-#: classes/Gems/Default/LogMaintenanceAction.php:63
+#: classes/Gems/Default/LogMaintenanceAction.php:71
msgid "All"
msgstr "All"
-#: classes/Gems/Default/LogMaintenanceAction.php:69
+#: classes/Gems/Default/LogMaintenanceAction.php:77
msgid "Log action"
msgstr "Log action"
-#: classes/Gems/Default/LogMaintenanceAction.php:73
+#: classes/Gems/Default/LogMaintenanceAction.php:81
msgid "Log maintenance"
msgstr "Log maintenance"
#: classes/Gems/Default/MailAction.php:61
-#: classes/Gems/Default/MailLogAction.php:95
+#: classes/Gems/Default/MailLogAction.php:132
#: classes/Gems/Default/MailLogActionOldStyle.php:118
msgid "Subject"
msgstr "Subject"
@@ -1243,41 +1165,45 @@
msgid "Email templates"
msgstr "Email templates"
-#: classes/Gems/Default/MailLogAction.php:89
+#: classes/Gems/Default/MailLogAction.php:126
#: classes/Gems/Default/MailLogActionOldStyle.php:112
msgid "Date sent"
msgstr "Date sent"
-#: classes/Gems/Default/MailLogAction.php:90
+#: classes/Gems/Default/MailLogAction.php:127
#: classes/Gems/Default/MailLogActionOldStyle.php:113
msgid "Receiver"
msgstr "Receiver"
-#: classes/Gems/Default/MailLogAction.php:91
+#: classes/Gems/Default/MailLogAction.php:128
#: classes/Gems/Default/MailLogActionOldStyle.php:114
msgid "To address"
msgstr "To address"
-#: classes/Gems/Default/MailLogAction.php:92
+#: classes/Gems/Default/MailLogAction.php:129
#: classes/Gems/Default/MailLogActionOldStyle.php:115
msgid "Sender"
msgstr "Sender"
-#: classes/Gems/Default/MailLogAction.php:93
+#: classes/Gems/Default/MailLogAction.php:130
#: classes/Gems/Default/MailLogActionOldStyle.php:116
msgid "From address"
msgstr "From address"
-#: classes/Gems/Default/MailLogAction.php:98
+#: classes/Gems/Default/MailLogAction.php:135
#: classes/Gems/Default/MailLogActionOldStyle.php:121
msgid "Template"
msgstr "Template"
-#: classes/Gems/Default/MailLogAction.php:108
+#: classes/Gems/Default/MailLogAction.php:148
#: classes/Gems/Default/MailLogActionOldStyle.php:148
msgid "Mail Activity Log"
msgstr "Mail Activity Log"
+#: classes/Gems/Default/MailLogAction.php:160
+msgid "Show Mail Activity Log item"
+msgstr "Show Mail Activity Log item"
+
#: classes/Gems/Default/MailLogActionOldStyle.php:137
msgid "Activity Log"
msgid_plural "Activity Logs"
@@ -1325,16 +1251,10 @@
msgstr "User ID"
#: classes/Gems/Default/MailServerAction.php:90
-#: classes/Gems/Default/OptionAction.php:107
-#: classes/Gems/Default/OptionAction.php:112
-#: classes/Gems/Default/SourceAction.php:95
-#: classes/Gems/Default/StaffAction.php:114
msgid "Repeat password"
msgstr "Repeat password"
#: classes/Gems/Default/MailServerAction.php:91
-#: classes/Gems/Default/SourceAction.php:74
-#: classes/Gems/Default/StaffAction.php:99
msgid "Enter only when changing"
msgstr "Enter only when changing the password"
@@ -1351,12 +1271,12 @@
#: classes/Gems/Default/OptionAction.php:73
#: classes/Gems/Default/OrganizationAction.php:128
#: classes/Gems/Default/RespondentAction.php:173
-#: classes/Gems/Default/StaffAction.php:192
+#: classes/Gems/Default/StaffAction.php:193
msgid "Language"
msgstr "Language"
#: classes/Gems/Default/OptionAction.php:74
-#: classes/Gems/Default/StaffAction.php:193
+#: classes/Gems/Default/StaffAction.php:194
msgid "Logout on survey"
msgstr "Logout on survey"
@@ -1467,7 +1387,7 @@
#: classes/Gems/Default/OverviewPlanAction.php:115
#: classes/Gems/Default/ProjectSurveysAction.php:88
#: classes/Gems/Default/SurveyAction.php:203
-#: classes/Gems/Default/SurveyMaintenanceAction.php:425
+#: classes/Gems/Default/SurveyMaintenanceAction.php:409
msgid "survey"
msgid_plural "surveys"
msgstr[0] "survey"
@@ -1478,107 +1398,109 @@
msgstr "Planning overview"
#: classes/Gems/Default/ProjectInformationAction.php:71
-#, php-format
-msgid "No changelog found. Place one in %s."
-msgstr "No changelog found. Place one in %s."
+msgid "empty file"
+msgstr "empty file"
-#: classes/Gems/Default/ProjectInformationAction.php:77
+#: classes/Gems/Default/ProjectInformationAction.php:75
+msgid "file not found"
+msgstr "file not found"
+
+#: classes/Gems/Default/ProjectInformationAction.php:108
msgid "Logged errors"
msgstr "Logged errors"
-#: classes/Gems/Default/ProjectInformationAction.php:88
-#: classes/Gems/Default/ProjectInformationAction.php:95
+#: classes/Gems/Default/ProjectInformationAction.php:108
msgid "Empty logfile"
msgstr "Empty logfile"
-#: classes/Gems/Default/ProjectInformationAction.php:94
-msgid "No logged errors found."
-msgstr "No logged errors found."
-
-#: classes/Gems/Default/ProjectInformationAction.php:101
+#: classes/Gems/Default/ProjectInformationAction.php:113
msgid "Project information"
msgstr "Project information"
-#: classes/Gems/Default/ProjectInformationAction.php:105
+#: classes/Gems/Default/ProjectInformationAction.php:117
msgid "Project name"
msgstr "Project name"
-#: classes/Gems/Default/ProjectInformationAction.php:106
+#: classes/Gems/Default/ProjectInformationAction.php:118
msgid "Project version"
msgstr "Project version"
-#: classes/Gems/Default/ProjectInformationAction.php:107
+#: classes/Gems/Default/ProjectInformationAction.php:119
msgid "Gems version"
msgstr "Gems version"
-#: classes/Gems/Default/ProjectInformationAction.php:109
+#: classes/Gems/Default/ProjectInformationAction.php:121
msgid "Gems project"
msgstr "Gems project"
-#: classes/Gems/Default/ProjectInformationAction.php:110
+#: classes/Gems/Default/ProjectInformationAction.php:122
msgid "Gems web directory"
msgstr "Gems web directory"
-#: classes/Gems/Default/ProjectInformationAction.php:111
+#: classes/Gems/Default/ProjectInformationAction.php:123
msgid "Gems code directory"
msgstr "Gems code directory"
-#: classes/Gems/Default/ProjectInformationAction.php:112
+#: classes/Gems/Default/ProjectInformationAction.php:124
msgid "Gems project path"
msgstr "Gems project path"
-#: classes/Gems/Default/ProjectInformationAction.php:113
+#: classes/Gems/Default/ProjectInformationAction.php:125
msgid "MUtil version"
msgstr "MUtil version"
-#: classes/Gems/Default/ProjectInformationAction.php:114
+#: classes/Gems/Default/ProjectInformationAction.php:126
msgid "Zend version"
msgstr "Zend version"
-#: classes/Gems/Default/ProjectInformationAction.php:115
+#: classes/Gems/Default/ProjectInformationAction.php:127
msgid "Application environment"
msgstr "Application environment"
-#: classes/Gems/Default/ProjectInformationAction.php:116
+#: classes/Gems/Default/ProjectInformationAction.php:128
msgid "Application baseuri"
msgstr "Application baseuri"
-#: classes/Gems/Default/ProjectInformationAction.php:117
+#: classes/Gems/Default/ProjectInformationAction.php:129
msgid "Application directory"
msgstr "Application directory"
-#: classes/Gems/Default/ProjectInformationAction.php:118
+#: classes/Gems/Default/ProjectInformationAction.php:130
msgid "PHP version"
msgstr "PHP version"
-#: classes/Gems/Default/ProjectInformationAction.php:119
+#: classes/Gems/Default/ProjectInformationAction.php:131
msgid "Server Hostname"
msgstr "Server Hostname"
-#: classes/Gems/Default/ProjectInformationAction.php:120
+#: classes/Gems/Default/ProjectInformationAction.php:132
msgid "Server OS"
msgstr "Server OS"
-#: classes/Gems/Default/ProjectInformationAction.php:121
+#: classes/Gems/Default/ProjectInformationAction.php:133
msgid "Time on server"
msgstr "Time on server"
-#: classes/Gems/Default/ProjectInformationAction.php:123
+#: classes/Gems/Default/ProjectInformationAction.php:135
msgid "Version information"
msgstr "Version information"
-#: classes/Gems/Default/ProjectInformationAction.php:128
+#: classes/Gems/Default/ProjectInformationAction.php:140
msgid "Server PHP Info"
msgstr "Server PHP Info"
-#: classes/Gems/Default/ProjectInformationAction.php:141
+#: classes/Gems/Default/ProjectInformationAction.php:153
msgid "Project settings"
msgstr "Project settings"
-#: classes/Gems/Default/ProjectInformationAction.php:148
+#: classes/Gems/Default/ProjectInformationAction.php:160
msgid "Session content"
msgstr "Session content"
+#: classes/Gems/Default/ProjectInformationAction.php:161
+msgid "Session"
+msgstr "Session"
+
#: classes/Gems/Default/ProjectSurveysAction.php:68
#: classes/Gems/Default/SurveyAction.php:192
msgid "By"
@@ -1587,12 +1509,14 @@
#: classes/Gems/Default/ProjectSurveysAction.php:69
#: classes/Gems/Default/ProjectTracksAction.php:67
#: classes/Gems/Default/SurveyAction.php:193
+#: classes/Gems/Default/TrackAction.php:329
msgid "From"
msgstr "From"
#: classes/Gems/Default/ProjectSurveysAction.php:70
#: classes/Gems/Default/ProjectTracksAction.php:68
#: classes/Gems/Default/SurveyAction.php:195
+#: classes/Gems/Default/TrackAction.php:331
msgid "Until"
msgstr "Until"
@@ -1601,10 +1525,12 @@
msgstr "Active surveys"
#: classes/Gems/Default/ProjectTracksAction.php:65
+#: classes/Gems/Default/TrackAction.php:328
msgid "Survey #"
msgstr "Survey #"
#: classes/Gems/Default/ProjectTracksAction.php:85
+#: classes/Gems/Default/TrackAction.php:451
msgid "track"
msgid_plural "tracks"
msgstr[0] "track"
@@ -1642,6 +1568,10 @@
msgid "Additional action"
msgstr "Additional action"
+#: classes/Gems/Default/ReceptionAction.php:79
+msgid "Code"
+msgstr "Code"
+
#: classes/Gems/Default/ReceptionAction.php:82
msgid "Is success code"
msgstr "Is success code"
@@ -1761,6 +1691,8 @@
msgstr "Treatment"
#: classes/Gems/Default/RespondentAction.php:230
+#: classes/Gems/Default/TrackAction.php:131
+#: classes/Gems/Default/TrackAction.php:475
msgid "Rejection code"
msgstr "Rejection code"
@@ -1773,6 +1705,7 @@
msgstr "Patient deleted"
#: classes/Gems/Default/RespondentAction.php:291
+#: classes/Gems/Default/TrackAction.php:404
msgid "Choose a reception code to delete."
msgstr "Choose a reception code to delete."
@@ -1782,24 +1715,29 @@
msgstr[0] "patient"
msgstr[1] "patients"
-#: classes/Gems/Default/RespondentAction.php:395
+#: classes/Gems/Default/RespondentAction.php:398
msgid "Please settle the informed consent form for this respondent."
msgstr "Please settle the informed consent form for this patient."
#: classes/Gems/Default/RespondentPlanAction.php:67
#: classes/Gems/Default/SurveyAction.php:171
+#: classes/Gems/Default/TrackAction.php:296
msgid "Show respondent"
msgstr "Show patient"
#: classes/Gems/Default/RespondentPlanAction.php:73
+#: classes/Gems/Default/TrackAction.php:265
+#: classes/Gems/Default/TrackAction.php:284
msgid "Show track"
msgstr "Show track"
#: classes/Gems/Default/RespondentPlanAction.php:136
+#: classes/Gems/Default/TrackAction.php:316
msgid " of "
msgstr " of "
#: classes/Gems/Default/RespondentPlanAction.php:137
+#: classes/Gems/Default/TrackAction.php:317
msgid "Progress"
msgstr "Progress"
@@ -1815,40 +1753,40 @@
msgid "ACL's"
msgstr "ACL's"
-#: classes/Gems/Default/RoleAction.php:168
-#: classes/Gems/Default/RoleAction.php:209
+#: classes/Gems/Default/RoleAction.php:172
+#: classes/Gems/Default/RoleAction.php:213
msgid "Parents"
msgstr "Parents"
-#: classes/Gems/Default/RoleAction.php:187
+#: classes/Gems/Default/RoleAction.php:191
msgid "role"
msgid_plural "roles"
msgstr[0] "role"
msgstr[1] "roles"
-#: classes/Gems/Default/RoleAction.php:192
+#: classes/Gems/Default/RoleAction.php:196
msgid "Administrative roles"
msgstr "Administrative roles"
-#: classes/Gems/Default/RoleAction.php:210
-#: classes/Gems/Default/RoleAction.php:226
+#: classes/Gems/Default/RoleAction.php:214
+#: classes/Gems/Default/RoleAction.php:230
msgid "Allowed"
msgstr "Allowed"
-#: classes/Gems/Default/RoleAction.php:211
-#: classes/Gems/Default/RoleAction.php:227
+#: classes/Gems/Default/RoleAction.php:215
+#: classes/Gems/Default/RoleAction.php:231
msgid "Denied"
msgstr "Denied"
-#: classes/Gems/Default/RoleAction.php:215
+#: classes/Gems/Default/RoleAction.php:219
msgid "Project role overview"
msgstr "Project role overview"
-#: classes/Gems/Default/RoleAction.php:225
+#: classes/Gems/Default/RoleAction.php:229
msgid "Privilege"
msgstr "Privilege"
-#: classes/Gems/Default/RoleAction.php:231
+#: classes/Gems/Default/RoleAction.php:235
msgid "Project privileges"
msgstr "Project privileges"
@@ -1899,6 +1837,10 @@
msgstr[0] "source"
msgstr[1] "sources"
+#: classes/Gems/Default/SourceAction.php:194
+msgid "Survey Sources"
+msgstr "Survey Sources"
+
#: classes/Gems/Default/SourceAction.php:202
msgid "This installation is active."
msgstr "This installation is active."
@@ -1933,15 +1875,15 @@
msgid "If checked the user will logoff when answering a survey."
msgstr "If checked the user will logoff when answering a survey."
-#: classes/Gems/Default/StaffAction.php:155
+#: classes/Gems/Default/StaffAction.php:154
msgid "You are not allowed to edit this staff member."
msgstr "You are not allowed to edit this staff member."
-#: classes/Gems/Default/StaffAction.php:188
+#: classes/Gems/Default/StaffAction.php:189
msgid "Primary function"
msgstr "Primary function"
-#: classes/Gems/Default/StaffAction.php:240
+#: classes/Gems/Default/StaffAction.php:274
msgid "staff member"
msgid_plural "staff members"
msgstr[0] "staff member"
@@ -1991,95 +1933,95 @@
msgid "Assigned surveys"
msgstr "Assigned surveys"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:130
+#: classes/Gems/Default/SurveyMaintenanceAction.php:123
msgid "If empty, survey will never show up!"
msgstr "If empty, survey will never show up!"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:131
+#: classes/Gems/Default/SurveyMaintenanceAction.php:124
msgid "Result field"
msgstr "Result field"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:132
+#: classes/Gems/Default/SurveyMaintenanceAction.php:125
msgid "Before answering"
msgstr "Before answering"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:133
+#: classes/Gems/Default/SurveyMaintenanceAction.php:126
msgid "After completion"
msgstr "After completion"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:136
+#: classes/Gems/Default/SurveyMaintenanceAction.php:129
msgid "Upload new PDF"
msgstr "Upload new PDF"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:143
+#: classes/Gems/Default/SurveyMaintenanceAction.php:136
msgid "Usage"
msgstr "Usage"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:158
+#: classes/Gems/Default/SurveyMaintenanceAction.php:151
msgid "Single Survey Assignment"
msgstr "Single Survey Assignment"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:203
+#: classes/Gems/Default/SurveyMaintenanceAction.php:196
msgid "Assignable since"
msgstr "Assignable since"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:204
+#: classes/Gems/Default/SurveyMaintenanceAction.php:197
msgid "Assignable until"
msgstr "Assignable until"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:210
+#: classes/Gems/Default/SurveyMaintenanceAction.php:203
msgid "Create Single Survey"
msgstr "Create Single Survey"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:214
+#: classes/Gems/Default/SurveyMaintenanceAction.php:207
msgid "At the moment this survey can only be assigned to respondents as part of an existing track."
msgstr "At the moment this survey can only be assigned to paitents as part of an existing track."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:267
+#: classes/Gems/Default/SurveyMaintenanceAction.php:260
msgid "Survey should be assigned to a group before making it active."
msgstr "Survey should be assigned to a group before making it active."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:280
+#: classes/Gems/Default/SurveyMaintenanceAction.php:273
#, php-format
msgid "Checking survey results for the %s survey."
msgstr "Checking survey results for the %s survey."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:355
+#: classes/Gems/Default/SurveyMaintenanceAction.php:348
msgid "Source"
msgstr "Source"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:356
+#: classes/Gems/Default/SurveyMaintenanceAction.php:349
msgid "Status in source"
msgstr "Status in source"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:360
+#: classes/Gems/Default/SurveyMaintenanceAction.php:353
msgid "Active in source"
msgstr "Active in source"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:361
+#: classes/Gems/Default/SurveyMaintenanceAction.php:354
#, php-format
msgid "Active in %s"
msgstr "Active in %s"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:368
+#: classes/Gems/Default/SurveyMaintenanceAction.php:361
msgid "Single"
msgstr "Single"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:410
+#: classes/Gems/Default/SurveyMaintenanceAction.php:394
#, php-format
msgid "%d times in track."
msgstr "%d times in track."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:412
+#: classes/Gems/Default/SurveyMaintenanceAction.php:396
#, php-format
msgid "%d times in %d track(s)."
msgstr "%d times in %d track(s)."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:416
+#: classes/Gems/Default/SurveyMaintenanceAction.php:400
msgid "Not used in track."
msgstr "Not used in track."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:418
+#: classes/Gems/Default/SurveyMaintenanceAction.php:402
msgid "Not used in tracks."
msgstr "Not used in tracks."
@@ -2179,6 +2121,7 @@
msgstr "+"
#: classes/Gems/Default/TokenPlanAction.php:478
+#: classes/Gems/Default/TrackAction.php:449
msgid "token"
msgid_plural "tokens"
msgstr[0] "token"
@@ -2334,6 +2277,10 @@
msgstr[0] "field"
msgstr[1] "fields"
+#: classes/Gems/Default/TrackFieldsAction.php:134
+msgid "Fields"
+msgstr "Fields"
+
#: classes/Gems/Default/TrackMaintenanceAction.php:149
msgid "This may take a while!"
msgstr "This may take a while!"
@@ -2377,6 +2324,10 @@
msgstr[0] "round"
msgstr[1] "rounds"
+#: classes/Gems/Default/TrackRoundsAction.php:162
+msgid "Rounds"
+msgstr "Rounds"
+
#: classes/Gems/Email/EmailFormAbstract.php:101
msgid "no email adress"
msgstr "no email adress"
@@ -2487,6 +2438,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"
@@ -2523,50 +2478,92 @@
msgid "Format answers"
msgstr "Format answers"
-#: classes/Gems/Export/Spss.php:60
+#: classes/Gems/Export/Spss.php:59
msgid "Which file"
msgstr "Which file"
-#: classes/Gems/Export/Spss.php:61
+#: classes/Gems/Export/Spss.php:60
msgid "syntax"
msgstr "syntax"
-#: classes/Gems/Export/Spss.php:62
+#: classes/Gems/Export/Spss.php:61
msgid "data"
msgstr "data"
-#: classes/Gems/Export/Spss.php:67
+#: classes/Gems/Export/Spss.php:66
msgid "Some help for this export"
msgstr "Some help for this export"
-#: classes/Gems/Menu/MenuAbstract.php:206
+#: classes/Gems/Menu/MenuAbstract.php:233
msgid "Activity"
msgstr "Activity"
-#: classes/Gems/Menu/MenuAbstract.php:209
+#: classes/Gems/Menu/MenuAbstract.php:239
msgid "Servers"
msgstr "Servers"
-#: classes/Gems/Menu/MenuAbstract.php:213
+#: classes/Gems/Menu/MenuAbstract.php:243
msgid "Templates"
msgstr "Templates"
-#: classes/Gems/Menu/MenuAbstract.php:246
+#: classes/Gems/Menu/MenuAbstract.php:275
msgid "By period"
msgstr "By period"
-#: classes/Gems/Menu/MenuAbstract.php:247
+#: classes/Gems/Menu/MenuAbstract.php:276
msgid "By token"
msgstr "By token"
-#: classes/Gems/Menu/MenuAbstract.php:248
+#: classes/Gems/Menu/MenuAbstract.php:277
msgid "By respondent"
msgstr "By respondent"
-#: classes/Gems/Menu/MenuAbstract.php:252
+#: classes/Gems/Menu/MenuAbstract.php:281
msgid "Bulk mail"
msgstr "Bulk mail"
+#: classes/Gems/Menu/MenuAbstract.php:299
+msgid "Errors"
+msgstr "Errors"
+
+#: classes/Gems/Menu/MenuAbstract.php:300
+msgid "PHP"
+msgstr "PHP"
+
+#: classes/Gems/Menu/MenuAbstract.php:394
+msgid "Check status"
+msgstr "Check status"
+
+#: classes/Gems/Menu/MenuAbstract.php:395
+msgid "Synchronize surveys"
+msgstr "Synchronize surveys"
+
+#: classes/Gems/Menu/MenuAbstract.php:396
+#: classes/Gems/Menu/MenuAbstract.php:407
+msgid "Check answers"
+msgstr "Check answers"
+
+#: classes/Gems/Menu/MenuAbstract.php:397
+msgid "Synchronize all surveys"
+msgstr "Synchronize all surveys"
+
+#: classes/Gems/Menu/MenuAbstract.php:398
+#: classes/Gems/Menu/MenuAbstract.php:408
+msgid "Check all answers"
+msgstr "Check all answers"
+
+#: classes/Gems/Menu/MenuAbstract.php:404
+msgid "PDF"
+msgstr "PDF"
+
+#: classes/Gems/Menu/MenuAbstract.php:438
+msgid "Check assignments"
+msgstr "Check assignments"
+
+#: classes/Gems/Menu/MenuAbstract.php:441
+msgid "Check all assignments"
+msgstr "Check all assignments"
+
#: classes/Gems/Menu/SubMenuItem.php:386
msgid "New"
msgstr "New"
@@ -2707,47 +2704,47 @@
msgid "Answered surveys"
msgstr "Answered surveys"
-#: classes/Gems/Tracker/ChangeTracker.php:64
+#: classes/Gems/Tracker/ChangeTracker.php:63
#, php-format
msgid "Checked %d tracks."
msgstr "Checked %d tracks."
-#: classes/Gems/Tracker/ChangeTracker.php:67
+#: classes/Gems/Tracker/ChangeTracker.php:66
#, php-format
msgid "Checked %d tokens."
msgstr "Checked %d tokens."
-#: classes/Gems/Tracker/ChangeTracker.php:72
+#: classes/Gems/Tracker/ChangeTracker.php:71
#, php-format
msgid "Answers changed by survey completion event for %d tokens."
msgstr "Answers changed by survey completion event for %d tokens."
-#: classes/Gems/Tracker/ChangeTracker.php:75
+#: classes/Gems/Tracker/ChangeTracker.php:74
#, php-format
msgid "Results and timing changed for %d tokens."
msgstr "Results and timing changed for %d tokens."
-#: classes/Gems/Tracker/ChangeTracker.php:78
+#: classes/Gems/Tracker/ChangeTracker.php:77
#, php-format
msgid "%d token round completion events caused changed to %d tokens."
msgstr "%d token round completion events caused changed to %d tokens."
-#: classes/Gems/Tracker/ChangeTracker.php:81
+#: classes/Gems/Tracker/ChangeTracker.php:80
#, php-format
msgid "%2$d token date changes in %1$d tracks."
msgstr "%2$d token date changes in %1$d tracks."
-#: classes/Gems/Tracker/ChangeTracker.php:84
+#: classes/Gems/Tracker/ChangeTracker.php:83
#, php-format
msgid "Round changes propagated to %d tokens."
msgstr "Round changes propagated to %d tokens."
-#: classes/Gems/Tracker/ChangeTracker.php:87
+#: classes/Gems/Tracker/ChangeTracker.php:86
#, php-format
msgid "%d tokens created to by round changes."
msgstr "%d tokens created to by round changes."
-#: classes/Gems/Tracker/ChangeTracker.php:90
+#: classes/Gems/Tracker/ChangeTracker.php:89
msgid "No tokens were changed."
msgstr "No tokens were changed."
@@ -2962,53 +2959,53 @@
msgid "Next >"
msgstr "Next >"
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:473
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:485
msgid "Submitdate"
msgstr "Submitdate"
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:848
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:860
#, php-format
msgid "Updated %d Gems tokens to new token definition."
msgstr "Updated %d Gems tokens to new token definition."
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:868
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:880
#, php-format
msgid "The '%s' survey is no longer active. The survey was removed from LimeSurvey!"
msgstr "The '%s' survey is no longer active. The survey was removed from LimeSurvey!"
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:985
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:997
#, php-format
msgid "Updated %d token to new token definition in survey '%s'."
msgid_plural "Updated %d tokens to new token definition in survey '%s'."
msgstr[0] "Updated %d token to new token definition in survey '%s'."
msgstr[1] "Updated %d tokens to new token definition in survey '%s'."
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1003
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1015
#, php-format
msgid "The status of the '%s' survey has changed."
msgstr "The status of the '%s' survey has changed."
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1009
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1021
#, php-format
msgid "Survey '%s' IS NO LONGER ACTIVE!!!"
msgstr "Survey '%s' IS NO LONGER ACTIVE!!!"
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1015
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1027
#, php-format
msgid "The status of the '%s' survey has changed to '%s'."
msgstr "The status of the '%s' survey has changed to '%s'."
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1018
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1030
#, php-format
msgid "The status warning for the '%s' survey was removed."
msgstr "The status warning for the '%s' survey was removed."
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1024
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1036
#, php-format
msgid "The name of the '%s' survey has changed to '%s'."
msgstr "The name of the '%s' survey has changed to '%s'."
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1034
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1046
#, php-format
msgid "Imported the '%s' survey."
msgstr "Imported the '%s' survey."
@@ -3338,19 +3335,19 @@
msgid "Invalid type given. String, integer or float expected"
msgstr "Invalid type given. String, integer or float expected"
-#: snippets/AddTracksSnippet.php:92
+#: snippets/AddTracksSnippet.php:95
msgid "by Respondents"
msgstr "by Patients"
-#: snippets/AddTracksSnippet.php:96
+#: snippets/AddTracksSnippet.php:99
msgid "by Staff"
msgstr "by Staff"
-#: snippets/AddTracksSnippet.php:169
+#: snippets/AddTracksSnippet.php:172
msgid "info"
msgstr "info"
-#: snippets/AddTracksSnippet.php:174
+#: snippets/AddTracksSnippet.php:177
msgid "None available"
msgstr "None available"
@@ -3442,10 +3439,12 @@
msgstr "Recalculate track"
#: snippets/RespondentDetailsSnippet.php:59
+#: snippets/RespondentDetailsWithAssignmentsSnippet.php:74
msgid "Respondent information"
msgstr "Patient information"
#: snippets/RespondentDetailsSnippet.php:71
+#: snippets/RespondentDetailsWithAssignmentsSnippet.php:97
msgid "Respondent nr: "
msgstr "Patient nr:"
@@ -3533,6 +3532,27 @@
msgid "This track can be assigned since %s."
msgstr "This track can be assigned since %s."
+#~ msgid "In EU"
+#~ msgstr "In EU"
+
+#~ msgid "Notes"
+#~ msgstr "Notes"
+
+#~ msgid "country"
+
+#~ msgid_plural "countries"
+#~ msgstr[0] "country"
+#~ msgstr[1] "countries"
+
+#~ msgid "Countries"
+#~ msgstr "Countries"
+
+#~ msgid "No changelog found. Place one in %s."
+#~ msgstr "No changelog found. Place one in %s."
+
+#~ msgid "No logged errors found."
+#~ msgstr "No logged errors found."
+
#~ msgid "The Pulse software was made possible thanks to support from "
#~ msgstr "The Pulse software was made possible thanks to support from "
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2011-10-11 16:00:46 UTC (rev 90)
+++ trunk/library/languages/default-nl.po 2011-10-11 16:24:36 UTC (rev 91)
@@ -2,9 +2,9 @@
msgstr ""
"Project-Id-Version: Pulse NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-20 17:37+0100\n"
+"POT-Creation-Date: 2011-10-11 18:17+0100\n"
"PO-Revision-Date: \n"
-"Last-Translator: Menno Dekker <men...@er...>\n"
+"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,48 +18,48 @@
"X-Poedit-KeywordsList: plural:1,2\n"
"X-Poedit-SearchPath-0: .\n"
-#: classes/GemsEscort.php:160
+#: classes/GemsEscort.php:155
#, php-format
msgid "Path %s not writable"
msgstr "Path %s niet schrijfbaar"
-#: classes/GemsEscort.php:841
+#: classes/GemsEscort.php:840
#, php-format
msgid "User: %s"
msgstr "Login: %s"
-#: classes/GemsEscort.php:865
+#: classes/GemsEscort.php:864
msgid "version"
msgstr "versie"
-#: classes/GemsEscort.php:1422
+#: classes/GemsEscort.php:1421
msgid "Take note: your session has expired, your inputs where not saved. Please check the input data and try again"
msgstr "Let op: uw sessie is verlopen, uw invoer is niet opgeslagen. Controleer de gegevens en probeer a.u.b. opnieuw."
-#: classes/GemsEscort.php:1544
+#: classes/GemsEscort.php:1543
msgid "No access to site."
msgstr "Geen toegang tot website."
-#: classes/GemsEscort.php:1546
-#: classes/GemsEscort.php:1582
+#: classes/GemsEscort.php:1545
+#: classes/GemsEscort.php:1581
msgid "You have no access to this site."
msgstr "U heeft geen toegang tot deze website."
-#: classes/GemsEscort.php:1562
+#: classes/GemsEscort.php:1561
msgid "No access to page"
msgstr "Geen toegang tot pagina"
-#: classes/GemsEscort.php:1564
+#: classes/GemsEscort.php:1563
#, 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:1569
-#: classes/GemsEscort.php:1580
+#: classes/GemsEscort.php:1568
+#: classes/GemsEscort.php:1579
msgid "You are no longer logged in."
msgstr "U bent niet meer ingelogd."
-#: classes/GemsEscort.php:1570
+#: classes/GemsEscort.php:1569
msgid "You must login to access this page."
msgstr "U moet ingelogd zijn voor toegang tot deze pagina."
@@ -120,263 +120,203 @@
msgid "Support"
msgstr "Ondersteuning"
-#: classes/Gems/Menu.php:167
+#: classes/Gems/Menu.php:166
+msgid "Project setup"
+msgstr "Projectinfo"
+
+#: classes/Gems/Menu.php:169
msgid "Database"
msgstr "Database"
-#: classes/Gems/Menu.php:171
+#: classes/Gems/Menu.php:173
msgid "Content"
msgstr "Inhoud"
-#: classes/Gems/Menu.php:174
+#: classes/Gems/Menu.php:176
msgid "Execute"
msgstr "Uitvoeren"
-#: classes/Gems/Menu.php:179
+#: classes/Gems/Menu.php:181
msgid "Patches"
msgstr "Patches"
-#: classes/Gems/Menu.php:180
+#: classes/Gems/Menu.php:182
msgid "Execute new"
msgstr "Nieuwe aanmaken"
-#: classes/Gems/Menu.php:182
+#: classes/Gems/Menu.php:184
msgid "Refresh translateables"
msgstr "Ververs vertaalbaren"
-#: classes/Gems/Menu.php:184
+#: classes/Gems/Menu.php:186
msgid "Run SQL"
msgstr "SQL uitvoeren"
-#: classes/Gems/Menu.php:187
-msgid "Project setup"
-msgstr "Projectinfo"
-
-#: classes/Gems/Menu.php:188
-msgid "Errors"
-msgstr "Foutmeldingen"
-
#: classes/Gems/Menu.php:189
-msgid "PHP"
-msgstr "PHP"
+msgid "Reception codes"
+msgstr "Ontvangst codes"
-#: classes/Gems/Menu.php:190
-#: classes/Gems/Menu.php:581
-msgid "Project"
-msgstr "Project"
-
-#: classes/Gems/Menu.php:191
-msgid "Session"
-msgstr "Sessie"
-
-#: classes/Gems/Menu.php:200
+#: classes/Gems/Menu.php:192
msgid "Consents"
msgstr "Toestemmingen"
-#: classes/Gems/Menu.php:203
-msgid "Organizations"
-msgstr "Organisaties"
-
-#: classes/Gems/Menu.php:206
-msgid "Groups"
-msgstr "Groepen"
-
-#: classes/Gems/Menu.php:209
+#: classes/Gems/Menu.php:195
msgid "Roles"
msgstr "Rollen"
-#: classes/Gems/Menu.php:210
+#: classes/Gems/Menu.php:196
msgid "ACL"
msgstr "ACL"
-#: classes/Gems/Menu.php:211
-#: classes/Gems/Menu.php:398
+#: classes/Gems/Menu.php:197
+#: classes/Gems/Menu.php:338
msgid "Assigned"
msgstr "Toegewezen"
-#: classes/Gems/Menu.php:212
+#: classes/Gems/Menu.php:198
msgid "Privileges"
msgstr "Priviléges"
-#: classes/Gems/Menu.php:215
-msgid "Reception codes"
-msgstr "Ontvangst codes"
+#: classes/Gems/Menu.php:201
+msgid "Groups"
+msgstr "Groepen"
-#: classes/Gems/Menu.php:218
-msgid "Survey Sources"
-msgstr "Bronnen"
+#: classes/Gems/Menu.php:204
+msgid "Organizations"
+msgstr "Organisaties"
-#: classes/Gems/Menu.php:220
-msgid "Check status"
-msgstr "Status controle"
+#: classes/Gems/Menu.php:207
+#: classes/Gems/Menu.php:524
+msgid "Staff"
+msgstr "Medewerkers"
-#: classes/Gems/Menu.php:221
-msgid "Synchronize surveys"
-msgstr "Synchroniseer vragenlijsten"
-
-#: classes/Gems/Menu.php:222
-#: classes/Gems/Menu.php:233
-msgid "Check answers"
-msgstr "Antwoord controle"
-
-#: classes/Gems/Menu.php:223
-msgid "Synchronize all surveys"
-msgstr "Synchroniseer alle vragenlijsten"
-
-#: classes/Gems/Menu.php:224
-#: classes/Gems/Menu.php:234
-msgid "Check all answers"
-msgstr "Controleer alle antwoorden"
-
-#: classes/Gems/Menu.php:227
-#: classes/Gems/Menu.php:388
-msgid "Surveys"
-msgstr "Vragenlijsten"
-
-#: classes/Gems/Menu.php:230
-msgid "PDF"
-msgstr "PDF"
-
-#: classes/Gems/Menu.php:239
-#: classes/Gems/Menu.php:354
-msgid "Tracks"
-msgstr "Trajecten"
-
-#: classes/Gems/Menu.php:242
-msgid "Fields"
-msgstr "Velden"
-
-#: classes/Gems/Menu.php:249
-msgid "Rounds"
-msgstr "Rondes"
-
-#: classes/Gems/Menu.php:258
-msgid "Round"
-msgstr "Ronde"
-
-#: classes/Gems/Menu.php:264
-msgid "Check assignments"
-msgstr "Controleer toewijzingen"
-
-#: classes/Gems/Menu.php:267
-msgid "Check all assignments"
-msgstr "Controleer alle toewijzingen"
-
-#: classes/Gems/Menu.php:270
+#: classes/Gems/Menu.php:210
msgid "Logging"
msgstr "Logboek"
-#: classes/Gems/Menu.php:274
+#: classes/Gems/Menu.php:214
msgid "Maintenance"
msgstr "Onderhoud"
-#: classes/Gems/Menu.php:288
+#: classes/Gems/Menu.php:228
#, php-format
msgid "Stand-alone privilige: %s"
msgstr "Zelfstandig privilege: %s"
-#: classes/Gems/Menu.php:295
+#: classes/Gems/Menu.php:235
msgid "Logon"
msgstr "Login"
-#: classes/Gems/Menu.php:296
+#: classes/Gems/Menu.php:236
msgid "Lost password"
msgstr "Wachtwoord zoek"
-#: classes/Gems/Menu.php:297
+#: classes/Gems/Menu.php:237
msgid "Your account"
msgstr "Uw account"
-#: classes/Gems/Menu.php:298
+#: classes/Gems/Menu.php:238
msgid "Activity overview"
msgstr "Activiteiten overzicht"
-#: classes/Gems/Menu.php:299
+#: classes/Gems/Menu.php:239
msgid "Change password"
msgstr "Uw wachtwoord"
-#: classes/Gems/Menu.php:300
-#: classes/Gems/Menu.php:340
-#: classes/Gems/Menu.php:375
+#: classes/Gems/Menu.php:240
+#: classes/Gems/Menu.php:280
+#: classes/Gems/Menu.php:315
msgid "Token"
msgstr "Kenmerk"
-#: classes/Gems/Menu.php:301
+#: classes/Gems/Menu.php:241
msgid "Logoff"
msgstr "Uitloggen"
-#: classes/Gems/Menu.php:336
+#: classes/Gems/Menu.php:276
msgid "Track"
msgstr "Traject"
-#: classes/Gems/Menu.php:343
-#: classes/Gems/Menu.php:363
-#: classes/Gems/Menu.php:394
+#: classes/Gems/Menu.php:283
+#: classes/Gems/Menu.php:303
+#: classes/Gems/Menu.php:334
msgid "Add"
msgstr "Voeg toe"
-#: classes/Gems/Menu.php:347
-#: classes/Gems/Menu.php:430
+#: classes/Gems/Menu.php:287
+#: classes/Gems/Menu.php:370
msgid "Preview"
msgstr "Preview"
-#: classes/Gems/Menu.php:367
+#: classes/Gems/Menu.php:294
+msgid "Tracks"
+msgstr "Trajecten"
+
+#: classes/Gems/Menu.php:307
msgid "Assignments"
msgstr "Toewijzingen"
-#: classes/Gems/Menu.php:371
+#: classes/Gems/Menu.php:311
msgid "Show"
msgstr "Toon"
-#: classes/Gems/Menu.php:379
+#: classes/Gems/Menu.php:319
msgid "Edit"
msgstr "Wijzig"
-#: classes/Gems/Menu.php:383
+#: classes/Gems/Menu.php:323
msgid "Delete"
msgstr "Verwijder"
-#: classes/Gems/Menu.php:420
+#: classes/Gems/Menu.php:328
+msgid "Surveys"
+msgstr "Vragenlijsten"
+
+#: classes/Gems/Menu.php:360
msgid "Fill in"
msgstr "Vul in"
-#: classes/Gems/Menu.php:424
+#: classes/Gems/Menu.php:364
msgid "Print PDF"
msgstr "Print PDF"
-#: classes/Gems/Menu.php:427
+#: classes/Gems/Menu.php:367
msgid "E-Mail now!"
msgstr "Email nu!"
-#: classes/Gems/Menu.php:433
+#: classes/Gems/Menu.php:373
msgid "Answers"
msgstr "Antwoorden"
-#: classes/Gems/Menu.php:571
+#: classes/Gems/Menu.php:511
msgid "Respondents"
msgstr "Patiënten"
-#: classes/Gems/Menu.php:574
+#: classes/Gems/Menu.php:514
msgid "Overview"
msgstr "Overzicht"
-#: classes/Gems/Menu.php:584
-msgid "Staff"
-msgstr "Medewerkers"
+#: classes/Gems/Menu.php:521
+msgid "Project"
+msgstr "Project"
-#: classes/Gems/Menu.php:587
+#: classes/Gems/Menu.php:527
msgid "Setup"
msgstr "Beheer"
-#: classes/Gems/Menu.php:590
+#: classes/Gems/Menu.php:530
msgid "Mail"
msgstr "Email"
-#: classes/Gems/Menu.php:599
+#: classes/Gems/Menu.php:533
+msgid "Track Builder"
+msgstr "Traject bouwer"
+
+#: classes/Gems/Menu.php:542
msgid "Contact"
msgstr "Contact"
-#: classes/Gems/Menu.php:612
+#: classes/Gems/Menu.php:555
msgid "Changelog"
msgstr "Changelog"
@@ -473,56 +413,56 @@
msgid "No %s found"
msgstr "Geen %s gevonden"
-#: classes/Gems/Controller/BrowseEditAction.php:635
+#: classes/Gems/Controller/BrowseEditAction.php:649
#, php-format
msgid "No %s found."
msgstr "Geen %s gevonden."
-#: classes/Gems/Controller/BrowseEditAction.php:750
+#: classes/Gems/Controller/BrowseEditAction.php:764
msgid "Are you sure?"
msgstr "Weet u het zeker?"
-#: classes/Gems/Controller/BrowseEditAction.php:766
+#: classes/Gems/Controller/BrowseEditAction.php:780
msgid "Yes"
msgstr "Ja"
-#: classes/Gems/Controller/BrowseEditAction.php:767
+#: classes/Gems/Controller/BrowseEditAction.php:781
msgid "No"
msgstr "Nee"
-#: classes/Gems/Controller/BrowseEditAction.php:820
+#: classes/Gems/Controller/BrowseEditAction.php:834
#, php-format
msgid "Unknown %s requested"
msgstr "Onjuist %s verzoek"
-#: classes/Gems/Controller/BrowseEditAction.php:843
+#: classes/Gems/Controller/BrowseEditAction.php:857
#, php-format
msgid "New %1$s..."
msgstr "Nieuwe %1$s..."
-#: classes/Gems/Controller/BrowseEditAction.php:851
+#: classes/Gems/Controller/BrowseEditAction.php:865
msgid "Save"
msgstr "Opslaan"
-#: classes/Gems/Controller/BrowseEditAction.php:887
+#: classes/Gems/Controller/BrowseEditAction.php:901
#, php-format
msgid "%2$u %1$s saved"
msgstr "%2$u %1$s opgeslagen"
-#: classes/Gems/Controller/BrowseEditAction.php:890
+#: classes/Gems/Controller/BrowseEditAction.php:904
msgid "No changes to save."
msgstr "Geen verandering om op te slaan."
-#: classes/Gems/Controller/BrowseEditAction.php:899
+#: classes/Gems/Controller/BrowseEditAction.php:913
msgid "Input error! No changes saved!"
msgstr "Invoer fout! Veranderingen niet opgeslagen!"
-#: classes/Gems/Controller/BrowseEditAction.php:927
+#: classes/Gems/Controller/BrowseEditAction.php:941
#, php-format
msgid "Show %s"
msgstr "Toon %s"
-#: classes/Gems/Controller/BrowseEditAction.php:934
+#: classes/Gems/Controller/BrowseEditAction.php:948
#, php-format
msgid "Unknown %s."
msgstr "%s is onbekend."
@@ -532,6 +472,10 @@
msgid "Cancel"
msgstr "Annuleren"
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:164
+msgid "No data found."
+msgstr "Geen gegevens gevonden."
+
#: classes/Gems/Default/AskAction.php:127
#, php-format
msgid "Welcome %s,"
@@ -629,7 +573,6 @@
msgstr "Er wordt geen verschil gemaakt tussen het getal nul en de letter O en ook niet tussen het getal één en de letter L."
#: classes/Gems/Default/ConsentAction.php:66
-#: classes/Gems/Default/CountryAction.php:67
#: classes/Gems/Default/GroupAction.php:87
msgid "Description"
msgstr "Omschrijving"
@@ -689,28 +632,6 @@
msgid "Links concerning this web application:"
msgstr "Links met informatie over deze website:"
-#: classes/Gems/Default/CountryAction.php:66
-msgid "Code"
-msgstr "Code"
-
-#: classes/Gems/Default/CountryAction.php:68
-msgid "In EU"
-msgstr "In EU"
-
-#: classes/Gems/Default/CountryAction.php:72
-msgid "Notes"
-msgstr "Notities"
-
-#: classes/Gems/Default/CountryAction.php:86
-msgid "country"
-msgid_plural "countries"
-msgstr[0] "land"
-msgstr[1] "landen"
-
-#: classes/Gems/Default/CountryAction.php:91
-msgid "Countries"
-msgstr "Landen"
-
#: classes/Gems/Default/DatabaseAction.php:64
#, php-format
msgid "Executed %2$s creation script %1$s:"
@@ -1069,6 +990,7 @@
msgstr "Gebruikersnaam"
#: classes/Gems/Default/IndexAction.php:105
+#: classes/Gems/Default/MailServerAction.php:88
msgid "Password"
msgstr "Wachtwoord"
@@ -1136,95 +1058,95 @@
msgid "Invalid language setting."
msgstr "Ongeldige taal instelling."
-#: classes/Gems/Default/LogAction.php:54
+#: classes/Gems/Default/LogAction.php:61
msgid "from"
msgstr "vanaf"
-#: classes/Gems/Default/LogAction.php:59
+#: classes/Gems/Default/LogAction.php:66
msgid "until"
msgstr "tot"
-#: classes/Gems/Default/LogAction.php:65
+#: classes/Gems/Default/LogAction.php:72
msgid "days"
msgstr "dagen"
-#: classes/Gems/Default/LogAction.php:66
+#: classes/Gems/Default/LogAction.php:73
msgid "weeks"
msgstr "weken"
-#: classes/Gems/Default/LogAction.php:67
+#: classes/Gems/Default/LogAction.php:74
msgid "months"
msgstr "maanden"
-#: classes/Gems/Default/LogAction.php:68
+#: classes/Gems/Default/LogAction.php:75
msgid "years"
msgstr "jaren"
-#: classes/Gems/Default/LogAction.php:89
+#: classes/Gems/Default/LogAction.php:96
msgid "Staff:"
msgstr "Medewerkers:"
-#: classes/Gems/Default/LogAction.php:93
+#: classes/Gems/Default/LogAction.php:100
msgid "All staff"
msgstr "Alle medewerkers"
-#: classes/Gems/Default/LogAction.php:95
+#: classes/Gems/Default/LogAction.php:102
msgid "Patient:"
msgstr "Patiënt:"
-#: classes/Gems/Default/LogAction.php:99
+#: classes/Gems/Default/LogAction.php:106
msgid "All patients"
msgstr "Alle patiënten"
-#: classes/Gems/Default/LogAction.php:102
+#: classes/Gems/Default/LogAction.php:109
msgid "Action:"
msgstr "Actie:"
-#: classes/Gems/Default/LogAction.php:105
+#: classes/Gems/Default/LogAction.php:112
msgid "All actions"
msgstr "Alle acties"
-#: classes/Gems/Default/LogAction.php:156
+#: classes/Gems/Default/LogAction.php:163
msgid "Date"
msgstr "Datum"
-#: classes/Gems/Default/LogAction.php:157
-#: classes/Gems/Default/LogMaintenanceAction.php:44
+#: classes/Gems/Default/LogAction.php:164
+#: classes/Gems/Default/LogMaintenanceAction.php:52
msgid "Action"
msgstr "Actie"
-#: classes/Gems/Default/LogAction.php:158
+#: classes/Gems/Default/LogAction.php:165
#: classes/Gems/Default/MailAction.php:65
msgid "Message"
msgstr "Bericht"
-#: classes/Gems/Default/LogAction.php:160
+#: classes/Gems/Default/LogAction.php:167
msgid "Respondent"
msgstr "Patiënt"
-#: classes/Gems/Default/LogAction.php:166
-#: classes/Gems/Default/LogMaintenanceAction.php:45
+#: classes/Gems/Default/LogAction.php:173
+#: classes/Gems/Default/LogMaintenanceAction.php:53
msgid "Log"
msgstr "Logboek"
-#: classes/Gems/Default/LogMaintenanceAction.php:62
+#: classes/Gems/Default/LogMaintenanceAction.php:70
msgid "Log:"
msgstr "Logboek:"
-#: classes/Gems/Default/LogMaintenanceAction.php:63
+#: classes/Gems/Default/LogMaintenanceAction.php:71
msgid "All"
msgstr "Alles"
-#: classes/Gems/Default/LogMaintenanceAction.php:69
+#: classes/Gems/Default/LogMaintenanceAction.php:77
msgid "Log action"
msgstr "Logboek actie"
-#: classes/Gems/Default/LogMaintenanceAction.php:73
+#: classes/Gems/Default/LogMaintenanceAction.php:81
msgid "Log maintenance"
msgstr "Logboek onderhoud"
#: classes/Gems/Default/MailAction.php:61
-#: classes/Gems/Default/MailLogAction.php:95
+#: classes/Gems/Default/MailLogAction.php:132
#: classes/Gems/Default/MailLogActionOldStyle.php:118
msgid "Subject"
msgstr "Onderwerp"
@@ -1243,41 +1165,45 @@
msgid "Email templates"
msgstr "Email sjabloon"
-#: classes/Gems/Default/MailLogAction.php:89
+#: classes/Gems/Default/MailLogAction.php:126
#: classes/Gems/Default/MailLogActionOldStyle.php:112
msgid "Date sent"
msgstr "Verzend datum"
-#: classes/Gems/Default/MailLogAction.php:90
+#: classes/Gems/Default/MailLogAction.php:127
#: classes/Gems/Default/MailLogActionOldStyle.php:113
msgid "Receiver"
msgstr "Ontvanger"
-#: classes/Gems/Default/MailLogAction.php:91
+#: classes/Gems/Default/MailLogAction.php:128
#: classes/Gems/Default/MailLogActionOldStyle.php:114
msgid "To address"
msgstr "Adres aan"
-#: classes/Gems/Default/MailLogAction.php:92
+#: classes/Gems/Default/MailLogAction.php:129
#: classes/Gems/Default/MailLogActionOldStyle.php:115
msgid "Sender"
msgstr "Verzender"
-#: classes/Gems/Default/MailLogAction.php:93
+#: classes/Gems/Default/MailLogAction.php:130
#: classes/Gems/Default/MailLogActionOldStyle.php:116
msgid "From address"
msgstr "Adres van"
-#: classes/Gems/Default/MailLogAction.php:98
+#: classes/Gems/Default/MailLogAction.php:135
#: classes/Gems/Default/MailLogActionOldStyle.php:121
msgid "Template"
msgstr "Sjabloon"
-#: classes/Gems/Default/MailLogAction.php:108
+#: classes/Gems/Default/MailLogAction.php:148
#: classes/Gems/Default/MailLogActionOldStyle.php:148
msgid "Ma...
[truncated message content] |
|
From: <gem...@li...> - 2011-10-11 16:00:57
|
Revision: 90
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=90&view=rev
Author: matijsdejong
Date: 2011-10-11 16:00:46 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
Added display setting for readonly inputs.
Modified Paths:
--------------
trunk/new_project/htdocs/gems/css/gems-new.css
trunk/new_project/htdocs/gems/css/gems.css
Modified: trunk/new_project/htdocs/gems/css/gems-new.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems-new.css 2011-10-11 15:59:49 UTC (rev 89)
+++ trunk/new_project/htdocs/gems/css/gems-new.css 2011-10-11 16:00:46 UTC (rev 90)
@@ -131,6 +131,10 @@
background: #EBEBE4;
}
+input[readonly] {
+ background: #EBEBE4;
+}
+
div, img, li, p, ul {
margin: 0;
padding: 0;
Modified: trunk/new_project/htdocs/gems/css/gems.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems.css 2011-10-11 15:59:49 UTC (rev 89)
+++ trunk/new_project/htdocs/gems/css/gems.css 2011-10-11 16:00:46 UTC (rev 90)
@@ -80,6 +80,10 @@
background: #EBEBE4;
}
+input[readonly] {
+ background: #EBEBE4;
+}
+
div, img, li, p, ul {
margin: 0;
padding: 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-10-11 15:59:56
|
Revision: 89
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=89&view=rev
Author: matijsdejong
Date: 2011-10-11 15:59:49 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
Extended autofocus to skip readonly inputs.
ModelTableSnippetAbstract now has sortableLinks as an option and a caption variable.
Removed gems__countries table.
Modified Paths:
--------------
trunk/library/changelog.txt
trunk/library/classes/MUtil/Form/Decorator/AutoFocus.php
trunk/library/classes/MUtil/Snippets/ModelTableSnippetAbstract.php
trunk/library/configs/db/tables/gems__respondents.30.sql
Removed Paths:
-------------
trunk/library/configs/db/tables/gems__countries.10.sql
Modified: trunk/library/changelog.txt
===================================================================
--- trunk/library/changelog.txt 2011-10-11 12:59:41 UTC (rev 88)
+++ trunk/library/changelog.txt 2011-10-11 15:59:49 UTC (rev 89)
@@ -1,6 +1,7 @@
Important changes from 1.4.2 => 1.4.3
============================================================
* gtr_organisations renamed to gtr_organizations
+ * table gems__countries is no longer in use
Important changes from 1.4.1 => 1.4.2
============================================================
Modified: trunk/library/classes/MUtil/Form/Decorator/AutoFocus.php
===================================================================
--- trunk/library/classes/MUtil/Form/Decorator/AutoFocus.php 2011-10-11 12:59:41 UTC (rev 88)
+++ trunk/library/classes/MUtil/Form/Decorator/AutoFocus.php 2011-10-11 15:59:49 UTC (rev 89)
@@ -58,6 +58,7 @@
} elseif ($element instanceof Zend_Form_Element) {
if (($element instanceof Zend_Form_Element_Hidden) ||
($element instanceof MUtil_Form_Element_NoFocusInterface) ||
+ ($element->getAttrib('readonly')) ||
($element->helper == 'Button') ||
($element->helper == 'formSubmit') ||
($element->helper == 'SubmitButton')) {
Modified: trunk/library/classes/MUtil/Snippets/ModelTableSnippetAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Snippets/ModelTableSnippetAbstract.php 2011-10-11 12:59:41 UTC (rev 88)
+++ trunk/library/classes/MUtil/Snippets/ModelTableSnippetAbstract.php 2011-10-11 15:59:49 UTC (rev 89)
@@ -59,7 +59,7 @@
/**
* Functional extension: optionally use this function to add the browse columns
*
- * @var callable With signature: function(MUtil_Model_TableBridge $bridge, MUtil_Model_ModelAbstract $model)
+ * @var callable With signature: function(MUtil_Model_TableBridge $bridge, MUtil_Model_ModelAbstract $model, MUtil_Snippets_ModelTableSnippetAbstract $snippet)
*/
public $addTableColumns;
@@ -78,6 +78,13 @@
public $browse = false;
/**
+ * Optional table caption.
+ *
+ * @var string
+ */
+ public $caption;
+
+ /**
* Content to show when there are no rows.
*
* Null shows '…'
@@ -94,6 +101,13 @@
public $removePost = false;
/**
+ * When true (= default) the headers get sortable links.
+ *
+ * @var boolean
+ */
+ public $sortableLinks = true;
+
+ /**
* Adds columns from the model to the bridge that creates the browse table.
*
* Overrule this function to add different columns to the browse table, without
@@ -105,10 +119,18 @@
*/
protected function addBrowseTableColumns(MUtil_Model_TableBridge $bridge, MUtil_Model_ModelAbstract $model)
{
- foreach($model->getItemsOrdered() as $name) {
- if ($label = $model->get($name, 'label')) {
- $bridge->addSortable($name, $label);
+ if ($this->sortableLinks) {
+ foreach($model->getItemsOrdered() as $name) {
+ if ($label = $model->get($name, 'label')) {
+ $bridge->addSortable($name, $label);
+ }
}
+ } else {
+ foreach($model->getItemsOrdered() as $name) {
+ if ($label = $model->get($name, 'label')) {
+ $bridge->addColumn($bridge->$name, $label);
+ }
+ }
}
}
@@ -137,6 +159,9 @@
public function getBrowseTable(MUtil_Model_ModelAbstract $model)
{
$bridge = new MUtil_Model_TableBridge($model);
+ if ($this->caption) {
+ $bridge->caption($this->caption);
+ }
if ($this->onEmpty) {
$bridge->setOnEmpty($this->onEmpty);
} else {
@@ -147,7 +172,7 @@
}
if (is_callable($this->addTableColumns)) {
- call_user_func($this->addTableColumns, $bridge, $model);
+ call_user_func($this->addTableColumns, $bridge, $model, $this);
} else {
$this->addBrowseTableColumns($bridge, $model);
}
Deleted: trunk/library/configs/db/tables/gems__countries.10.sql
===================================================================
--- trunk/library/configs/db/tables/gems__countries.10.sql 2011-10-11 12:59:41 UTC (rev 88)
+++ trunk/library/configs/db/tables/gems__countries.10.sql 2011-10-11 15:59:49 UTC (rev 89)
@@ -1,266 +0,0 @@
-
-CREATE TABLE if not exists gems__countries (
- gct_code varchar(2) not null,
- gct_description varchar(50) not null,
- gct_in_eu boolean not null default 0,
-
- gct_extra varchar(255) null,
-
- gct_changed timestamp not null default current_timestamp on update current_timestamp,
- gct_changed_by bigint unsigned not null,
- gct_created timestamp not null,
- gct_created_by bigint unsigned not null,
-
- PRIMARY KEY (gct_code)
- )
- ENGINE=InnoDB
- CHARACTER SET 'utf8' COLLATE 'utf8_general_ci';
-
-
-INSERT INTO gems__countries
- (gct_code, gct_description, gct_in_eu, gct_extra, gct_changed, gct_changed_by, gct_created, gct_created_by)
- VALUES
- ('AD', 'Andorra', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('AE', 'United Arab Emirates', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('AF', 'Afghanistan', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('AG', 'Antigua and Barbuda', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('AI', 'Anguilla', 0, 'AI previously represented French Territory of the Afars and the Issas', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('AL', 'Albania', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('AM', 'Armenia', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('AN', 'Netherlands Antilles', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('AO', 'Angola', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('AQ', 'Antarctica', 0, 'Code taken from "Antarctique", its French name Consisting of all territory south of latitude 60\xB0S', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('AR', 'Argentina', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('AS', 'American Samoa', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('AT', 'Austria', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('AU', 'Australia', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('AW', 'Aruba', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('AX', '\xC5land Islands', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('AZ', 'Azerbaijan', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BA', 'Bosnia and Herzegovina', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BB', 'Barbados', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BD', 'Bangladesh', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BE', 'Belgium', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BF', 'Burkina Faso', 0, 'Previously named "Upper Volta" HV', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BG', 'Bulgaria', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BH', 'Bahrain', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BI', 'Burundi', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BJ', 'Benin', 0, 'Previously named "Dahomey" DY', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BM', 'Bermuda', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BN', 'Brunei Darussalam', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BO', 'Bolivia', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BR', 'Brazil', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BS', 'Bahamas', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BT', 'Bhutan', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BV', 'Bouvet Island', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BW', 'Botswana', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BY', 'Belarus', 0, 'Previously named "Byelorussian S.S.R." Code taken from "Byelorussia", its former name', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('BZ', 'Belize', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('CA', 'Canada', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('CC', 'Cocos (Keeling) Islands', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('CD', 'Congo, the Democratic Republic of the', 0, 'Previously named "Zaire" ZR', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('CF', 'Central African Republic', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('CG', 'Congo', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('CH', 'Switzerland', 0, 'Code taken from "Confoederatio Helvetica", its official Latin name', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('CI', 'C\xF4te d''Ivoire', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('CK', 'Cook Islands', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('CL', 'Chile', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('CM', 'Cameroon', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('CN', 'China', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('CO', 'Colombia', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('CR', 'Costa Rica', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('CU', 'Cuba', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('CV', 'Cape Verde', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('CX', 'Christmas Island', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('CY', 'Cyprus', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('CZ', 'Czech Republic', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('DE', 'Germany', 1, 'Code taken from "Deutschland", its German name', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('DJ', 'Djibouti', 0, 'Previously named "French Territory of the Afars and the Issas" AI', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('DK', 'Denmark', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('DM', 'Dominica', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('DO', 'Dominican Republic', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('DZ', 'Algeria', 0, 'Code taken from "Ledzayer", its Berber name', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('EC', 'Ecuador', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('EE', 'Estonia', 1, 'Code taken from "Eesti", its Estonian name', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('EG', 'Egypt', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('EH', 'Western Sahara', 0, 'Previously named "Spanish Sahara" Code taken from "S\xE1hara Espa\xF1ol", its former Spanish name', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('ER', 'Eritrea', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('ES', 'Spain', 1, 'Includes Canary Islands, Ceuta and Melilla, Code taken from "Espa\xF1a", its Spanish name', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('ET', 'Ethiopia', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('FI', 'Finland', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('FJ', 'Fiji', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('FK', 'Falkland Islands (Malvinas)', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('FM', 'Micronesia, Federated States of', 0, 'Previously named "Micronesia"', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('FO', 'Faroe Islands', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('FR', 'France', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GA', 'Gabon', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GB', 'United Kingdom', 1, 'Code taken from "Great Britain", part of the United Kingdom', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GD', 'Grenada', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GE', 'Georgia', 0, 'GE previously represented Gilbert and Ellice Islands', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GF', 'French Guiana', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GG', 'Guernsey', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GH', 'Ghana', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GI', 'Gibraltar', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GL', 'Greenland', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GM', 'Gambia', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GN', 'Guinea', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GP', 'Guadeloupe', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GQ', 'Equatorial Guinea', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GR', 'Greece', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GS', 'South Georgia and the South Sandwich Islands', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GT', 'Guatemala', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GU', 'Guam', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GW', 'Guinea-Bissau', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('GY', 'Guyana', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('HK', 'Hong Kong', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('HM', 'Heard Island and McDonald Islands', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('HN', 'Honduras', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('HR', 'Croatia', 0, 'Code taken from "Hrvatska", its Croatian name', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('HT', 'Haiti', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('HU', 'Hungary', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('ID', 'Indonesia', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('IE', 'Ireland', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('IL', 'Israel', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('IM', 'Isle of Man', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('IN', 'India', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('IO', 'British Indian Ocean Territory', 0, 'Includes Diego Garcia', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('IQ', 'Iraq', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('IR', 'Iran, Islamic Republic of', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('IS', 'Iceland', 0, 'Code taken from "\xCDsland", its Icelandic name', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('IT', 'Italy', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('JE', 'Jersey', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('JM', 'Jamaica', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('JO', 'Jordan', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('JP', 'Japan', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('KE', 'Kenya', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('KG', 'Kyrgyzstan', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('KH', 'Cambodia', 0, 'Previously named "Kampuchea", Code taken from "Kampuchea", its former name', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('KI', 'Kiribati', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('KM', 'Comoros', 0, 'Code taken from "Komori", its Comorian name', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('KN', 'Saint Kitts and Nevis', 0, 'Previously named "Saint Kitts-Nevis-Anguilla"', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('KP', 'Korea, Democratic People''s Republic of', 0, 'i.e., North Korea', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('KR', 'Korea, Republic of''', 0, 'i.e., South Korea', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('KW', 'Kuwait', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('KY', 'Cayman Islands', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('KZ', 'Kazakhstan', 0, 'Previously named "Kazakstan"', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('LA', 'Lao People''s Democratic Republic', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('LB', 'Lebanon', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('LC', 'Saint Lucia', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('LI', 'Liechtenstein', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('LK', 'Sri Lanka', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('LR', 'Liberia', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('LS', 'Lesotho', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('LT', 'Lithuania', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('LU', 'Luxembourg', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('LV', 'Latvia', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('LY', 'Libyan Arab Jamahiriya', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MA', 'Morocco', 0, 'Code taken from "Maroc", its French name', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MC', 'Monaco', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MD', 'Moldova, Republic of', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('ME', 'Montenegro', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MG', 'Madagascar', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MH', 'Marshall Islands', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MK', 'Macedonia, the former Yugoslav Republic of', 0, 'Designated as such due to naming dispute, Code taken from "Makedonija", its Macedonian name', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('ML', 'Mali', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MM', 'Myanmar', 0, 'Previously named "Burma" BU', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MN', 'Mongolia', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MO', 'Macao', 0, 'Previously named "Macau"', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MP', 'Northern Mariana Islands', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MQ', 'Martinique', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MR', 'Mauritania', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MS', 'Montserrat', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MT', 'Malta', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MU', 'Mauritius', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MV', 'Maldives', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MW', 'Malawi', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MX', 'Mexico', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MY', 'Malaysia', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('MZ', 'Mozambique', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('NA', 'Namibia', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('NC', 'New Caledonia', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('NE', 'Niger', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('NF', 'Norfolk Island', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('NG', 'Nigeria', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('NI', 'Nicaragua', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('NL', 'Netherlands', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('NO', 'Norway', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('NP', 'Nepal', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('NR', 'Nauru', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('NU', 'Niue', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('NZ', 'New Zealand', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('OM', 'Oman', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('PA', 'Panama', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('PE', 'Peru', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('PF', 'French Polynesia', 0, 'Includes Clipperton Island', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('PG', 'Papua New Guinea', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('PH', 'Philippines', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('PK', 'Pakistan', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('PL', 'Poland', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('PM', 'Saint Pierre and Miquelon', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('PN', 'Pitcairn', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('PR', 'Puerto Rico', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('PS', 'Palestinian Territory, Occupied', 0, 'Consisting of the West Bank and the Gaza Strip', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('PT', 'Portugal', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('PW', 'Palau', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('PY', 'Paraguay', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('QA', 'Qatar', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('RE', 'R\xE9union', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('RO', 'Romania', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('RS', 'Serbia', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('RU', 'Russian Federation', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('RW', 'Rwanda', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('SA', 'Saudi Arabia', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('SB', 'Solomon Islands', 0, 'Code taken from "British Solomon Islands", its former name', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('SC', 'Seychelles', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('SD', 'Sudan', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('SE', 'Sweden', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('SG', 'Singapore', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('SH', 'Saint Helena', 0, 'Includes Ascension Island and Tristan da Cunha', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('SI', 'Slovenia', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('SJ', 'Svalbard and Jan Mayen', 0, 'Consisting of Svalbard and Jan Mayen', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('SK', 'Slovakia', 1, 'SK previously represented Sikkim', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('SL', 'Sierra Leone', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('SM', 'San Marino', 1, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('SN', 'Senegal', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('SO', 'Somalia', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('SR', 'Suriname', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('ST', 'Sao Tome and Principe', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('SV', 'El Salvador', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('SY', 'Syrian Arab Republic', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('SZ', 'Swaziland', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('TC', 'Turks and Caicos Islands', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('TD', 'Chad', 0, 'Code taken from "Tchad", its French name', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('TF', 'French Southern Territories', 0, 'Covers the current jurisdiction of the French Southern and Antarctic Lands except Ad\xE9lie Land', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('TG', 'Togo', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('TH', 'Thailand', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('TJ', 'Tajikistan', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('TK', 'Tokelau', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('TL', 'Timor-Leste', 0, 'Previously used the code TP, Previously named "East Timor"', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('TM', 'Turkmenistan', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('TN', 'Tunisia', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('TO', 'Tonga', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('TR', 'Turkey', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('TT', 'Trinidad and Tobago', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('TV', 'Tuvalu', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('TW', 'Taiwan, Province of China', 0, 'Covers the current jurisdiction of the Republic of China except Kinmen and Lienchiang, Designated as such due to its political status within the UN', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('TZ', 'Tanzania, United Republic of', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('UA', 'Ukraine', 0, 'Previously named "Ukrainian S.S.R."', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('UG', 'Uganda', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('UM', 'United States Minor Outlying Islands', 0, 'Consisting of Baker Island, Howland Island, Jarvis Island, Johnston Atoll, Kingman Reef, Midway Atoll, Navassa Island, Palmyra Atoll, and Wake Island', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('US', 'United States', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('UY', 'Uruguay', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('UZ', 'Uzbekistan', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('VA', 'Holy See (Vatican City State)', 0, 'Administered by the Holy See, Previously named "Vatican City State (Holy See)"', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('VC', 'Saint Vincent and the Grenadines', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('VE', 'Venezuela', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('VG', 'Virgin Islands, British', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('VI', 'Virgin Islands, U.S.', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('VN', 'Viet Nam', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('VU', 'Vanuatu', 0, 'Previously named "New Hebrides" NH', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('WF', 'Wallis and Futuna', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('WS', 'Samoa', 0, 'Code taken from "Western Samoa", its former name', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('YE', 'Yemen', 0, 'Previously named "Yemen, Republic of"', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('YT', 'Mayotte', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('ZA', 'South Africa', 0, 'Code taken from "Zuid-Afrika", its Dutch name', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('ZM', 'Zambia', 0, NULL, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('ZW', 'Zimbabwe', 0, 'Previously named "Rhodesia" RH', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1);
Modified: trunk/library/configs/db/tables/gems__respondents.30.sql
===================================================================
--- trunk/library/configs/db/tables/gems__respondents.30.sql 2011-10-11 12:59:41 UTC (rev 88)
+++ trunk/library/configs/db/tables/gems__respondents.30.sql 2011-10-11 15:59:49 UTC (rev 89)
@@ -49,8 +49,7 @@
grs_zipcode varchar(10) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
grs_city varchar(40) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
-- grs_region varchar(40) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
- grs_iso_country char(2) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci'
- not null default 'NL' references gems__countries (gct_code),
+ grs_iso_country char(2) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null default 'NL',
grs_phone_1 varchar(25) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
-- grs_phone_2 varchar(25) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
-- grs_phone_3 varchar(25) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-10-11 12:59:48
|
Revision: 88
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=88&view=rev
Author: matijsdejong
Date: 2011-10-11 12:59:41 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
Whoops, forget the current use of the LanguageController
Added Paths:
-----------
trunk/library/classes/Gems/Default/LanguageAction.php
trunk/library/controllers/LanguageController.php
Copied: trunk/library/classes/Gems/Default/LanguageAction.php (from rev 85, trunk/library/classes/Gems/Default/LanguageAction.php)
===================================================================
--- trunk/library/classes/Gems/Default/LanguageAction.php (rev 0)
+++ trunk/library/classes/Gems/Default/LanguageAction.php 2011-10-11 12:59:41 UTC (rev 88)
@@ -0,0 +1,68 @@
+<?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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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 Default
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
+ */
+
+/**
+ * Allows the user to switch interface language.
+ *
+ * @package Gems
+ * @subpackage Default
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
+ */
+class Gems_Default_LanguageAction extends Gems_Controller_Action
+{
+ public function changeUiAction()
+ {
+ $request = $this->getRequest();
+
+ $lang = strtolower($request->getParam('language'));
+ $url = base64_decode($request->getParam('current_uri'));
+
+ if (in_array($lang, $this->view->project->locales)) {
+
+ $this->session->user_locale = $lang;
+ if (Gems_Cookies::setLocale($lang, $this->basepath->getBasePath())) {
+ $this->getResponse()->setRedirect($url);
+ return;
+ }
+
+ throw new Exception($this->_('Cookies must be enabled for setting the language.'));
+ }
+
+ throw new Exception($this->_('Invalid language setting.'));
+ }
+}
Copied: trunk/library/controllers/LanguageController.php (from rev 85, trunk/library/controllers/LanguageController.php)
===================================================================
--- trunk/library/controllers/LanguageController.php (rev 0)
+++ trunk/library/controllers/LanguageController.php 2011-10-11 12:59:41 UTC (rev 88)
@@ -0,0 +1,33 @@
+<?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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ */
+
+class LanguageController extends Gems_Default_LanguageAction
+{
+}
\ 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...> - 2011-10-11 12:25:40
|
Revision: 87
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=87&view=rev
Author: matijsdejong
Date: 2011-10-11 12:25:29 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
Menu reorganized as per ticket #5
Modified Paths:
--------------
trunk/library/classes/Gems/Default/ProjectInformationAction.php
trunk/library/classes/Gems/Log.php
trunk/library/classes/Gems/Menu/MenuAbstract.php
trunk/library/classes/Gems/Menu.php
Modified: trunk/library/classes/Gems/Default/ProjectInformationAction.php
===================================================================
--- trunk/library/classes/Gems/Default/ProjectInformationAction.php 2011-10-11 11:35:46 UTC (rev 86)
+++ trunk/library/classes/Gems/Default/ProjectInformationAction.php 2011-10-11 12:25:29 UTC (rev 87)
@@ -54,46 +54,58 @@
$this->html[] = $table;
}
- public function changelogAction()
+ protected function _showText($caption, $log_file, $empty_label = null)
{
- $this->html->h2($this->_('Changelog'));
+ $this->html->h2($caption);
- $log_path = APPLICATION_PATH;
- $log_file = $log_path . '/changelog.txt';
-
- if ((1 == $this->_getParam(MUtil_Model::REQUEST_ID)) && file_exists($log_file)) {
+ if ($empty_label && (1 == $this->_getParam(MUtil_Model::REQUEST_ID)) && file_exists($log_file)) {
unlink($log_file);
}
if (file_exists($log_file)) {
- $this->html->pre(trim(file_get_contents($log_file)), array('class' => 'logFile'));
+ $content = trim(file_get_contents($log_file));
+
+ if ($content) {
+ $error = false;
+ } else {
+ $error = $this->_('empty file');
+ }
} else {
- $this->html->pInfo(sprintf($this->_('No changelog found. Place one in %s.'), $log_file));
+ $content = null;
+ $error = $this->_('file not found');
}
- }
- public function errorsAction()
- {
- $this->html->h2($this->_('Logged errors'));
+ if ($empty_label) {
+ $buttons = $this->html->buttonDiv();
+ if ($error) {
+ $buttons->actionDisabled($empty_label);
+ } else {
+ $buttons->actionLink(array(MUtil_Model::REQUEST_ID => 1), $empty_label);
+ }
+ }
- $log_path = GEMS_ROOT_DIR . '/var/logs';
- $log_file = $log_path . '/errors.log';
+ if ($error) {
+ $this->html->pre($error, array('class' => 'disabled logFile'));
+ } else {
+ $this->html->pre($content, array('class' => 'logFile'));
+ }
- if ((1 == $this->_getParam(MUtil_Model::REQUEST_ID)) && file_exists($log_file)) {
- unlink($log_file);
+ if ($empty_label) {
+ // Buttons at both bottom and top.
+ $this->html[] = $buttons;
}
+ }
- if (file_exists($log_file)) {
- $buttons = $this->html->buttonDiv();
- $buttons->actionLink(array(MUtil_Model::REQUEST_ID => 1), $this->_('Empty logfile'));
+ public function changelogAction()
+ {
+ $this->_showText($this->_('Changelog'), APPLICATION_PATH . '/changelog.txt');
+ }
- $this->html->pre(trim(file_get_contents($log_file)), array('class' => 'logFile'));
+ public function errorsAction()
+ {
+ $this->logger->shutdown();
- $this->html[] = $buttons;
- } else {
- $this->html->pInfo($this->_('No logged errors found.'));
- $this->html->buttonDiv()->actionDisabled($this->_('Empty logfile'));
- }
+ $this->_showText($this->_('Logged errors'), GEMS_ROOT_DIR . '/var/logs/errors.log', $this->_('Empty logfile'));
}
public function indexAction()
Modified: trunk/library/classes/Gems/Log.php
===================================================================
--- trunk/library/classes/Gems/Log.php 2011-10-11 11:35:46 UTC (rev 86)
+++ trunk/library/classes/Gems/Log.php 2011-10-11 12:25:29 UTC (rev 87)
@@ -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,7 +25,7 @@
* 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.
- *
+ *
* @version $Id$
* @package Gems
* @subpackage Log
@@ -46,7 +46,7 @@
* @var Gems_Log
*/
private static $_instance = null;
-
+
/**
* Returns static instance
* @return Gems_Log
@@ -56,7 +56,7 @@
if (empty(self::$_instance)) {
self::$_instance = new Gems_Log();
}
-
+
return self::$_instance;
}
@@ -72,17 +72,17 @@
}
/**
- * Helper method to log exception and (optional) request information
+ * Helper method to log exception and (optional) request information
* @param Exception $exception
* @param Zend_Controller_Request_Abstract $request
*/
public function logError(Exception $exception, Zend_Controller_Request_Abstract $request = null)
{
$info = array();
-
+
$info[] = 'Class: ' . get_class($exception);
$info[] = 'Message: ' . $this->stripHtml($exception->getMessage());
-
+
if (($exception instanceof Gems_Exception) && ($text = $exception->getInfo())) {
$info[] = 'Info: ' . $this->stripHtml($text);
}
@@ -98,19 +98,29 @@
$info[] = 'Changed info: ' . $this->stripHtml($text);
}
} */
-
+
if (!empty($request)) {
$info[] = 'Request Parameters:';
foreach ($request->getParams() as $key => $value) {
$info[] = $key . ' => ' . $value;
}
}
-
+
$info[] = 'Stack trace:';
$info[] = $exception->getTraceAsString();
-
+
foreach ($info as $line) {
$this->log($line, Zend_Log::ERR);
}
}
+
+ /**
+ * Closes all writers.
+ */
+ public function shutdown()
+ {
+ foreach ($this->_writers as $writer) {
+ $writer->shutdown();
+ }
+ }
}
\ No newline at end of file
Modified: trunk/library/classes/Gems/Menu/MenuAbstract.php
===================================================================
--- trunk/library/classes/Gems/Menu/MenuAbstract.php 2011-10-11 11:35:46 UTC (rev 86)
+++ trunk/library/classes/Gems/Menu/MenuAbstract.php 2011-10-11 12:25:29 UTC (rev 87)
@@ -1,6 +1,5 @@
<?php
-
/**
* Copyright (c) 2011, Erasmus MC
* All rights reserved.
@@ -37,6 +36,9 @@
*/
/**
+ * Base class for building a menu / button structure where the display of items is dependent
+ * on both privileges and the availability of parameter information,
+ * e.g. data to fill an 'id' parameter.
*
* @package Gems
* @subpackage Menu
@@ -140,8 +142,25 @@
}
/**
+ * Add a sub item to this item.
*
- * @param <type> $args_array
+ * The argumenets can be any of those used for Zend_Navigation_Page as well as some Gems specials.<ul>
+ * <li>'action' The name of the action.</li>
+ * <li>'allowed' Is the user allowed to access this menu item. Is checked against ACL using 'privilige'.</li>
+ * <li>'button_only' Never in the menu, only shown as a button by the program.</li>
+ * <li>'class' Display class for the menu link.</li>
+ * <li>'controller' What controller to use.</li>
+ * <li>'icon' Icon to display with the label.</li>
+ * <li>'label' The label to display for the menu item.</li>
+ * <li>'privilege' The privilege needed to choose the item.</li>
+ * <li>'target' Optional target attribute for the link.</li>
+ * <li>'type' Optional content type for the link</li>
+ * <li>'visible' Is the item visible. Is checked against ACL using 'privilige'.</li>
+ * </ul>
+ *
+ * @see Zend_Navigation_Page
+ *
+ * @param array $args_array MUtil_Ra::args array with defaults 'visible' and 'allowed' true.
* @return Gems_Menu_SubMenuItem
*/
protected function add($args_array)
@@ -198,7 +217,14 @@
return $this->addPage($label, $privilege, $controller, $action, $other);
}
- public function addMailSetupPage($label)
+ /**
+ * Add a Mail menu tree to the menu
+ *
+ * @param string $label
+ * @param array $other
+ * @return Gems_Menu_SubMenuItem
+ */
+ public function addMailSetupMenu($label)
{
$setup = $this->addContainer($label);
@@ -226,8 +252,7 @@
* @param string $privilege The privilege for the item
* @param string $controller What controller to use
* @param string $action The name of the action
- * @param array $other Array of extra options for this item
- *
+ * @param array $other Array of extra options for this item, e.g. 'visible', 'allowed', 'class', 'icon', 'target', 'type', 'button_only'
* @return Gems_Menu_SubMenuItem
*/
public function addPage($label, $privilege, $controller, $action = 'index', array $other = array())
@@ -260,6 +285,33 @@
return $infoPage;
}
+ /**
+ * Add pages that show the user technical information about the installation
+ * in the project.
+ *
+ * @param string $label
+ * @param array $other
+ * @return Gems_Menu_SubMenuItem
+ */
+ public function addProjectInfoPage($label)
+ {
+ $page = $this->addPage($label, 'pr.project-information', 'project-information');
+ $page->addAction($this->_('Errors'), null, 'errors');
+ $page->addAction($this->_('PHP'), null, 'php');
+ $page->addAction($this->_('Project'), null, 'project');
+ $page->addAction($this->_('Session'), null, 'session');
+
+ return $page;
+ }
+
+ /**
+ * Add pages that show the user an overview of the tracks / surveys used
+ * in the project.
+ *
+ * @param string $label
+ * @param array $other
+ * @return Gems_Menu_SubMenuItem
+ */
public function addProjectPage($label)
{
if ($this->escort instanceof Gems_Project_Tracks_SingleTrackInterface) {
@@ -300,6 +352,13 @@
return $infoPage;
}
+ /**
+ * Add a staff browse edit page to the menu,
+ *
+ * @param string $label
+ * @param array $other
+ * @return Gems_Menu_SubMenuItem
+ */
public function addStaffPage($label, array $other = array())
{
$page = $this->addPage($label, 'pr.staff', 'staff', 'index', $other);
@@ -317,6 +376,73 @@
return $page;
}
+
+ /**
+ * Add a Trackbuilder menu tree to the menu
+ *
+ * @param string $label
+ * @param array $other
+ * @return Gems_Menu_SubMenuItem
+ */
+ public function addTrackBuilderMenu($label, array $other = array())
+ {
+ $setup = $this->addContainer($label);
+
+ // SURVEY SOURCES CONTROLLER
+ $page = $setup->addBrowsePage($this->_('Survey Sources'), 'pr.source', 'source');
+ $page->addDeleteAction();
+ $page->addAction($this->_('Check status'), null, 'ping')->addParameters(MUtil_Model::REQUEST_ID);
+ $page->addAction($this->_('Synchronize surveys'), 'pr.source.synchronize', 'synchronize')->addParameters(MUtil_Model::REQUEST_ID);
+ $page->addAction($this->_('Check answers'), 'pr.source.check-answers', 'check')->addParameters(MUtil_Model::REQUEST_ID);
+ $page->addAction($this->_('Synchronize all surveys'), 'pr.source.synchronize-all', 'synchronize-all');
+ $page->addAction($this->_('Check all answers'), 'pr.source.check-answers-all', 'check-all');
+
+ // SURVEY MAINTENANCE CONTROLLER
+ $page = $setup->addPage($this->_('Surveys'), 'pr.survey-maintenance', 'survey-maintenance');
+ $page->addEditAction();
+ $page->addShowAction();
+ $page->addPdfButton($this->_('PDF'), 'pr.survey-maintenance')
+ ->addParameters(MUtil_Model::REQUEST_ID)
+ ->setParameterFilter('gsu_has_pdf', 1);
+ $page->addAction($this->_('Check answers'), 'pr.survey-maintenance.check', 'check')->addParameters(MUtil_Model::REQUEST_ID);
+ $page->addAction($this->_('Check all answers'), 'pr.survey-maintenance.check-all', 'check-all');
+
+ $page->addAutofilterAction();
+
+ // TRACK MAINTENANCE CONTROLLER
+ $page = $setup->addBrowsePage($this->_('Tracks'), 'pr.track-maintenance', 'track-maintenance');
+
+ // Fields
+ $fpage = $page->addPage($this->_('Fields'), 'pr.track-maintenance', 'track-fields')->addNamedParameters(MUtil_Model::REQUEST_ID, 'gtf_id_track');
+ $fpage->addAutofilterAction();
+ $fpage->addCreateAction('pr.track-maintenance.create')->addNamedParameters(MUtil_Model::REQUEST_ID, 'gtf_id_track');
+ $fpage->addShowAction()->addNamedParameters(MUtil_Model::REQUEST_ID, 'gtf_id_track', 'fid', 'gtf_id_field');
+ $fpage->addEditAction('pr.track-maintenance.edit')->addNamedParameters('fid', 'gtf_id_field', MUtil_Model::REQUEST_ID, 'gtf_id_track');
+
+ // Standard tracks
+ $fpage = $page->addPage($this->_('Rounds'), 'pr.track-maintenance', 'track-rounds')
+ ->addNamedParameters(MUtil_Model::REQUEST_ID, 'gro_id_track')
+ ->setParameterFilter('gtr_track_type', 'T');
+ $fpage->addAutofilterAction();
+ $fpage->addCreateAction('pr.track-maintenance.create')->addNamedParameters(MUtil_Model::REQUEST_ID, 'gro_id_track');
+ $fpage->addShowAction()->addNamedParameters(MUtil_Model::REQUEST_ID, 'gro_id_track', Gems_Model::ROUND_ID, 'gro_id_round');
+ $fpage->addEditAction('pr.track-maintenance.edit')->addNamedParameters(Gems_Model::ROUND_ID, 'gro_id_round', MUtil_Model::REQUEST_ID, 'gro_id_track');
+
+ // Single survey tracks
+ $fpage = $page->addPage($this->_('Round'), 'pr.track-maintenance', 'track-round', 'show')
+ ->addNamedParameters(MUtil_Model::REQUEST_ID, 'gro_id_track')
+ ->setParameterFilter('gtr_track_type', 'S');
+ $fpage->addEditAction('pr.track-maintenance.edit')
+ ->addNamedParameters(MUtil_Model::REQUEST_ID, 'gro_id_track');
+
+ $page->addAction($this->_('Check assignments'), 'pr.track-maintenance.check', 'check-track')
+ ->addParameters(MUtil_Model::REQUEST_ID);
+
+ $page->addAction($this->_('Check all assignments'), 'pr.track-maintenance.check-all', 'check-all');
+
+ return $setup;
+ }
+
public function applyAcl(Zend_Acl $acl, $userRole)
{
if ($this->_subItems) {
Modified: trunk/library/classes/Gems/Menu.php
===================================================================
--- trunk/library/classes/Gems/Menu.php 2011-10-11 11:35:46 UTC (rev 86)
+++ trunk/library/classes/Gems/Menu.php 2011-10-11 12:25:29 UTC (rev 87)
@@ -163,6 +163,8 @@
{
$setup = $this->addContainer($label);
+ $setup->addProjectInfoPage($this->_('Project setup'));
+
// DATABASE CONTROLLER
$page = $setup->addPage($this->_('Database'), 'pr.database', 'database');
$page->addAutofilterAction();
@@ -183,89 +185,27 @@
}
$page->addAction($this->_('Run SQL'), 'pr.database.execute', 'run-sql');
- // PROJECT
- $page = $setup->addPage($this->_('Project setup'), 'pr.project-information', 'project-information');
- $page->addAction($this->_('Errors'), null, 'errors');
- $page->addAction($this->_('PHP'), null, 'php');
- $page->addAction($this->_('Project'), null, 'project');
- $page->addAction($this->_('Session'), null, 'session');
+ // RECEPTION CODE CONTROLLER
+ $page->addBrowsePage($this->_('Reception codes'), 'pr.reception', 'reception');
- // COUNTRIES CONTROLLER
- // $setup->addBrowsePage($this->_('Countries'), 'pr.country', 'country');
-
- // LANGUAGE CONTROLLER
- // $setup->addPage($this->_('Languages'), 'pr.language', 'language');
-
// CONSENT CONTROLLER
- $setup->addBrowsePage($this->_('Consents'), 'pr.consent', 'consent');
+ $page->addBrowsePage($this->_('Consents'), 'pr.consent', 'consent');
- // ORGANIZATIONS CONTROLLER
- $setup->addBrowsePage($this->_('Organizations'),'pr.organization', 'organization');
-
- // GROUPS CONTROLLER
- $setup->addBrowsePage($this->_('Groups'), 'pr.group', 'group');
-
// ROLES CONTROLLER
$page = $setup->addBrowsePage($this->_('Roles'), 'pr.role', 'role');
$page->addAction($this->_('ACL'), null, 'acl');
$page->addAction($this->_('Assigned'), null, 'overview');
$page->addAction($this->_('Privileges'), null, 'privilege');
- // RECEPTION CODE CONTROLLER
- $setup->addBrowsePage($this->_('Reception codes'), 'pr.reception', 'reception');
+ // GROUPS CONTROLLER
+ $setup->addBrowsePage($this->_('Groups'), 'pr.group', 'group');
- // SURVEY SOURCES CONTROLLER
- $page = $setup->addBrowsePage($this->_('Survey Sources'), 'pr.source', 'source');
- $page->addDeleteAction();
- $page->addAction($this->_('Check status'), null, 'ping')->addParameters(MUtil_Model::REQUEST_ID);
- $page->addAction($this->_('Synchronize surveys'), 'pr.source.synchronize', 'synchronize')->addParameters(MUtil_Model::REQUEST_ID);
- $page->addAction($this->_('Check answers'), 'pr.source.check-answers', 'check')->addParameters(MUtil_Model::REQUEST_ID);
- $page->addAction($this->_('Synchronize all surveys'), 'pr.source.synchronize-all', 'synchronize-all');
- $page->addAction($this->_('Check all answers'), 'pr.source.check-answers-all', 'check-all');
+ // ORGANIZATIONS CONTROLLER
+ $setup->addBrowsePage($this->_('Organizations'),'pr.organization', 'organization');
- // SURVEY MAINTENANCE CONTROLLER
- $page = $setup->addPage($this->_('Surveys'), 'pr.survey-maintenance', 'survey-maintenance');
- $page->addEditAction();
- $page->addShowAction();
- $page->addPdfButton($this->_('PDF'), 'pr.survey-maintenance')
- ->addParameters(MUtil_Model::REQUEST_ID)
- ->setParameterFilter('gsu_has_pdf', 1);
- $page->addAction($this->_('Check answers'), 'pr.survey-maintenance.check', 'check')->addParameters(MUtil_Model::REQUEST_ID);
- $page->addAction($this->_('Check all answers'), 'pr.survey-maintenance.check-all', 'check-all');
+ // STAFF CONTROLLER
+ $setup->addStaffPage($this->_('Staff'));
- $page->addAutofilterAction();
-
- // TRACK MAINTENANCE CONTROLLER
- $page = $setup->addBrowsePage($this->_('Tracks'), 'pr.track-maintenance', 'track-maintenance');
-
- // Fields
- $fpage = $page->addPage($this->_('Fields'), 'pr.track-maintenance', 'track-fields')->addNamedParameters(MUtil_Model::REQUEST_ID, 'gtf_id_track');
- $fpage->addAutofilterAction();
- $fpage->addCreateAction('pr.track-maintenance.create')->addNamedParameters(MUtil_Model::REQUEST_ID, 'gtf_id_track');
- $fpage->addShowAction()->addNamedParameters(MUtil_Model::REQUEST_ID, 'gtf_id_track', 'fid', 'gtf_id_field');
- $fpage->addEditAction('pr.track-maintenance.edit')->addNamedParameters('fid', 'gtf_id_field', MUtil_Model::REQUEST_ID, 'gtf_id_track');
-
- // Standard tracks
- $fpage = $page->addPage($this->_('Rounds'), 'pr.track-maintenance', 'track-rounds')
- ->addNamedParameters(MUtil_Model::REQUEST_ID, 'gro_id_track')
- ->setParameterFilter('gtr_track_type', 'T');
- $fpage->addAutofilterAction();
- $fpage->addCreateAction('pr.track-maintenance.create')->addNamedParameters(MUtil_Model::REQUEST_ID, 'gro_id_track');
- $fpage->addShowAction()->addNamedParameters(MUtil_Model::REQUEST_ID, 'gro_id_track', Gems_Model::ROUND_ID, 'gro_id_round');
- $fpage->addEditAction('pr.track-maintenance.edit')->addNamedParameters(Gems_Model::ROUND_ID, 'gro_id_round', MUtil_Model::REQUEST_ID, 'gro_id_track');
-
- // Single survey tracks
- $fpage = $page->addPage($this->_('Round'), 'pr.track-maintenance', 'track-round', 'show')
- ->addNamedParameters(MUtil_Model::REQUEST_ID, 'gro_id_track')
- ->setParameterFilter('gtr_track_type', 'S');
- $fpage->addEditAction('pr.track-maintenance.edit')
- ->addNamedParameters(MUtil_Model::REQUEST_ID, 'gro_id_track');
-
- $page->addAction($this->_('Check assignments'), 'pr.track-maintenance.check', 'check-track')
- ->addParameters(MUtil_Model::REQUEST_ID);
-
- $page->addAction($this->_('Check all assignments'), 'pr.track-maintenance.check-all', 'check-all');
-
// LOG CONTROLLER
$page = $setup->addPage($this->_('Logging'), 'pr.log', 'log', 'index');
$page->addAutofilterAction();
@@ -568,27 +508,30 @@
public function loadDefaultMenu()
{
// MAIN RESPONDENTS ITEM
- $this->addRespondentPage($this->escort->_('Respondents'));
+ $this->addRespondentPage($this->_('Respondents'));
// MAIN PLANNING ITEM
- $this->addPlanPage($this->escort->_('Overview'));
+ $this->addPlanPage($this->_('Overview'));
// MAIN RESULTS ITEM
// $menu->addPage($this->_('Results'), 'pr.result', 'result');
// $menu->addPage($this->_('Invite'), 'pr.invitation', 'invitation');
// PROJECT INFO
- $this->addProjectPage($this->escort->_('Project'));
+ $this->addProjectPage($this->_('Project'));
// MAIN STAFF ITEM
- $this->addStaffPage($this->escort->_('Staff'), array('order'=>40));
+ $this->addStaffPage($this->_('Staff'), array('order'=>40));
// SETUP CONTAINER
- $this->addGemsSetupContainer($this->escort->_('Setup'));
+ $this->addGemsSetupContainer($this->_('Setup'));
// MAIL CONTAINER
- $this->addMailSetupPage($this->escort->_('Mail'));
-
+ $this->addMailSetupMenu($this->_('Mail'));
+
+ // TRACK BUILDER
+ $this->addTrackBuilderMenu($this->_('Track Builder'));
+
// EXPORT DATA
$this->addContainer('Export data', 'pr.export', array('controller'=>'export', 'action'=>'index'));
@@ -596,7 +539,7 @@
$this->addLogonOffToken();
// CONTACT MENU
- $this->addContactPage($this->escort->_('Contact'));
+ $this->addContactPage($this->_('Contact'));
// Privileges not associated with menu item
$this->addHiddenPrivilige('pr.plan.choose-org');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-10-11 11:35:55
|
Revision: 86
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=86&view=rev
Author: matijsdejong
Date: 2011-10-11 11:35:46 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
Updated documentation and removed obsolete files.
Modified Paths:
--------------
trunk/library/classes/MUtil/Form/Decorator/AutoFocus.php
trunk/library/classes/MUtil/Form/Decorator/Table.php
trunk/library/classes/MUtil/Html/PagePanel.php
trunk/library/classes/MUtil/JQuery/Form/Element/DatePicker.php
trunk/library/classes/MUtil/Lazy/ObjectWrap.php
trunk/library/classes/MUtil/Markup/Renderer/Text/Url.php
trunk/library/classes/MUtil/Markup/Renderer/Text.php
trunk/library/classes/MUtil/Model/Transform/RequiredRowsTransformer.php
trunk/library/classes/MUtil/Parser/Sql/WordsParser.php
trunk/library/classes/MUtil/Parser/Sql/WordsParserException.php
trunk/library/classes/MUtil/Ra.php
trunk/library/classes/MUtil/Registry/SourceInterface.php
Removed Paths:
-------------
trunk/library/classes/Gems/Default/CountryAction.php
trunk/library/classes/Gems/Default/LanguageAction.php
trunk/library/controllers/CountryController.php
trunk/library/controllers/LanguageController.php
Deleted: trunk/library/classes/Gems/Default/CountryAction.php
===================================================================
--- trunk/library/classes/Gems/Default/CountryAction.php 2011-09-28 13:59:38 UTC (rev 85)
+++ trunk/library/classes/Gems/Default/CountryAction.php 2011-10-11 11:35:46 UTC (rev 86)
@@ -1,93 +0,0 @@
-<?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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
- */
-
-/**
- *
- * @author Matijs de Jong
- * @since 1.0
- * @version 1.1
- * @package Gems
- * @subpackage Default
- */
-
-/**
- *
- * @author Matijs de Jong
- * @package Gems
- * @subpackage Default
- */
-class Gems_Default_CountryAction extends Gems_Controller_BrowseEditAction
-{
- public $sortKey = array('gct_code' => SORT_ASC);
-
- /**
- * Creates a model for getModel(). Called only for each new $action.
- *
- * The parameters allow you to easily adapt the model to the current action. The $detailed
- * parameter was added, because the most common use of action is a split between detailed
- * and summarized actions.
- *
- * @param boolean $detailed True when the current action is not in $summarizedActions.
- * @param string $action The current action.
- * @return MUtil_Model_ModelAbstract
- */
- public function createModel($detailed, $action)
- {
- $model = new MUtil_Model_TableModel('gems__countries');
- $model->copyKeys(); // The user can edit the keys.
-
- $model->set('gct_code', 'label', $this->_('Code'));
- $model->set('gct_description', 'label', $this->_('Description'));
- $model->set('gct_in_eu', 'label', $this->_('In EU'),
- 'multiOptions', $this->util->getTranslated()->getYesNo(),
- 'elementClass', 'CheckBox',
- 'required', false);
- $model->set('gct_extra', 'label', $this->_('Notes'), 'elementClass', 'TextArea', 'rows', 5);
-
- if ($detailed) {
- $model->set('gct_code', 'validator', $model->createUniqueValidator('gct_code'));
- $model->set('gct_description', 'validator', $model->createUniqueValidator('gct_description'));
- }
-
- Gems_Model::setChangeFieldsByPrefix($model, 'gct');
-
- return $model;
- }
-
- public function getTopic($count = 1)
- {
- return $this->plural('country', 'countries', $count);
- }
-
- public function getTopicTitle()
- {
- return $this->_('Countries');
- }
-}
Deleted: trunk/library/classes/Gems/Default/LanguageAction.php
===================================================================
--- trunk/library/classes/Gems/Default/LanguageAction.php 2011-09-28 13:59:38 UTC (rev 85)
+++ trunk/library/classes/Gems/Default/LanguageAction.php 2011-10-11 11:35:46 UTC (rev 86)
@@ -1,68 +0,0 @@
-<?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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
- */
-
-/**
- *
- * @author Matijs de Jong
- * @since 1.0
- * @version 1.1
- * @package Gems
- * @subpackage Default
- */
-
-/**
- *
- * @author Matijs de Jong
- * @package Gems
- * @subpackage Default
- */
-class Gems_Default_LanguageAction extends Gems_Controller_Action
-{
- public function changeUiAction()
- {
- $request = $this->getRequest();
-
- $lang = strtolower($request->getParam('language'));
- $url = base64_decode($request->getParam('current_uri'));
-
- if (in_array($lang, $this->view->project->locales)) {
-
- $this->session->user_locale = $lang;
- if (Gems_Cookies::setLocale($lang, $this->basepath->getBasePath())) {
- $this->getResponse()->setRedirect($url);
- return;
- }
-
- throw new Exception($this->_('Cookies must be enabled for setting the language.'));
- }
-
- throw new Exception($this->_('Invalid language setting.'));
- }
-}
Modified: trunk/library/classes/MUtil/Form/Decorator/AutoFocus.php
===================================================================
--- trunk/library/classes/MUtil/Form/Decorator/AutoFocus.php 2011-09-28 13:59:38 UTC (rev 85)
+++ trunk/library/classes/MUtil/Form/Decorator/AutoFocus.php 2011-10-11 11:35:46 UTC (rev 86)
@@ -1,47 +1,48 @@
<?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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
- */
-
/**
- *
- * @author Matijs de Jong
- * @since 1.0
- * @version 1.1
- * @package MUtil
+ * 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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 MUtil
* @subpackage Form
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
/**
- *
- * @author Matijs de Jong
- * @package MUtil
+ * Form decorator that sets the focus on the first suitable element.
+ *
+ * @package MUtil
* @subpackage Form
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
*/
class MUtil_Form_Decorator_AutoFocus extends Zend_Form_Decorator_Abstract
{
@@ -55,7 +56,7 @@
}
}
} elseif ($element instanceof Zend_Form_Element) {
- if (($element instanceof Zend_Form_Element_Hidden) ||
+ if (($element instanceof Zend_Form_Element_Hidden) ||
($element instanceof MUtil_Form_Element_NoFocusInterface) ||
($element->helper == 'Button') ||
($element->helper == 'formSubmit') ||
@@ -64,14 +65,14 @@
}
return $element->getId();
- } elseif (($element instanceof Zend_Form) ||
+ } elseif (($element instanceof Zend_Form) ||
($element instanceof Zend_Form_DisplayGroup)) {
foreach ($element as $subelement) {
if ($focus = $this->_getFocus($subelement)) {
return $focus;
}
}
- }
+ }
return null;
}
Modified: trunk/library/classes/MUtil/Form/Decorator/Table.php
===================================================================
--- trunk/library/classes/MUtil/Form/Decorator/Table.php 2011-09-28 13:59:38 UTC (rev 85)
+++ trunk/library/classes/MUtil/Form/Decorator/Table.php 2011-10-11 11:35:46 UTC (rev 86)
@@ -1,33 +1,49 @@
<?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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
- */
-
+/**
+ * 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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 MUtil
+ * @subpackage Form
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
+ */
+
+/**
+ * Display a form in a table decorator.
+ *
+ * @package MUtil
+ * @subpackage Form
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
+ */
class MUtil_Form_Decorator_Table extends Zend_Form_Decorator_ViewHelper
{
protected $_cellDecorators;
Modified: trunk/library/classes/MUtil/Html/PagePanel.php
===================================================================
--- trunk/library/classes/MUtil/Html/PagePanel.php 2011-09-28 13:59:38 UTC (rev 85)
+++ trunk/library/classes/MUtil/Html/PagePanel.php 2011-10-11 11:35:46 UTC (rev 86)
@@ -1,6 +1,5 @@
<?php
-
/**
* Copyright (c) 2011, Erasmus MC
* All rights reserved.
@@ -26,8 +25,28 @@
* 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 Html
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
+/**
+ * Html Element used to display paginator page links and links to increase or decrease
+ * the number of items shown.
+ *
+ * Includes functions for specirfying your own text and separators.
+ *
+ * @package MUtil
+ * @subpackage Html
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
+ */
class MUtil_Html_PagePanel extends MUtil_Html_Sequence implements MUtil_Lazy_Procrastinator
{
protected $_baseUrl = array();
Modified: trunk/library/classes/MUtil/JQuery/Form/Element/DatePicker.php
===================================================================
--- trunk/library/classes/MUtil/JQuery/Form/Element/DatePicker.php 2011-09-28 13:59:38 UTC (rev 85)
+++ trunk/library/classes/MUtil/JQuery/Form/Element/DatePicker.php 2011-10-11 11:35:46 UTC (rev 86)
@@ -1,46 +1,52 @@
<?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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
- */
-
-/*
- http://jquery-ui.googlecode.com/svn/tags/latest/ui/minified/i18n/jquery-ui-i18n.min.js"
+/**
+ * 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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 MUtil
+ * @subpackage JQuery
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
+ */
- $(function() {
- $.datepicker.setDefaults($.datepicker.regional['']);
- $("#datepicker").datepicker($.datepicker.regional['fr']);
- $("#locale").change(function() {
- $('#datepicker').datepicker('option', $.datepicker.regional[$(this).val()]);
- });
- });
-
+/**
+ * Extension of ZendX DatePicker element that add's locale awareness and input and output date
+ * parsing to the original element.
+ *
+ * @see ZendX_JQuery_Form_Element_DatePicker
+ *
+ * @package MUtil
+ * @subpackage JQuery
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
*/
-
class MUtil_JQuery_Form_Element_DatePicker extends ZendX_JQuery_Form_Element_DatePicker
{
protected $_dateFormat;
@@ -178,6 +184,19 @@
public function setView(Zend_View_Interface $view = null)
{
+ /*
+ http://jquery-ui.googlecode.com/svn/tags/latest/ui/minified/i18n/jquery-ui-i18n.min.js"
+
+ $(function() {
+ $.datepicker.setDefaults($.datepicker.regional['']);
+ $("#datepicker").datepicker($.datepicker.regional['fr']);
+ $("#locale").change(function() {
+ $('#datepicker').datepicker('option', $.datepicker.regional[$(this).val()]);
+ });
+ });
+
+ */
+
if ($locale = Zend_Registry::get('Zend_Locale')) {
$language = $locale->getLanguage();
if ($language && $language != 'en') {
Modified: trunk/library/classes/MUtil/Lazy/ObjectWrap.php
===================================================================
--- trunk/library/classes/MUtil/Lazy/ObjectWrap.php 2011-09-28 13:59:38 UTC (rev 85)
+++ trunk/library/classes/MUtil/Lazy/ObjectWrap.php 2011-10-11 11:35:46 UTC (rev 86)
@@ -1,39 +1,38 @@
<?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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
- */
-
/**
- * @author Matijs de Jong
- * @since 1.0
- * @version 1.1
- * @package MUtil
+ * 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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 MUtil
* @subpackage Lazy
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
/**
@@ -60,6 +59,12 @@
* echo $output[0] . ' -> ' . $output[1] . ' | ' . $output[2] . ' -> ' . $output[3];
* // Result old -> new | 1 -> 2
* </code>
+ *
+ * @package MUtil
+ * @subpackage Lazy
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
*/
class MUtil_Lazy_ObjectWrap extends MUtil_Lazy_LazyAbstract
{
Modified: trunk/library/classes/MUtil/Markup/Renderer/Text/Url.php
===================================================================
--- trunk/library/classes/MUtil/Markup/Renderer/Text/Url.php 2011-09-28 13:59:38 UTC (rev 85)
+++ trunk/library/classes/MUtil/Markup/Renderer/Text/Url.php 2011-10-11 11:35:46 UTC (rev 86)
@@ -1,34 +1,50 @@
<?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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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 MUtil
+ * @subpackage Markup
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
+ */
-
-/**
- * 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
- */
-
+/**
+ * Makes sure the URL of a link is not lost when rendering Markup input
+ * into text.
+ *
+ * @package MUtil
+ * @subpackage Markup
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.1
+ */
class MUtil_Markup_Renderer_Text_Url implements Zend_Markup_Renderer_TokenConverterInterface
{
/**
Modified: trunk/library/classes/MUtil/Markup/Renderer/Text.php
===================================================================
--- trunk/library/classes/MUtil/Markup/Renderer/Text.php 2011-09-28 13:59:38 UTC (rev 85)
+++ trunk/library/classes/MUtil/Markup/Renderer/Text.php 2011-10-11 11:35:46 UTC (rev 86)
@@ -1,33 +1,51 @@
-<?php
+<?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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
- */
-
+/**
+ * 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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 MUtil
+ * @subpackage Markup
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
+ */
+
+/**
+ * Markup renderer that outputs the input as flat text.
+ *
+ * Used e.g. to add a text version to an email of the BB code Html input.
+ *
+ * @package MUtil
+ * @subpackage Markup
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.1
+ */
class MUtil_Markup_Renderer_Text extends Zend_Markup_Renderer_RendererAbstract
{
/**
Modified: trunk/library/classes/MUtil/Model/Transform/RequiredRowsTransformer.php
===================================================================
--- trunk/library/classes/MUtil/Model/Transform/RequiredRowsTransformer.php 2011-09-28 13:59:38 UTC (rev 85)
+++ trunk/library/classes/MUtil/Model/Transform/RequiredRowsTransformer.php 2011-10-11 11:35:46 UTC (rev 86)
@@ -1,33 +1,52 @@
<?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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
- */
-
+/**
+ * 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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 MUtil
+ * @subpackage Model
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
+ */
+
+/**
+ * Transforms the output of a model->load() function to include required rows.
+ *
+ * A good usage example is a time report, when there has to be an output row for e.g.
+ * every week, even when there is no data for that week.
+ *
+ * @package MUtil
+ * @subpackage Model
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
+ */
class MUtil_Model_Transform_RequiredRowsTransformer extends MUtil_Model_ModelTransformerAbstract
{
protected $_defaultRow;
Modified: trunk/library/classes/MUtil/Parser/Sql/WordsParser.php
===================================================================
--- trunk/library/classes/MUtil/Parser/Sql/WordsParser.php 2011-09-28 13:59:38 UTC (rev 85)
+++ trunk/library/classes/MUtil/Parser/Sql/WordsParser.php 2011-10-11 11:35:46 UTC (rev 86)
@@ -1,35 +1,53 @@
<?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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
- */
-
+/**
+ * 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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 MUtil
+ * @subpackage Parser_Sql
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
+ */
+
include_once 'MUtil/Parser/Sql/WordsParserException.php';
+/**
+ * Parses a statement into SQL 'word', where quoted strings, fields or database
+ * object names and comments are seen as a single word each, even when
+ * containing whitespace.
+ *
+ * @package MUtil
+ * @subpackage Parser_Sql
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
+ */
class MUtil_Parser_Sql_WordsParser
{
const MODE_WORD = 0;
Modified: trunk/library/classes/MUtil/Parser/Sql/WordsParserException.php
===================================================================
--- trunk/library/classes/MUtil/Parser/Sql/WordsParserException.php 2011-09-28 13:59:38 UTC (rev 85)
+++ trunk/library/classes/MUtil/Parser/Sql/WordsParserException.php 2011-10-11 11:35:46 UTC (rev 86)
@@ -1,35 +1,51 @@
<?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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
- */
-
+
+/**
+ * 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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 MUtil
+ * @subpackage Parser_Sql
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
+ */
+
include_once 'Zend/Exception.php';
+/**
+ *
+ * @package MUtil
+ * @subpackage Parser_Sql
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
+ */
class MUtil_Parser_Sql_WordsParserException extends Zend_Exception
{
public function __construct($what, $line, $char)
Modified: trunk/library/classes/MUtil/Ra.php
===================================================================
--- trunk/library/classes/MUtil/Ra.php 2011-09-28 13:59:38 UTC (rev 85)
+++ trunk/library/classes/MUtil/Ra.php 2011-10-11 11:35:46 UTC (rev 86)
@@ -1,62 +1,63 @@
<?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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
- */
-
+
/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
*
- * @author Matijs de Jong
- * @version 1.0
- * @since 1.0
- * @package MUtil
+ * 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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 MUtil
* @subpackage Ra
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
/**
- * The Ra class contains static array processing functions that are used to give PHP/Zend some
+ * The Ra class contains static array processing functions that are used to give PHP/Zend some
* Python and Haskell like parameter processing functionality.
*
* Ra class: pronouce "array" except on 19 september, then it is "ahrrray".
*
- * The functions are:
- * - MUtil_Ra::args => Python faking
- * - MUtil_Ra::flatten => flatten an array renumbering keys
- * - MUtil_Ra::pairs => the parameters represent name => value pairs
+ * The functions are:<ol>
+ * <li>MUtil_Ra::args => Python faking</li>
+ * <li>MUtil_Ra::flatten => flatten an array renumbering keys</li>
+ * <li>MUtil_Ra::pairs => the parameters represent name => value pairs</li></ol>
*
- * @author Matijs de Jong
- * @package MUtil
+ * @package MUtil
* @subpackage Ra
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
*/
class MUtil_Ra
{
const RELAXED = 0;
const STRICT = 1;
-
+
private static $_initialToArrayList = array(
'ArrayObject' => 'getArrayCopy',
'MUtil_Lazy_LazyInterface' => 'MUtil_Lazy::rise',
@@ -75,7 +76,7 @@
private static $_toArrayConverter;
public static $toArrayConverterLoopLimit = 10;
-
+
/**
* The args() function makes position independent argument passing possible.
*
@@ -161,8 +162,8 @@
* Of course the actual order is not important, as is the actual number assigned to the last
* parameter value.
*
- * Assignment is depth first. Mind you, assignment is name first, instanceof second as long
- * as the $mode = MUtil_Ra::RELAXED. If the name does not correspond to the specified type
+ * Assignment is depth first. Mind you, assignment is name first, instanceof second as long
+ * as the $mode = MUtil_Ra::RELAXED. If the name does not correspond to the specified type
* it is still assigned. Also the assignment order is again depth first:
* <code>
* MUtil_Ra::args(
@@ -170,22 +171,22 @@
* array('foo' => 'Zend_Foo', 'bar' => 'Zend_Foo', 'foobar' => 'Zend_Db_Select'));
* =>
* array('foo' => new Zend_Foo(1), 'bar' => new Zend_Foo(2), 'foobar' => 'x', 0 => 'a', 1 => 'b');
- * </code>
- *
- *
- * OTHER TYPE OPTIONS
- *
- * Apart from class names you can also use is_*() functions to test for a type. E.g. is_string() or
- * is_boolean(). You can also write your own is_whatever() function.
- *
- * You can assign multiple types as an array. The array will search all the arguments first for the
+ * </code>
+ *
+ *
+ * OTHER TYPE OPTIONS
+ *
+ * Apart from class names you can also use is_*() functions to test for a type. E.g. is_string() or
+ * is_boolean(). You can also write your own is_whatever() function.
+ *
+ * You can assign multiple types as an array. The array will search all the arguments first for the
* first type, then the second, etc..
- *
- * The next example will get the first passed compatible Zend element (which your code can use to get
+ *
+ * The next example will get the first passed compatible Zend element (which your code can use to get
* the id of) or else the first available string parameter.
- * <code>
+ * <code>
* array('id' => array('Zend_Form_Element', ''Zend_Form_DisplayGroup', 'Zend_Form', 'is_string'));
- * </code>
+ * </code>
*
* ADDING DEFAULTS
*
@@ -207,7 +208,7 @@
* @param array $args An array containing the arguments to process (usually func_get_args() output)
* @param mixed $skipOrName If numeric the number of arguments in $args to leave alone, otherwise the names of numbered
* elements. Class names can also be specified.
- * @param array $defaults An array of argument name => default_value pairs.
+ * @param array $defaults An array of argument name => default_value pairs.
* @param boolean $mode The $skipOrName types are only used as hints or must be strictly adhered to.
* @return array Flattened array containing the arguments.
*/
@@ -234,16 +235,16 @@
// Assign numbered array items to the names specified (if any)
foreach ($names as $n1 => $n2) {
// The current element is always the first in the args array,
- // as long as the corresponding key is numeric.
+ // as long as the corresponding key is numeric.
//
- // When the "supply" of numeric keys is finished we have processed
+ // When the "supply" of numeric keys is finished we have processed
// all the keys that were passed.
reset($args);
$current = key($args);
if (! is_int($current)) {
break;
}
-
+
// The parameter type
if (is_int($n1)) {
$ntype = null;
@@ -342,19 +343,19 @@
return false;
}
-
+
/**
* Extracts a column from a nested array of values, maintaining index association.
- *
- * The default RELAXED mode will return only values where these exist and are not null.
+ *
+ * The default RELAXED mode will return only values where these exist and are not null.
* STRICT mode will return all values plus null for all keys in $input.
- *
+ *
* @param string $index Index of the column to extract
* @param array $input A nested array from which we extract a column
* @param int $mode RELAXED means a v
- * @return array An array containing the requested column
+ * @return array An array containing the requested column
*/
- public static function column($index, array $input, $mode = self::RELAXED)
+ public static function column($index, array $input, $mode = self::RELAXED)
{
$all = (self::STRICT === $mode);
$results = array();
Modified: trunk/library/classes/MUtil/Registry/SourceInterface.php
===================================================================
--- trunk/library/classes/MUtil/Registry/SourceInterface.php 2011-09-28 13:59:38 UTC (rev 85)
+++ trunk/library/classes/MUtil/Registry/SourceInterface.php 2011-10-11 11:35:46 UTC (rev 86)
@@ -1,10 +1,9 @@
<?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
@@ -15,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 ...
[truncated message content] |
|
From: <gem...@li...> - 2011-09-28 13:59:45
|
Revision: 85
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=85&view=rev
Author: matijsdejong
Date: 2011-09-28 13:59:38 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
- documentation changes for GemsEscort.php and ModelAbstract.php
- fix for RespondentModel.php: auto organization filter now applied in _checkFilterUsed
Modified Paths:
--------------
trunk/library/classes/Gems/Model/RespondentModel.php
trunk/library/classes/GemsEscort.php
trunk/library/classes/MUtil/Model/ModelAbstract.php
Modified: trunk/library/classes/Gems/Model/RespondentModel.php
===================================================================
--- trunk/library/classes/Gems/Model/RespondentModel.php 2011-09-28 12:56:41 UTC (rev 84)
+++ trunk/library/classes/Gems/Model/RespondentModel.php 2011-09-28 13:59:38 UTC (rev 85)
@@ -50,6 +50,8 @@
*/
class Gems_Model_RespondentModel extends Gems_Model_HiddenOrganizationModel
{
+ protected $hashBsn = true;
+
public function __construct()
{
// gems__respondents MUST be first table for INSERTS!!
@@ -65,10 +67,32 @@
$this->setOnSave('gr2o_opened_by', GemsEscort::getInstance()->session->user_id);
$this->setSaveOnChange('gr2o_opened_by');
- $this->setSaveWhenNotNull('grs_bsn');
- $this->setOnSave('grs_bsn', array($this, 'formatBSN'));
+ if ($this->hashBsn) {
+ $this->setSaveWhenNotNull('grs_bsn');
+ $this->setOnSave('grs_bsn', array($this, 'formatBSN'));
+ }
}
+ /**
+ * Add an organization filter if it wasn't specified in the filter.
+ *
+ * Checks the filter on sematic correctness and replaces the text seacrh filter
+ * with the real filter.
+ *
+ * @param mixed $filter True for the filter stored in this model or a filter array
+ * @return array The filter to use
+ */
+ protected function _checkFilterUsed($filter)
+ {
+ $filter = parent::_checkFilterUsed($filter);
+
+ if (! isset($filter['gr2o_id_organization'])) {
+ $filter['gr2o_id_organization'] = $this->getCurrentOrganization();
+ }
+
+ return $filter;
+ }
+
public function formatBSN($name, $value, $new = false)
{
return md5($value);
@@ -90,16 +114,6 @@
return $this;
}
- public function getSelect()
- {
- $select = parent::getSelect();
- $adapter = $select->getAdapter();
-
- $select->where($adapter->quoteIdentifier('gr2o_id_organization') . ' = ?', $this->getCurrentOrganization());
-
- return $select;
- }
-
public function getRespondentTracksModel()
{
$model = new Gems_Model_JoinModel('surveys', 'gems__respondent2track');
Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php 2011-09-28 12:56:41 UTC (rev 84)
+++ trunk/library/classes/GemsEscort.php 2011-09-28 13:59:38 UTC (rev 85)
@@ -139,6 +139,8 @@
/**
* Initialize the logger
+ *
+ * @return Gems_Log
*/
protected function _initLogger()
{
Modified: trunk/library/classes/MUtil/Model/ModelAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Model/ModelAbstract.php 2011-09-28 12:56:41 UTC (rev 84)
+++ trunk/library/classes/MUtil/Model/ModelAbstract.php 2011-09-28 13:59:38 UTC (rev 85)
@@ -79,6 +79,13 @@
$this->_model_name = $modelName;
}
+ /**
+ * Checks the filter on sematic correctness and replaces the text seacrh filter
+ * with the real filter.
+ *
+ * @param mixed $filter True for the filter stored in this model or a filter array
+ * @return array The filter to use
+ */
protected function _checkFilterUsed($filter)
{
if (true === $filter) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-28 12:56:47
|
Revision: 84
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=84&view=rev
Author: mennodekker
Date: 2011-09-28 12:56:41 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
Fixed error when no label decorator found
Modified Paths:
--------------
trunk/library/classes/Gems/Form/TableForm.php
Modified: trunk/library/classes/Gems/Form/TableForm.php
===================================================================
--- trunk/library/classes/Gems/Form/TableForm.php 2011-09-28 10:11:45 UTC (rev 83)
+++ trunk/library/classes/Gems/Form/TableForm.php 2011-09-28 12:56:41 UTC (rev 84)
@@ -146,7 +146,9 @@
$element->setDecorators($decorators);
if ($element instanceof Zend_Form_Element_Checkbox) {
$decorator = $element->getDecorator('Label');
- $decorator->setOption('placement', Zend_Form_Decorator_Label::APPEND);
+ if ($decorator) {
+ $decorator->setOption('placement', Zend_Form_Decorator_Label::APPEND);
+ }
}
}
return $this;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-28 10:11:54
|
Revision: 83
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=83&view=rev
Author: mennodekker
Date: 2011-09-28 10:11:45 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
Fix for order of css, to allow form css to come last
Modified Paths:
--------------
trunk/library/classes/GemsEscort.php
Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php 2011-09-27 17:28:46 UTC (rev 82)
+++ trunk/library/classes/GemsEscort.php 2011-09-28 10:11:45 UTC (rev 83)
@@ -536,7 +536,9 @@
{
// Set CSS stylescheet(s)
if (isset($this->project->css)) {
- foreach ((array) $this->project->css as $css) {
+ $projectCss = (array) $this->project->css;
+ $projectCss = array_reverse($projectCss);
+ foreach ($projectCss as $css) {
if (is_array($css)) {
$media = $css['media'];
$url = $css['url'];
@@ -544,7 +546,7 @@
$url = $css;
$media = 'screen';
}
- $this->view->headLink()->appendStylesheet($this->basepath->getBasePath() . '/' . $url, $media);
+ $this->view->headLink()->prependStylesheet($this->basepath->getBasePath() . '/' . $url, $media);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-27 17:28:54
|
Revision: 82
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=82&view=rev
Author: matijsdejong
Date: 2011-09-27 17:28:46 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
- added constructor with arguments to RequestCache.php
- extra documentation for BrowseEditAction.php, TargetAbstract.php, TargetInterface.php
- continued on #10 new BrowseEditAction.php
todo: make possible to add filters to excel, look Excel export, maybe export using snippet
Modified Paths:
--------------
trunk/library/classes/Gems/Controller/BrowseEditAction.php
trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php
trunk/library/classes/Gems/Default/MailLogAction.php
trunk/library/classes/Gems/Registry/TargetAbstract.php
trunk/library/classes/Gems/Snippets/ModelTableSnippetAbstract.php
trunk/library/classes/Gems/Util/RequestCache.php
trunk/library/classes/Gems/Util.php
trunk/library/classes/MUtil/Controller/ModelSnippetActionAbstract.php
trunk/library/classes/MUtil/Registry/TargetAbstract.php
trunk/library/classes/MUtil/Registry/TargetInterface.php
trunk/library/snippets/Generic/AutosearchForm.php
trunk/library/snippets/Generic/ModelItemTableSnippet.php
trunk/library/snippets/Generic/ModelTableSnippet.php
Added Paths:
-----------
trunk/library/snippets/Generic/CurrentButtonRow.php
Modified: trunk/library/classes/Gems/Controller/BrowseEditAction.php
===================================================================
--- trunk/library/classes/Gems/Controller/BrowseEditAction.php 2011-09-27 14:43:57 UTC (rev 81)
+++ trunk/library/classes/Gems/Controller/BrowseEditAction.php 2011-09-27 17:28:46 UTC (rev 82)
@@ -583,16 +583,13 @@
*
* @param boolean $includeDefaults Include the default values (yes for filtering, no for urls
* @param string $sourceAction The action to get the cache from if not the current one.
+ * @param boolean $readonly Optional, tell the cache not to store any new values
* @return array
*/
public function getCachedRequestData($includeDefaults = true, $sourceAction = null, $readonly = false)
{
if (! $this->requestCache) {
- $this->requestCache = $this->util->getRequestCache();
- if ($sourceAction) {
- $this->requestCache->setSourceAction($sourceAction);
- }
- $this->requestCache->setReadonly($readonly);
+ $this->requestCache = $this->util->getRequestCache($sourceAction, $readonly);
$this->requestCache->setMenu($this->menu);
$this->requestCache->setRequest($this->request);
Modified: trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php
===================================================================
--- trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php 2011-09-27 14:43:57 UTC (rev 81)
+++ trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php 2011-09-27 17:28:46 UTC (rev 82)
@@ -74,13 +74,20 @@
protected $autofilterSnippets = 'Generic_ModelTableSnippet';
/**
- * The snippets used for the index action, minus those in autofilter
+ * The snippets used for the index action, before those in autofilter
*
* @var mixed String or array of snippets name
*/
- protected $indexSnippets = 'Generic_AutosearchForm';
+ protected $indexStartSnippets = 'Generic_AutosearchForm';
/**
+ * The snippets used for the index action, after those in autofilter
+ *
+ * @var mixed String or array of snippets name
+ */
+ protected $indexStopSnippets = 'Generic_CurrentButtonRow';
+
+ /**
* The snippets used for the show action
*
* @var mixed String or array of snippets name
@@ -88,6 +95,42 @@
protected $showSnippets = 'Generic_ModelItemTableSnippet';
/**
+ *
+ * @var Gems_Util
+ */
+ public $util;
+
+ /**
+ * Outputs the model to excel, applying all filters and searches needed
+ *
+ * When you want to change the output, there are two places to check:
+ *
+ * 1. $this->addExcelColumns($model), where the model can be changed to have labels for columns you
+ * need exported
+ *
+ * 2. $this->getExcelData($data, $model) where the supplied data and model are merged to get output
+ * (by default all fields from the model that have a label)
+ */
+ public function excelAction()
+ {
+ // Set the request cache to use the search params from the index action
+ $requestCache = $this->util->getRequestCache('index', true);
+ $filter = $requestCache->getProgramParams();
+
+ $model = $this->getModel();
+
+ $model->applyParameters($filter);
+
+ // $this->addExcelColumns($model); // Hook to modify the model
+
+ $this->view->result = $this->getExcelData($model->load(), $model);
+ $this->view->filename = $this->getRequest()->getControllerName() . '.xls';
+ $this->view->setScriptPath(GEMS_LIBRARY_DIR . '/views/scripts' );
+
+ $this->render('excel', null, true);
+ }
+
+ /**
* Finds the first item with one of the actions specified as parameter and using the current controller
*
* @param string $action
@@ -109,6 +152,45 @@
}
/**
+ * Returns an array with all columns from the model that have a label
+ *
+ * @param array $data
+ * @param MUtil_Model_ModelAbstract $model
+ * @return array
+ */
+ protected function getExcelData($data, MUtil_Model_ModelAbstract $model)
+ {
+ $headings = array();
+ $emptyMsg = $this->_('No data found.');
+ foreach ($model->getItemsOrdered() as $name) {
+ if ($label = $model->get($name, 'label')) {
+ $headings[$name] = (string) $label;
+ }
+ }
+ $results = array();
+ $results[] = $headings;
+ if ($headings) {
+ if ($data) {
+ foreach ($data as $row) {
+ foreach ($headings as $key => $value) {
+ $result[$key] = isset($row[$key]) ? $row[$key] : null;
+ }
+ $results[] = $result;
+ }
+ return $results;
+ } else {
+ foreach ($headings as $key => $value) {
+ $result[$key] = $emptyMsg;
+ }
+ $results[] = $result;
+ return $results;
+ }
+ } else {
+ return array($emptyMsg);
+ }
+ }
+
+ /**
* Intializes the html component.
*
* @param boolean $reset Throws away any existing html output when true
Modified: trunk/library/classes/Gems/Default/MailLogAction.php
===================================================================
--- trunk/library/classes/Gems/Default/MailLogAction.php 2011-09-27 14:43:57 UTC (rev 81)
+++ trunk/library/classes/Gems/Default/MailLogAction.php 2011-09-27 17:28:46 UTC (rev 82)
@@ -140,6 +140,9 @@
return $model;
}
+ /**
+ * Action for showing a browse page
+ */
public function indexAction()
{
$this->html->h3($this->_('Mail Activity Log'));
@@ -147,4 +150,16 @@
// MUtil_Echo::track($this->indexParameters);
parent::indexAction();
}
+
+
+ /**
+ * Action for showing an item page
+ */
+ public function showAction()
+ {
+ $this->html->h3($this->_('Show Mail Activity Log item'));
+
+ // MUtil_Echo::track($this->indexParameters);
+ parent::showAction();
+ }
}
Modified: trunk/library/classes/Gems/Registry/TargetAbstract.php
===================================================================
--- trunk/library/classes/Gems/Registry/TargetAbstract.php 2011-09-27 14:43:57 UTC (rev 81)
+++ trunk/library/classes/Gems/Registry/TargetAbstract.php 2011-09-27 17:28:46 UTC (rev 82)
@@ -4,7 +4,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
@@ -15,7 +15,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
@@ -26,23 +26,25 @@
* 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.
- */
-
-/**
- * @author Matijs de Jong
- * @since 1.0
- * @version 1.1
- * @package Gems
+ *
+ *
+ * @package Gems
* @subpackage Registry
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
/**
- * Extends MUtil_Registry_TargetAbstract with the ability to create
+ * Extends MUtil_Registry_TargetAbstract with the ability to create PHP
* callables by request an existing method using $this->methodName.
- *
- * @author Matijs de Jong
- * @package Gems
+ *
+ * @package Gems
* @subpackage Registry
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.1
*/
class Gems_Registry_TargetAbstract extends MUtil_Registry_TargetAbstract
{
Modified: trunk/library/classes/Gems/Snippets/ModelTableSnippetAbstract.php
===================================================================
--- trunk/library/classes/Gems/Snippets/ModelTableSnippetAbstract.php 2011-09-27 14:43:57 UTC (rev 81)
+++ trunk/library/classes/Gems/Snippets/ModelTableSnippetAbstract.php 2011-09-27 17:28:46 UTC (rev 82)
@@ -82,6 +82,7 @@
public $menu;
/**
+ * Optional, used for base url
*
* @var Gems_Util_RequestCache
*/
@@ -122,11 +123,16 @@
*/
public function checkRegistryRequestsAnswers()
{
- if ($this->requestCache && (! $this->baseUrl)) {
- $this->baseUrl = $this->requestCache->getProgramParams();
+ if ($this->requestCache) {
+ // Items that should not be stored.
+ $this->requestCache->removeParams('page', 'items', 'action');
- if (MUtil_Registry_Source::$verbose) {
- MUtil_Echo::track($this->baseUrl);
+ if ((! $this->baseUrl)) {
+ $this->baseUrl = $this->requestCache->getProgramParams();
+
+ if (MUtil_Registry_Source::$verbose) {
+ MUtil_Echo::track($this->baseUrl);
+ }
}
}
@@ -186,4 +192,21 @@
return $table;
}
}
+
+ /**
+ * Overrule to implement snippet specific filtering and sorting.
+ *
+ * @param MUtil_Model_ModelAbstract $model
+ */
+ protected function processFilterAndSort(MUtil_Model_ModelAbstract $model)
+ {
+ if ($this->requestCache) {
+ $data = $this->requestCache->getProgramParams();
+
+ $model->applyParameters($data);
+
+ } else {
+ parent::processFilterAndSort($model);
+ }
+ }
}
Modified: trunk/library/classes/Gems/Util/RequestCache.php
===================================================================
--- trunk/library/classes/Gems/Util/RequestCache.php 2011-09-27 14:43:57 UTC (rev 81)
+++ trunk/library/classes/Gems/Util/RequestCache.php 2011-09-27 17:28:46 UTC (rev 82)
@@ -109,6 +109,19 @@
protected $sourceAction;
/**
+ *
+ * @param string $sourceAction The action to get the cache from if not the current one.
+ * @param boolean $readonly Optional, tell the cache not to store any new values
+ */
+ public function __construct($sourceAction = null, $readonly = false)
+ {
+ if ($sourceAction) {
+ $this->setSourceAction($sourceAction);
+ }
+ $this->setReadonly($readonly);
+ }
+
+ /**
* Should be called after answering the request to allow the Target
* to check if all required registry values have been set correctly.
*
Modified: trunk/library/classes/Gems/Util.php
===================================================================
--- trunk/library/classes/Gems/Util.php 2011-09-27 14:43:57 UTC (rev 81)
+++ trunk/library/classes/Gems/Util.php 2011-09-27 17:28:46 UTC (rev 82)
@@ -170,11 +170,13 @@
/**
*
+ * @param string $sourceAction The action to get the cache from if not the current one.
+ * @param boolean $readonly Optional, tell the cache not to store any new values
* @return Gems_Util_RequestCache
*/
- public function getRequestCache()
+ public function getRequestCache($sourceAction = null, $readonly = false)
{
- return $this->_getClass('requestCache');
+ return $this->_getClass('requestCache', null, array($sourceAction, $readonly));
}
/**
Modified: trunk/library/classes/MUtil/Controller/ModelSnippetActionAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Controller/ModelSnippetActionAbstract.php 2011-09-27 14:43:57 UTC (rev 81)
+++ trunk/library/classes/MUtil/Controller/ModelSnippetActionAbstract.php 2011-09-27 17:28:46 UTC (rev 82)
@@ -70,13 +70,20 @@
protected $indexParameters = array();
/**
- * The snippets used for the index action, minus those in autofilter
+ * The snippets used for the index action, before those in autofilter
*
* @var mixed String or array of snippets name
*/
- protected $indexSnippets = null;
+ protected $indexStartSnippets = null;
/**
+ * The snippets used for the index action, after those in autofilter
+ *
+ * @var mixed String or array of snippets name
+ */
+ protected $indexStopSnippets = null;
+
+ /**
* The parameters used for the show action
*
* @var array Mixed key => value array for snippet initialization
@@ -139,16 +146,22 @@
*/
public function indexAction()
{
- if ($this->indexSnippets) {
+ if ($this->indexStartSnippets || $this->indexStopSnippets) {
$this->indexParameters = $this->indexParameters + $this->autofilterParameters;
$this->indexParameters['model'] = $this->getModel();
$this->indexParameters['request'] = $this->getRequest();
- $this->addSnippets($this->indexSnippets, $this->indexParameters);
+ if ($this->indexStartSnippets) {
+ $this->addSnippets($this->indexStartSnippets, $this->indexParameters);
+ }
}
$this->autofilterAction(false);
+
+ if ($this->indexStopSnippets) {
+ $this->addSnippets($this->indexStopSnippets, $this->indexParameters);
+ }
}
@@ -158,8 +171,6 @@
public function showAction()
{
if ($this->showSnippets) {
- $this->showParameters = $this->indexParameters + $this->autofilterParameters;
-
$this->showParameters['model'] = $this->getModel();
$this->showParameters['request'] = $this->getRequest();
Modified: trunk/library/classes/MUtil/Registry/TargetAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Registry/TargetAbstract.php 2011-09-27 14:43:57 UTC (rev 81)
+++ trunk/library/classes/MUtil/Registry/TargetAbstract.php 2011-09-27 17:28:46 UTC (rev 82)
@@ -1,48 +1,54 @@
<?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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
- */
-
+
/**
- * @author Matijs de Jong
- * @since 1.1
- * @version 1.1
- * @package MUtil
+ * 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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 MUtil
* @subpackage Registry
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
/**
- * MUtil_Registry_TargetAbstract is a default target object.
- *
- * Also usable to copy the code to implement your own version of this class.
+ * MUtil_Registry_TargetAbstract is a default target object, that requests values
+ * for all defined instance variables with names not starting with '_'.
*
- * @author Matijs de Jong
- * @package MUtil
+ * I.e. variables in a class inheriting from MUtil_Registry_TargetAbstract can be
+ * initialized by a source even when they are protected or private.
+ *
+ * Also usafull to copy the code to implement your own version of this class.
+ *
+ * @package MUtil
* @subpackage Registry
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.1
*/
abstract class MUtil_Registry_TargetAbstract implements MUtil_Registry_TargetInterface
{
@@ -90,12 +96,12 @@
}
/**
- * Allows the loader to know the resources to set.
- *
- * Returns those object variables defined by the subclass but not at the level of this definition.
- *
- * Can be overruled.
- *
+ * Allows the loader to know the resources to set.
+ *
+ * Returns those object variables defined by the subclass but not at the level of this definition.
+ *
+ * Can be overruled.
+ *
* @return array of string names
*/
public function getRegistryRequests()
Modified: trunk/library/classes/MUtil/Registry/TargetInterface.php
===================================================================
--- trunk/library/classes/MUtil/Registry/TargetInterface.php 2011-09-27 14:43:57 UTC (rev 81)
+++ trunk/library/classes/MUtil/Registry/TargetInterface.php 2011-09-27 17:28:46 UTC (rev 82)
@@ -4,7 +4,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
@@ -15,7 +15,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
@@ -26,14 +26,14 @@
* 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.
- */
-
-/**
- * @author Matijs de Jong
- * @since 1.1
- * @version 1.1
- * @package MUtil
+ *
+ *
+ * @package MUtil
* @subpackage Registry
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
/**
@@ -44,11 +44,13 @@
*
* @see MUtil_Registry_Source
*
- * @author Matijs de Jong
- * @package MUtil
+ * @package MUtil
* @subpackage Registry
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.1
*/
-interface MUtil_Registry_TargetInterface
+interface MUtil_Registry_TargetInterface
{
/**
* Allows the source to set request.
@@ -69,7 +71,7 @@
/**
* Allows the loader to know the resources to set.
- *
+ *
* @return array of string names
*/
public function getRegistryRequests();
Modified: trunk/library/snippets/Generic/AutosearchForm.php
===================================================================
--- trunk/library/snippets/Generic/AutosearchForm.php 2011-09-27 14:43:57 UTC (rev 81)
+++ trunk/library/snippets/Generic/AutosearchForm.php 2011-09-27 17:28:46 UTC (rev 82)
@@ -68,13 +68,45 @@
protected $request;
/**
+ * Optional, otherwise created from $util
*
+ * @var Gems_Util_RequestCache
+ */
+ public $requestCache;
+
+ /**
+ *
+ * @var Gems_Util
+ */
+ protected $util;
+
+ /**
+ *
* @var string Id for auto search button
*/
protected $searchButtonId = 'AUTO_SEARCH_TEXT_BUTTON';
/**
+ * Should be called after answering the request to allow the Target
+ * to check if all required registry values have been set correctly.
+ *
+ * @return boolean False if required are missing.
+ */
+ public function checkRegistryRequestsAnswers()
+ {
+ if ($this->util && (! $this->requestCache)) {
+ $this->requestCache = $this->util->getRequestCache();
+ }
+ if ($this->requestCache) {
+ // Do not store searchButtonId
+ $this->requestCache->removeParams($this->searchButtonId);
+ }
+
+ return parent::checkRegistryRequestsAnswers();
+ }
+
+ /**
* Creates the form itself
*
* @param array $options
@@ -196,6 +228,10 @@
*/
protected function getSearchData()
{
- return $this->request->getParams();
+ if ($this->requestCache) {
+ return $this->requestCache->getProgramParams();
+ } else {
+ return $this->request->getParams();
+ }
}
}
Added: trunk/library/snippets/Generic/CurrentButtonRow.php
===================================================================
--- trunk/library/snippets/Generic/CurrentButtonRow.php (rev 0)
+++ trunk/library/snippets/Generic/CurrentButtonRow.php 2011-09-27 17:28:46 UTC (rev 82)
@@ -0,0 +1,85 @@
+<?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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ *
+ * Short description of file
+ *
+ * @package Gems
+ * @subpackage Snippets
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: Sample.php 203 2011-07-07 12:51:32Z matijs $
+ */
+
+/**
+ * Short description for class
+ *
+ * Long description for class (if any)...
+ *
+ * @package Gems
+ * @subpackage Snippets
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.4.2
+ */
+class Generic_CurrentButtonRow extends MUtil_Snippets_SnippetAbstract
+{
+ /**
+ * Required
+ *
+ * @var Gems_Menu
+ */
+ protected $menu;
+
+ /**
+ * Required
+ *
+ * @var Zend_Controller_Request_Abstract
+ */
+ protected $request;
+
+ /**
+ * Create the snippets content
+ *
+ * This is a stub function either override getHtmlOutput() or override render()
+ *
+ * @param Zend_View_Abstract $view Just in case it is needed here
+ * @return MUtil_Html_HtmlInterface Something that can be rendered
+ */
+ public function getHtmlOutput(Zend_View_Abstract $view)
+ {
+ $menuList = $this->menu->getMenuList();
+
+ $menuList->addParameterSources($this->request)
+ ->addCurrentParent($this->_('Cancel'))
+ ->addCurrentChildren();
+
+ return $menuList;
+ }
+
+}
Modified: trunk/library/snippets/Generic/ModelItemTableSnippet.php
===================================================================
--- trunk/library/snippets/Generic/ModelItemTableSnippet.php 2011-09-27 14:43:57 UTC (rev 81)
+++ trunk/library/snippets/Generic/ModelItemTableSnippet.php 2011-09-27 17:28:46 UTC (rev 82)
@@ -1,6 +1,5 @@
<?php
-
/**
* Copyright (c) 2011, Erasmus MC
* All rights reserved.
@@ -92,6 +91,31 @@
protected $request;
/**
+ * Adds rows from the model to the bridge that creates the browse table.
+ *
+ * Overrule this function to add different columns to the browse table, without
+ * having to recode the core table building code.
+ *
+ * @param MUtil_Model_TableBridge $bridge
+ * @param MUtil_Model_ModelAbstract $model
+ * @return void
+ */
+ protected function addShowTableRows(MUtil_Model_VerticalTableBridge $bridge, MUtil_Model_ModelAbstract $model)
+ {
+ parent::addShowTableRows($bridge, $model);
+
+ $controller = $this->request->getControllerName();
+
+ $menuList = $this->menu->getMenuList();
+ $menuList->addParameterSources($bridge)
+ ->addByController($controller)
+ ->addByController($controller, 'edit')
+ ->addByController($controller, 'delete');
+
+ $bridge->tfrow($menuList, array('class' => 'centerAlign'));
+ }
+
+ /**
* Creates the model
*
* @return MUtil_Model_ModelAbstract
Modified: trunk/library/snippets/Generic/ModelTableSnippet.php
===================================================================
--- trunk/library/snippets/Generic/ModelTableSnippet.php 2011-09-27 14:43:57 UTC (rev 81)
+++ trunk/library/snippets/Generic/ModelTableSnippet.php 2011-09-27 17:28:46 UTC (rev 82)
@@ -54,6 +54,29 @@
protected $model;
/**
+ *
+ * @var Gems_Util
+ */
+ protected $util;
+
+ /**
+ * Automatically add request cacge
+ *
+ * Should be called after answering the request to allow the Target
+ * to check if all required registry values have been set correctly.
+ *
+ * @return boolean False if required are missing.
+ */
+ public function checkRegistryRequestsAnswers()
+ {
+ if ($this->util && (! $this->requestCache)) {
+ $this->requestCache = $this->util->getRequestCache();
+ }
+
+ return parent::checkRegistryRequestsAnswers();
+ }
+
+ /**
* Creates the model
*
* @return MUtil_Model_ModelAbstract
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-27 14:44:03
|
Revision: 81
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=81&view=rev
Author: matijsdejong
Date: 2011-09-27 14:43:57 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
- added documentation to ModelAbstract and JoinModel
- fix in JoinModel for warning when join is not on strings
- cleanup of menu use / pdf upload in SurveyMaintenanceAction.php
Modified Paths:
--------------
trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php
trunk/library/classes/MUtil/Model/JoinModel.php
trunk/library/classes/MUtil/Model/ModelAbstract.php
Modified: trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php
===================================================================
--- trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php 2011-09-27 13:00:35 UTC (rev 80)
+++ trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php 2011-09-27 14:43:57 UTC (rev 81)
@@ -44,7 +44,7 @@
* @license New BSD License
* @since Class available since version 1.0
*/
-class Gems_Default_SurveyMaintenanceAction extends Gems_Controller_BrowseEditAction implements Gems_Menu_ParameterSourceInterface
+class Gems_Default_SurveyMaintenanceAction extends Gems_Controller_BrowseEditAction
{
public $autoFilter = true;
@@ -55,12 +55,6 @@
public $sortKey = array('gsu_survey_name' => SORT_ASC);
/**
- *
- * @var array
- */
- protected $data = array();
-
- /**
* Adds columns from the model to the bridge that creates the browse table.
*
* Adds a button column to the model, if such a button exists in the model.
@@ -93,8 +87,7 @@
*/
protected function addFormElements(MUtil_Model_FormBridge $bridge, MUtil_Model_ModelAbstract $model, array $data, $new = false)
{
- //MUtil_Echo::r($data, __CLASS__ . '->' . __FUNCTION__);
- $data = array_merge($model->loadFirst(), $data);
+ // MUtil_Echo::track($data);
// Prepare variables
$currentId = $data['gsu_id_survey'];
@@ -381,15 +374,6 @@
return MUtil_Html::raw(strip_tags($value));
}
- public function getMenuParameter($name, $default)
- {
- if (isset($this->data[$name])) {
- return $this->data[$name];
- } else {
- return $default;
- }
- }
-
public function getTrackCount($currentId)
{
$singleTrack = ($this->escort instanceof Gems_Project_Tracks_SingleTrackInterface) ? $this->escort->getTrackId() : null;
@@ -440,8 +424,6 @@
$source = $this->menu->getParameterSource();
$source->offsetSet('gsu_has_pdf', $data['gsu_survey_pdf'] ? 1 : 0);
$source->offsetSet(MUtil_Model::REQUEST_ID, $data['gsu_id_survey']);
- $this->data['gsu_has_pdf'] = $data['gsu_survey_pdf'] ? 1 : 0;
- $this->data[MUtil_Model::REQUEST_ID] = $data['gsu_id_survey'];
return $this;
}
@@ -470,7 +452,7 @@
$this->html[] = $table;
if ($this->escort->hasPrivilege('pr.project.questions')) {
- $this->addSnippet('SurveyQuestionsSnippet', 'surveyId', $this->data[MUtil_Model::REQUEST_ID]);
+ $this->addSnippet('SurveyQuestionsSnippet', 'surveyId', $this->_getIdParam());
}
}
}
\ No newline at end of file
Modified: trunk/library/classes/MUtil/Model/JoinModel.php
===================================================================
--- trunk/library/classes/MUtil/Model/JoinModel.php 2011-09-27 13:00:35 UTC (rev 80)
+++ trunk/library/classes/MUtil/Model/JoinModel.php 2011-09-27 14:43:57 UTC (rev 81)
@@ -27,11 +27,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
- * @author Matijs de Jong <mj...@ma...>
- * @since 1.0
- * @version 1.1
- * @package MUtil
+ * @package MUtil
* @subpackage Model
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
/**
@@ -42,9 +43,11 @@
* but you can override this when calling save() and delete().
*
*
- * @author Matijs de Jong <mj...@ma...>
- * @package MUtil
+ * @package MUtil
* @subpackage Model
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
*/
class MUtil_Model_JoinModel extends MUtil_Model_DatabaseModelAbstract
{
@@ -230,6 +233,14 @@
return $select;
}
+ /**
+ * Save a single model item.
+ *
+ * @param array $newValues The values to store for a single model item.
+ * @param array $filter If the filter contains old key values these are used
+ * to decide on update versus insert.
+ * @return array The values as they are after saving (they may change).
+ */
public function save(array $newValues, array $filter = null, array $saveTables = null)
{
if (null === $saveTables) {
@@ -245,13 +256,14 @@
foreach ($saveTables as $table_name) {
// Gotta repeat this every time, as keys may be set later
foreach ($this->_joinFields as $source => $target) {
- if (! (isset($newValues[$target]) && $newValues[$target])) {
- if (! (isset($newValues[$source]) && $newValues[$source])) {
+ // Use is_string as $target and $target can be e.g. a Zend_Db_Expr() object
+ if (! (is_string($target) && isset($newValues[$target]) && $newValues[$target])) {
+ if (! (is_string($source) && isset($newValues[$source]) && $newValues[$source])) {
continue;
}
$newValues[$target] = $newValues[$source];
- } elseif (! (isset($newValues[$source]) && $newValues[$source])) {
+ } elseif (! (is_string($source) && isset($newValues[$source]) && $newValues[$source])) {
$newValues[$source] = $newValues[$target];
}
}
Modified: trunk/library/classes/MUtil/Model/ModelAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Model/ModelAbstract.php 2011-09-27 13:00:35 UTC (rev 80)
+++ trunk/library/classes/MUtil/Model/ModelAbstract.php 2011-09-27 14:43:57 UTC (rev 81)
@@ -834,6 +834,18 @@
return $this;
}
+ /**
+ * Reset the processing / display order for getItemsOrdered().
+ *
+ * Model items are displayed in the order they are first set() by the code.
+ * Using this functions resets this list and allows you to start over
+ * and determine the display order by the order you set() the items from
+ * now on.
+ *
+ * @see getItemsOrdered()
+ *
+ * @return MUtil_Model_ModelAbstract (continuation pattern)
+ */
public function resetOrder()
{
$this->_model_order = null;
@@ -845,7 +857,7 @@
*
* @param array $newValues The values to store for a single model item.
* @param array $filter If the filter contains old key values these are used
- * te decide on update versus insert.
+ * to decide on update versus insert.
* @return array The values as they are after saving (they may change).
*/
abstract public function save(array $newValues, array $filter = null);
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.
