Menu
▾
▴
gemstracker-svn — Receive updates on svn commits
You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(84) |
Oct
(70) |
Nov
(164) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(52) |
Feb
(77) |
Mar
(70) |
Apr
(58) |
May
(81) |
Jun
(74) |
Jul
(87) |
Aug
(30) |
Sep
(45) |
Oct
(37) |
Nov
(51) |
Dec
(31) |
| 2013 |
Jan
(47) |
Feb
(29) |
Mar
(40) |
Apr
(33) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <gem...@li...> - 2012-12-06 14:56:48
|
Revision: 1057
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1057&view=rev
Author: matijsdejong
Date: 2012-12-06 14:56:37 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
Fixed patch level & bug
Modified Paths:
--------------
tags/1.5.7/library/configs/db/tables/gems__patch_levels.10.sql
tags/1.5.7/library/configs/db/tables/gems__tokens.200.sql
Modified: tags/1.5.7/library/configs/db/tables/gems__patch_levels.10.sql
===================================================================
--- tags/1.5.7/library/configs/db/tables/gems__patch_levels.10.sql 2012-12-06 14:51:56 UTC (rev 1056)
+++ tags/1.5.7/library/configs/db/tables/gems__patch_levels.10.sql 2012-12-06 14:56:37 UTC (rev 1057)
@@ -11,4 +11,4 @@
INSERT INTO gems__patch_levels (gpl_level, gpl_created)
VALUES
- (50, CURRENT_TIMESTAMP);
+ (51, CURRENT_TIMESTAMP);
Modified: tags/1.5.7/library/configs/db/tables/gems__tokens.200.sql
===================================================================
--- tags/1.5.7/library/configs/db/tables/gems__tokens.200.sql 2012-12-06 14:51:56 UTC (rev 1056)
+++ tags/1.5.7/library/configs/db/tables/gems__tokens.200.sql 2012-12-06 14:56:37 UTC (rev 1057)
@@ -50,8 +50,8 @@
gto_created_by bigint unsigned not null,
PRIMARY KEY (gto_id_token),
- INDEX (gto_id_organization);
- INDEX (gto_id_respondent);
+ INDEX (gto_id_organization),
+ INDEX (gto_id_respondent),
INDEX (gto_id_survey),
INDEX (gto_id_track),
INDEX (gto_id_round),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-12-06 14:52:04
|
Revision: 1056
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1056&view=rev
Author: matijsdejong
Date: 2012-12-06 14:51:56 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
Database coding fixes
Modified Paths:
--------------
trunk/library/configs/db/tables/gems__patch_levels.10.sql
trunk/library/configs/db/tables/gems__tokens.200.sql
Modified: trunk/library/configs/db/tables/gems__patch_levels.10.sql
===================================================================
--- trunk/library/configs/db/tables/gems__patch_levels.10.sql 2012-12-06 12:38:27 UTC (rev 1055)
+++ trunk/library/configs/db/tables/gems__patch_levels.10.sql 2012-12-06 14:51:56 UTC (rev 1056)
@@ -11,4 +11,4 @@
INSERT INTO gems__patch_levels (gpl_level, gpl_created)
VALUES
- (50, CURRENT_TIMESTAMP);
+ (51, CURRENT_TIMESTAMP);
Modified: trunk/library/configs/db/tables/gems__tokens.200.sql
===================================================================
--- trunk/library/configs/db/tables/gems__tokens.200.sql 2012-12-06 12:38:27 UTC (rev 1055)
+++ trunk/library/configs/db/tables/gems__tokens.200.sql 2012-12-06 14:51:56 UTC (rev 1056)
@@ -50,8 +50,8 @@
gto_created_by bigint unsigned not null,
PRIMARY KEY (gto_id_token),
- INDEX (gto_id_organization);
- INDEX (gto_id_respondent);
+ INDEX (gto_id_organization),
+ INDEX (gto_id_respondent),
INDEX (gto_id_survey),
INDEX (gto_id_track),
INDEX (gto_id_round),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-12-06 12:38:41
|
Revision: 1055
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1055&view=rev
Author: mennodekker
Date: 2012-12-06 12:38:27 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
Merged revision(s) 1053-1054 from branches/receptioncodes:
Added onLoad for date fields + make save call the onload for the return values
Modified Paths:
--------------
trunk/library/classes/MUtil/Model/DatabaseModelAbstract.php
trunk/library/classes/MUtil/Model/JoinModel.php
trunk/library/classes/MUtil/Model/ModelAbstract.php
trunk/library/classes/MUtil/Model/TableModel.php
Property Changed:
----------------
trunk/
trunk/library/
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.5.0-pulse:306-430,467
/branches/1.5.x:426-455,458-472,475-481
/tags/1.5.0beta1:305
/tags/1.5.1:485,489,509-510
/tags/1.5.3-rc2:612,614,616,618
+ /branches/1.5.0-pulse:306-430,467
/branches/1.5.x:426-455,458-472,475-481
/branches/receptioncodes:1053-1054
/tags/1.5.0beta1:305
/tags/1.5.1:485,489,509-510
/tags/1.5.3-rc2:612,614,616,618
Property changes on: trunk/library
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.5.0-pulse/library:306-344,346,467
/branches/1.5.x/library:426-455,458-472,475-481
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
/tags/1.5.1/library:485,489,509-510,534
/tags/1.5.3-rc2/library:612,614,616,618
/tags/1.5.6-pulse20121012/library:986
+ /branches/1.5.0-pulse/library:306-344,346,467
/branches/1.5.x/library:426-455,458-472,475-481
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/receptioncodes/library:1053-1054
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
/tags/1.5.1/library:485,489,509-510,534
/tags/1.5.3-rc2/library:612,614,616,618
/tags/1.5.6-pulse20121012/library:986
Modified: trunk/library/classes/MUtil/Model/DatabaseModelAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Model/DatabaseModelAbstract.php 2012-12-06 12:20:24 UTC (rev 1054)
+++ trunk/library/classes/MUtil/Model/DatabaseModelAbstract.php 2012-12-06 12:38:27 UTC (rev 1055)
@@ -332,6 +332,7 @@
$finfo['type'] = MUtil_Model::TYPE_DATE;
$this->set($name, 'storageFormat', 'yyyy-MM-dd');
$this->setOnSave($name, array($this, 'formatSaveDate'));
+ $this->setOnLoad($name, array($this, 'formatLoadDate'));
break;
case 'datetime':
@@ -339,12 +340,14 @@
$finfo['type'] = MUtil_Model::TYPE_DATETIME;
$this->set($name, 'storageFormat', 'yyyy-MM-dd HH:mm:ss');
$this->setOnSave($name, array($this, 'formatSaveDate'));
+ $this->setOnLoad($name, array($this, 'formatLoadDate'));
break;
case 'time':
$finfo['type'] = MUtil_Model::TYPE_TIME;
$this->set($name, 'storageFormat', 'HH:mm:ss');
$this->setOnSave($name, array($this, 'formatSaveDate'));
+ $this->setOnLoad($name, array($this, 'formatLoadDate'));
break;
case 'int':
@@ -670,6 +673,32 @@
throw new MUtil_Model_ModelException("Cannot create UniqueValue validator as no table was defined for field $name.");
}
+
+ /**
+ * A ModelAbstract->setOnLoad() function that takes care of transforming a
+ * dateformat read from the database to a Zend_Date format
+ *
+ * If empty or Zend_Db_Expression (after save) it will return just the value
+ * currently there are no checks for a valid date format.
+ *
+ * @see MUtil_Model_ModelAbstract
+ *
+ * @param mixed $value The value being saved
+ * @param boolean $isNew True when a new item is being saved
+ * @param string $name The name of the current field
+ * @param array $context Optional, the other values being saved
+ * @return MUtil_Date|Zend_Db_Expr|string
+ */
+ public function formatLoadDate($value, $isNew = false, $name = null, array $context = array())
+ {
+ // If not empty or zend_db_expression and not already a zend date, we
+ // transform to a Zend_Date using the ISO_8601 format
+ if (!empty($value) && !($value instanceof Zend_Date) && !($value instanceof Zend_Db_Expr)) {
+ $tmpDate = new MUtil_Date($value, Zend_Date::ISO_8601);
+ return $tmpDate;
+ }
+ return $value;
+ }
/**
* A ModelAbstract->setOnSave() function that returns the input
Modified: trunk/library/classes/MUtil/Model/JoinModel.php
===================================================================
--- trunk/library/classes/MUtil/Model/JoinModel.php 2012-12-06 12:20:24 UTC (rev 1054)
+++ trunk/library/classes/MUtil/Model/JoinModel.php 2012-12-06 12:38:27 UTC (rev 1055)
@@ -373,6 +373,9 @@
if ($this->getChanged() > $oldChanged) {
$this->setChanged(++$oldChanged);
}
+
+ // Handle possible onLoad
+ $newValues = $this->processAfterLoad($newValues);
return $newValues;
}
Modified: trunk/library/classes/MUtil/Model/ModelAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Model/ModelAbstract.php 2012-12-06 12:20:24 UTC (rev 1054)
+++ trunk/library/classes/MUtil/Model/ModelAbstract.php 2012-12-06 12:38:27 UTC (rev 1055)
@@ -152,8 +152,10 @@
*/
protected function _filterDataAfterLoad(array $data, $new = false)
{
- foreach ($data as $name => $value) {
- $data[$name] = $this->getOnLoad($value, $new, $name, $data);
+ if ($this->getMeta(self::LOAD_TRANSFORMER)) {
+ foreach ($data as $name => $value) {
+ $data[$name] = $this->getOnLoad($value, $new, $name, $data);
+ }
}
return $data;
Modified: trunk/library/classes/MUtil/Model/TableModel.php
===================================================================
--- trunk/library/classes/MUtil/Model/TableModel.php 2012-12-06 12:20:24 UTC (rev 1054)
+++ trunk/library/classes/MUtil/Model/TableModel.php 2012-12-06 12:38:27 UTC (rev 1055)
@@ -119,6 +119,10 @@
{
// $this->_saveTableData returns the new row values, including any automatic changes.
// add $newValues to throw nothing away.
- return $this->_saveTableData($this->_table, $newValues, $filter, parent::SAVE_MODE_ALL) + $newValues;
+ $updatedValues = $this->_saveTableData($this->_table, $newValues, $filter, parent::SAVE_MODE_ALL) + $newValues;
+
+ // Handle possible onLoad
+ $updatedValues = $this->processAfterLoad($updatedValues);
+ return $updatedValues;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-12-06 12:20:33
|
Revision: 1054
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1054&view=rev
Author: mennodekker
Date: 2012-12-06 12:20:24 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
Fixed typo
Modified Paths:
--------------
branches/receptioncodes/library/classes/MUtil/Model/DatabaseModelAbstract.php
Modified: branches/receptioncodes/library/classes/MUtil/Model/DatabaseModelAbstract.php
===================================================================
--- branches/receptioncodes/library/classes/MUtil/Model/DatabaseModelAbstract.php 2012-12-06 11:50:35 UTC (rev 1053)
+++ branches/receptioncodes/library/classes/MUtil/Model/DatabaseModelAbstract.php 2012-12-06 12:20:24 UTC (rev 1054)
@@ -332,7 +332,7 @@
$finfo['type'] = MUtil_Model::TYPE_DATE;
$this->set($name, 'storageFormat', 'yyyy-MM-dd');
$this->setOnSave($name, array($this, 'formatSaveDate'));
- $this->setOnLoad($name, array($this, 'formatLoadData'));
+ $this->setOnLoad($name, array($this, 'formatLoadDate'));
break;
case 'datetime':
@@ -340,14 +340,14 @@
$finfo['type'] = MUtil_Model::TYPE_DATETIME;
$this->set($name, 'storageFormat', 'yyyy-MM-dd HH:mm:ss');
$this->setOnSave($name, array($this, 'formatSaveDate'));
- $this->setOnLoad($name, array($this, 'formatLoadData'));
+ $this->setOnLoad($name, array($this, 'formatLoadDate'));
break;
case 'time':
$finfo['type'] = MUtil_Model::TYPE_TIME;
$this->set($name, 'storageFormat', 'HH:mm:ss');
$this->setOnSave($name, array($this, 'formatSaveDate'));
- $this->setOnLoad($name, array($this, 'formatLoadData'));
+ $this->setOnLoad($name, array($this, 'formatLoadDate'));
break;
case 'int':
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-12-06 11:50:42
|
Revision: 1053
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1053&view=rev
Author: mennodekker
Date: 2012-12-06 11:50:35 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
Added onLoad for date fields + make save call the onload for the return values
Modified Paths:
--------------
branches/receptioncodes/library/classes/MUtil/Model/DatabaseModelAbstract.php
branches/receptioncodes/library/classes/MUtil/Model/JoinModel.php
branches/receptioncodes/library/classes/MUtil/Model/ModelAbstract.php
branches/receptioncodes/library/classes/MUtil/Model/TableModel.php
Modified: branches/receptioncodes/library/classes/MUtil/Model/DatabaseModelAbstract.php
===================================================================
--- branches/receptioncodes/library/classes/MUtil/Model/DatabaseModelAbstract.php 2012-11-30 14:45:28 UTC (rev 1052)
+++ branches/receptioncodes/library/classes/MUtil/Model/DatabaseModelAbstract.php 2012-12-06 11:50:35 UTC (rev 1053)
@@ -332,6 +332,7 @@
$finfo['type'] = MUtil_Model::TYPE_DATE;
$this->set($name, 'storageFormat', 'yyyy-MM-dd');
$this->setOnSave($name, array($this, 'formatSaveDate'));
+ $this->setOnLoad($name, array($this, 'formatLoadData'));
break;
case 'datetime':
@@ -339,12 +340,14 @@
$finfo['type'] = MUtil_Model::TYPE_DATETIME;
$this->set($name, 'storageFormat', 'yyyy-MM-dd HH:mm:ss');
$this->setOnSave($name, array($this, 'formatSaveDate'));
+ $this->setOnLoad($name, array($this, 'formatLoadData'));
break;
case 'time':
$finfo['type'] = MUtil_Model::TYPE_TIME;
$this->set($name, 'storageFormat', 'HH:mm:ss');
$this->setOnSave($name, array($this, 'formatSaveDate'));
+ $this->setOnLoad($name, array($this, 'formatLoadData'));
break;
case 'int':
@@ -670,6 +673,32 @@
throw new MUtil_Model_ModelException("Cannot create UniqueValue validator as no table was defined for field $name.");
}
+
+ /**
+ * A ModelAbstract->setOnLoad() function that takes care of transforming a
+ * dateformat read from the database to a Zend_Date format
+ *
+ * If empty or Zend_Db_Expression (after save) it will return just the value
+ * currently there are no checks for a valid date format.
+ *
+ * @see MUtil_Model_ModelAbstract
+ *
+ * @param mixed $value The value being saved
+ * @param boolean $isNew True when a new item is being saved
+ * @param string $name The name of the current field
+ * @param array $context Optional, the other values being saved
+ * @return MUtil_Date|Zend_Db_Expr|string
+ */
+ public function formatLoadDate($value, $isNew = false, $name = null, array $context = array())
+ {
+ // If not empty or zend_db_expression and not already a zend date, we
+ // transform to a Zend_Date using the ISO_8601 format
+ if (!empty($value) && !($value instanceof Zend_Date) && !($value instanceof Zend_Db_Expr)) {
+ $tmpDate = new MUtil_Date($value, Zend_Date::ISO_8601);
+ return $tmpDate;
+ }
+ return $value;
+ }
/**
* A ModelAbstract->setOnSave() function that returns the input
Modified: branches/receptioncodes/library/classes/MUtil/Model/JoinModel.php
===================================================================
--- branches/receptioncodes/library/classes/MUtil/Model/JoinModel.php 2012-11-30 14:45:28 UTC (rev 1052)
+++ branches/receptioncodes/library/classes/MUtil/Model/JoinModel.php 2012-12-06 11:50:35 UTC (rev 1053)
@@ -367,6 +367,9 @@
if ($this->getChanged() > $oldChanged) {
$this->setChanged(++$oldChanged);
}
+
+ // Handle possible onLoad
+ $newValues = $this->processAfterLoad($newValues);
return $newValues;
}
Modified: branches/receptioncodes/library/classes/MUtil/Model/ModelAbstract.php
===================================================================
--- branches/receptioncodes/library/classes/MUtil/Model/ModelAbstract.php 2012-11-30 14:45:28 UTC (rev 1052)
+++ branches/receptioncodes/library/classes/MUtil/Model/ModelAbstract.php 2012-12-06 11:50:35 UTC (rev 1053)
@@ -152,8 +152,10 @@
*/
protected function _filterDataAfterLoad(array $data, $new = false)
{
- foreach ($data as $name => $value) {
- $data[$name] = $this->getOnLoad($value, $new, $name, $data);
+ if ($this->getMeta(self::LOAD_TRANSFORMER)) {
+ foreach ($data as $name => $value) {
+ $data[$name] = $this->getOnLoad($value, $new, $name, $data);
+ }
}
return $data;
Modified: branches/receptioncodes/library/classes/MUtil/Model/TableModel.php
===================================================================
--- branches/receptioncodes/library/classes/MUtil/Model/TableModel.php 2012-11-30 14:45:28 UTC (rev 1052)
+++ branches/receptioncodes/library/classes/MUtil/Model/TableModel.php 2012-12-06 11:50:35 UTC (rev 1053)
@@ -119,6 +119,10 @@
{
// $this->_saveTableData returns the new row values, including any automatic changes.
// add $newValues to throw nothing away.
- return $this->_saveTableData($this->_table, $newValues, $filter, parent::SAVE_MODE_ALL) + $newValues;
+ $updatedValues = $this->_saveTableData($this->_table, $newValues, $filter, parent::SAVE_MODE_ALL) + $newValues;
+
+ // Handle possible onLoad
+ $updatedValues = $this->processAfterLoad($updatedValues);
+ return $updatedValues;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-30 14:45:34
|
Revision: 1052
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1052&view=rev
Author: mennodekker
Date: 2012-11-30 14:45:28 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
release 1.5.7
Added Paths:
-----------
tags/1.5.7/
Property changes on: tags/1.5.7
___________________________________________________________________
Added: svn:ignore
+ nbproject
Added: svn:mergeinfo
+ /branches/1.5.0-pulse:306-430,467
/branches/1.5.x:426-455,458-472,475-481
/tags/1.5.0beta1:305
/tags/1.5.1:485,489,509-510
/tags/1.5.3-rc2:612,614,616,618
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-29 17:12:38
|
Revision: 1051
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1051&view=rev
Author: matijsdejong
Date: 2012-11-29 17:12:32 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Added upgrades
Modified Paths:
--------------
trunk/library/classes/Gems/Upgrades.php
Modified: trunk/library/classes/Gems/Upgrades.php
===================================================================
--- trunk/library/classes/Gems/Upgrades.php 2012-11-29 14:16:28 UTC (rev 1050)
+++ trunk/library/classes/Gems/Upgrades.php 2012-11-29 17:12:32 UTC (rev 1051)
@@ -63,7 +63,8 @@
$this->register(array($this, 'Upgrade153to154'), 'Upgrade from 1.5.3 to 1.5.4');
$this->register(array($this, 'Upgrade154to155'), 'Upgrade from 1.5.4 to 1.5.5');
$this->register(array($this, 'Upgrade155to156'), 'Upgrade from 1.5.5 to 1.5.6');
-
+ $this->register(array($this, 'Upgrade156to157'), 'Upgrade from 1.5.6 to 1.5.7');
+
/**
* To have the new_project updated to the highest level, update
*
@@ -151,9 +152,9 @@
return true;
}
-
+
/**
- * To upgrade to 1.5.6 just execute patchlevel 48
+ * To upgrade to 1.5.6 just execute patchlevel 49
*/
public function Upgrade155to156()
{
@@ -163,4 +164,14 @@
return true;
}
+
+ /**
+ * To upgrade to 1.5.7 just execute patchlevel 50
+ */
+ public function Upgrade156to157()
+ {
+ $this->_batch->addTask('Db_ExecutePatch', 50);
+
+ return true;
+ }
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-29 14:16:39
|
Revision: 1050
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1050&view=rev
Author: matijsdejong
Date: 2012-11-29 14:16:28 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Updated changelog.txt
Modified Paths:
--------------
trunk/library/changelog.txt
trunk/library/classes/MUtil/Version.php
Modified: trunk/library/changelog.txt
===================================================================
--- trunk/library/changelog.txt 2012-11-29 14:04:39 UTC (rev 1049)
+++ trunk/library/changelog.txt 2012-11-29 14:16:28 UTC (rev 1050)
@@ -1,3 +1,14 @@
+Important changes from 1.5.6 => 1.5.7
+============================================================
+In LimeSurvey tokenanswerpersistence must be set to true for all surveys
+Token/ask now always sets itself to the language of the token user
+Added Answer display events for selecting more or less tokens
+Increased some small buttons for mobile use
+Many small bugs fixed and display improvements made
+Implemented many speed optimizations in both database access and code speed
+New DEMO application environment
+Simplefied writing project level unit test
+
Important changes from 1.5.5 => 1.5.6
============================================================
Transparent lessCss compiling was added. When you add a .less file GemsTracker will take care of compiling it to css. If you need to force a recompile, add the ?compilecss parameter to your url.
Modified: trunk/library/classes/MUtil/Version.php
===================================================================
--- trunk/library/classes/MUtil/Version.php 2012-11-29 14:04:39 UTC (rev 1049)
+++ trunk/library/classes/MUtil/Version.php 2012-11-29 14:16:28 UTC (rev 1050)
@@ -48,7 +48,7 @@
{
const MAJOR = 1;
const MINOR = 1;
- const BUILD = 34;
+ const BUILD = 35;
public static function get()
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-29 14:04:50
|
Revision: 1049
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1049&view=rev
Author: matijsdejong
Date: 2012-11-29 14:04:39 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Forgot a comma
Modified Paths:
--------------
trunk/library/configs/db/tables/gems__respondent2org.50.sql
Modified: trunk/library/configs/db/tables/gems__respondent2org.50.sql
===================================================================
--- trunk/library/configs/db/tables/gems__respondent2org.50.sql 2012-11-29 13:18:11 UTC (rev 1048)
+++ trunk/library/configs/db/tables/gems__respondent2org.50.sql 2012-11-29 14:04:39 UTC (rev 1049)
@@ -29,7 +29,7 @@
UNIQUE KEY (gr2o_id_user, gr2o_id_organization),
INDEX (gr2o_id_organization),
INDEX (gr2o_opened),
- INDEX (gr2o_reception_code)
+ INDEX (gr2o_reception_code),
INDEX (gr2o_opened_by),
INDEX (gr2o_changed_by)
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-29 13:18:21
|
Revision: 1048
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1048&view=rev
Author: matijsdejong
Date: 2012-11-29 13:18:11 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Removed debugging code
Modified Paths:
--------------
trunk/library/classes/Gems/Default/TrackAction.php
Modified: trunk/library/classes/Gems/Default/TrackAction.php
===================================================================
--- trunk/library/classes/Gems/Default/TrackAction.php 2012-11-29 13:13:28 UTC (rev 1047)
+++ trunk/library/classes/Gems/Default/TrackAction.php 2012-11-29 13:18:11 UTC (rev 1048)
@@ -477,7 +477,7 @@
if ($data = $model->applyRequest($request)->loadFirst()) {
$this->setMenuParameters($data);
- MUtil_Echo::track($data);
+ // MUtil_Echo::track($data);
if ($data['grc_description']) {
$model->set('grc_description', 'label', $this->_('Rejection code'), 'formatFunction', array($this->translate, '_'));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-29 13:13:40
|
Revision: 1047
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1047&view=rev
Author: matijsdejong
Date: 2012-11-29 13:13:28 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Renewed fix for #564 using formatFunction instead
Modified Paths:
--------------
trunk/library/classes/Gems/Default/RespondentAction.php
trunk/library/classes/MUtil/Model/ModelAbstract.php
Modified: trunk/library/classes/Gems/Default/RespondentAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RespondentAction.php 2012-11-29 11:06:23 UTC (rev 1046)
+++ trunk/library/classes/Gems/Default/RespondentAction.php 2012-11-29 13:13:28 UTC (rev 1047)
@@ -50,13 +50,6 @@
public $filterStandard = array('grc_success' => 1);
- /**
- * Variable for correctly displaying e-mail addresses
- *
- * @var MUtil_Lazy_LazyAbstract
- */
- protected $grs_email;
-
public $showSnippets = array(
'RespondentDetailsSnippet',
'AddTracksSnippet',
@@ -79,9 +72,8 @@
*/
protected function addBrowseTableColumns(MUtil_Model_TableBridge $bridge, MUtil_Model_ModelAbstract $model)
{
- $this->grs_email = $bridge->getLazy('grs_email');
$model->setIfExists('gr2o_opened', 'tableDisplay', 'small');
- $model->setIfExists('grs_email', 'itemDisplay', array($this, 'ifmail'));
+ $model->setIfExists('grs_email', 'formatFunction', 'MUtil_Html_AElement::ifmail');
if ($menuItem = $this->findAllowedMenuItem('show')) {
$bridge->addItemLink($menuItem->toActionLinkLower($this->getRequest(), $bridge));
@@ -471,23 +463,6 @@
}
/**
- * Helper function for preventing the marker value being mixed up in the output
- *
- * @param MUtil_Lazy_LazyAbstract $value
- * @return MUtil_Html_AElement
- */
- public function ifmail($value)
- {
- return MUtil_Lazy::iff($this->grs_email,
- new MUtil_Html_AElement(
- array('mailto:', $this->grs_email),
- $value,
- array('onclick' => 'event.cancelBubble=true;')
- )
- );
- }
-
- /**
* Overrule default index for the case that the current
* organization cannot have users.
*/
Modified: trunk/library/classes/MUtil/Model/ModelAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Model/ModelAbstract.php 2012-11-29 11:06:23 UTC (rev 1046)
+++ trunk/library/classes/MUtil/Model/ModelAbstract.php 2012-11-29 13:13:28 UTC (rev 1047)
@@ -977,7 +977,13 @@
*/
public function remove($name, $key = null)
{
- if (isset($this->_model[$name][$key])) unset($this->_model[$name][$key]);
+ if (null === $key) {
+ if (isset($this->_model[$name])) {
+ unset($this->_model[$name]);
+ }
+ } elseif (isset($this->_model[$name][$key])) {
+ unset($this->_model[$name][$key]);
+ }
return $this;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-29 11:06:36
|
Revision: 1046
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1046&view=rev
Author: matijsdejong
Date: 2012-11-29 11:06:23 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Moved tracker snippets to snippet directory
Improvbed naming
Modified Paths:
--------------
trunk/library/classes/Gems/Event/Survey/Display/AllOfSurvey.php
trunk/library/classes/Gems/Event/Survey/Display/TokenOnly.php
trunk/library/classes/Gems/Event/Survey/Display/TrackOnly.php
trunk/library/classes/Gems/Snippets/SnippetLoader.php
trunk/library/classes/Gems/Tracker/Engine/SingleSurveyEngine.php
trunk/library/classes/Gems/Tracker/Engine/StepEngineAbstract.php
trunk/library/languages/default-en.mo
trunk/library/languages/default-en.po
trunk/library/languages/default-nl.mo
trunk/library/languages/default-nl.po
trunk/library/snippets/AnswerModelSnippet.php
trunk/library/snippets/TrackAnswersModelSnippet.php
Added Paths:
-----------
trunk/library/classes/Gems/Event/Survey/Display/AllSingleTrack.php
trunk/library/classes/Gems/Snippets/Tracker/
trunk/library/classes/Gems/Snippets/Tracker/Answers/
trunk/library/classes/Gems/Snippets/Tracker/Answers/SingleTokenAnswerModelSnippet.php
trunk/library/classes/Gems/Snippets/Tracker/Answers/SingleTrackAnswersModelSnippet.php
trunk/library/classes/Gems/Snippets/Tracker/Answers/SurveyAnswersModelSnippet.php
trunk/library/classes/Gems/Snippets/Tracker/Answers/TrackAnswersModelSnippet.php
Removed Paths:
-------------
trunk/library/classes/Gems/Event/Survey/Display/AllSingleSurvey.php
trunk/library/classes/Gems/Tracker/Snippets/SingleSurveyAnswersModelSnippet.php
trunk/library/classes/Gems/Tracker/Snippets/SingleTokenAnswerModelSnippet.php
trunk/library/classes/Gems/Tracker/Snippets/SurveyAnswersModelSnippet.php
trunk/library/classes/Gems/Tracker/Snippets/TrackAnswersModelSnippet.php
Modified: trunk/library/classes/Gems/Event/Survey/Display/AllOfSurvey.php
===================================================================
--- trunk/library/classes/Gems/Event/Survey/Display/AllOfSurvey.php 2012-11-28 16:18:00 UTC (rev 1045)
+++ trunk/library/classes/Gems/Event/Survey/Display/AllOfSurvey.php 2012-11-29 11:06:23 UTC (rev 1046)
@@ -60,7 +60,7 @@
*/
public function getAnswerDisplaySnippets(Gems_Tracker_Token $token)
{
- return 'SurveyAnswersModelSnippet';
+ return 'Tracker_Answers_SurveyAnswersModelSnippet';
}
/**
Deleted: trunk/library/classes/Gems/Event/Survey/Display/AllSingleSurvey.php
===================================================================
--- trunk/library/classes/Gems/Event/Survey/Display/AllSingleSurvey.php 2012-11-28 16:18:00 UTC (rev 1045)
+++ trunk/library/classes/Gems/Event/Survey/Display/AllSingleSurvey.php 2012-11-29 11:06:23 UTC (rev 1046)
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * Copyright (c) 2012, 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 Events
- * @author Matijs de Jong <mj...@ma...>
- * @copyright Copyright (c) 2012 Erasmus MC
- * @license New BSD License
- * @version $id: AllSingleSurvey.php 203 2012-01-01t 12:51:32Z matijs $
- */
-
-/**
- * Put the highest value first
- *
- * @package Gems
- * @subpackage Events
- * @copyright Copyright (c) 2012 Erasmus MC
- * @license New BSD License
- * @since Class available since version 1.5.7
- */
-class Gems_Event_Survey_Display_AllSingleSurvey extends Gems_Registry_TargetAbstract implements Gems_Event_SurveyDisplayEventInterface
-{
- /**
- *
- * @var Zend_Translate
- */
- protected $translate;
-
- /**
- * Function that returns the snippets to use for this display.
- *
- * @param Gems_Tracker_Token $token The token to get the snippets for
- * @return array of Snippet names or nothing
- */
- public function getAnswerDisplaySnippets(Gems_Tracker_Token $token)
- {
- return 'SingleSurveyAnswersModelSnippet';
- }
-
- /**
- * A pretty name for use in dropdown selection boxes.
- *
- * @return string Name
- */
- public function getEventName()
- {
- return $this->translate->_('Show all stand alone surveys for this type');
- }
-}
Added: trunk/library/classes/Gems/Event/Survey/Display/AllSingleTrack.php
===================================================================
--- trunk/library/classes/Gems/Event/Survey/Display/AllSingleTrack.php (rev 0)
+++ trunk/library/classes/Gems/Event/Survey/Display/AllSingleTrack.php 2012-11-29 11:06:23 UTC (rev 1046)
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * Copyright (c) 2012, 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 Events
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @version $id: AllSingleSurvey.php 203 2012-01-01t 12:51:32Z matijs $
+ */
+
+/**
+ * Put the highest value first
+ *
+ * @package Gems
+ * @subpackage Events
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.5.7
+ */
+class Gems_Event_Survey_Display_AllSingleTrack extends Gems_Registry_TargetAbstract implements Gems_Event_SurveyDisplayEventInterface
+{
+ /**
+ *
+ * @var Zend_Translate
+ */
+ protected $translate;
+
+ /**
+ * Function that returns the snippets to use for this display.
+ *
+ * @param Gems_Tracker_Token $token The token to get the snippets for
+ * @return array of Snippet names or nothing
+ */
+ public function getAnswerDisplaySnippets(Gems_Tracker_Token $token)
+ {
+ return 'Tracker_Answers_SingleTrackAnswersModelSnippet';
+ }
+
+ /**
+ * A pretty name for use in dropdown selection boxes.
+ *
+ * @return string Name
+ */
+ public function getEventName()
+ {
+ return $this->translate->_('Show all tokens for this survey in this track type');
+ }
+}
Modified: trunk/library/classes/Gems/Event/Survey/Display/TokenOnly.php
===================================================================
--- trunk/library/classes/Gems/Event/Survey/Display/TokenOnly.php 2012-11-28 16:18:00 UTC (rev 1045)
+++ trunk/library/classes/Gems/Event/Survey/Display/TokenOnly.php 2012-11-29 11:06:23 UTC (rev 1046)
@@ -60,7 +60,7 @@
*/
public function getAnswerDisplaySnippets(Gems_Tracker_Token $token)
{
- return 'SingleTokenAnswerModelSnippet';
+ return 'Tracker_Answers_SingleTokenAnswerModelSnippet';
}
/**
Modified: trunk/library/classes/Gems/Event/Survey/Display/TrackOnly.php
===================================================================
--- trunk/library/classes/Gems/Event/Survey/Display/TrackOnly.php 2012-11-28 16:18:00 UTC (rev 1045)
+++ trunk/library/classes/Gems/Event/Survey/Display/TrackOnly.php 2012-11-29 11:06:23 UTC (rev 1046)
@@ -60,7 +60,7 @@
*/
public function getAnswerDisplaySnippets(Gems_Tracker_Token $token)
{
- return 'TrackAnswersModelSnippet';
+ return 'Tracker_Answers_TrackAnswersModelSnippet';
}
/**
Modified: trunk/library/classes/Gems/Snippets/SnippetLoader.php
===================================================================
--- trunk/library/classes/Gems/Snippets/SnippetLoader.php 2012-11-28 16:18:00 UTC (rev 1045)
+++ trunk/library/classes/Gems/Snippets/SnippetLoader.php 2012-11-29 11:06:23 UTC (rev 1046)
@@ -1,4 +1,5 @@
<?php
+
/**
* Copyright (c) 2011, Erasmus MC
* All rights reserved.
@@ -71,9 +72,6 @@
*/
public function __construct($container = null, $dirs = array())
{
- // Add tracker snippets directory
- $dirs['Gems_Tracker'] = realpath(__DIR__ . '/../..');
-
parent::__construct($container, $dirs);
$this->backup = new MUtil_Snippets_SnippetLoader($this);
Added: trunk/library/classes/Gems/Snippets/Tracker/Answers/SingleTokenAnswerModelSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/Tracker/Answers/SingleTokenAnswerModelSnippet.php (rev 0)
+++ trunk/library/classes/Gems/Snippets/Tracker/Answers/SingleTokenAnswerModelSnippet.php 2012-11-29 11:06:23 UTC (rev 1046)
@@ -0,0 +1,62 @@
+<?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 Tracker
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: SingleTokenAnswerModelSnippet.php 685 2012-05-16 15:11:59Z michieltcs $
+ */
+
+/**
+ * Displays answers from a single token to a survey.
+ *
+ * @package Gems
+ * @subpackage Tracker
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.5.7
+ */
+class Gems_Snippets_Tracker_Answers_SingleTokenAnswerModelSnippet extends Gems_Tracker_Snippets_AnswerModelSnippetGeneric
+{
+ /**
+ * Overrule to implement snippet specific filtering and sorting.
+ *
+ * @param MUtil_Model_ModelAbstract $model
+ */
+ protected function processFilterAndSort(MUtil_Model_ModelAbstract $model)
+ {
+ if ($this->request) {
+ $this->processSortOnly($model);
+
+ $model->setFilter(array('gto_id_token' => $this->token->getTokenId()));
+ }
+ }
+}
Added: trunk/library/classes/Gems/Snippets/Tracker/Answers/SingleTrackAnswersModelSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/Tracker/Answers/SingleTrackAnswersModelSnippet.php (rev 0)
+++ trunk/library/classes/Gems/Snippets/Tracker/Answers/SingleTrackAnswersModelSnippet.php 2012-11-29 11:06:23 UTC (rev 1046)
@@ -0,0 +1,80 @@
+<?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 Tracker
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: SingleSurveyModelSnippet.php 946 2012-09-19 13:08:21Z mennodekker $
+ */
+
+/**
+ * Show answers for all standalone surveys of this survey type
+ *
+ * @package Gems
+ * @subpackage Tracker
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.4
+ */
+class Gems_Snippets_Tracker_Answers_SingleTrackAnswersModelSnippet extends Gems_Tracker_Snippets_AnswerModelSnippetGeneric
+{
+ /**
+ * Use compact view and show all tokens of the same surveyId in
+ * one view. Property used by respondent export
+ *
+ * @var boolean
+ */
+ public $grouped = true;
+
+ /**
+ * Overrule to implement snippet specific filtering and sorting.
+ *
+ * @param MUtil_Model_ModelAbstract $model
+ */
+ protected function processFilterAndSort(MUtil_Model_ModelAbstract $model)
+ {
+ if ($this->request) {
+ $this->processSortOnly($model);
+
+ if ($this->grouped) {
+ $filter['gto_id_track'] = $this->token->getTrackId();
+ $filter['gto_id_respondent'] = $this->token->getRespondentId();
+ $filter['gto_id_organization'] = $this->token->getOrganizationId();
+ $filter['gto_id_survey'] = $this->token->getSurveyId();
+ } else {
+ $filter['gto_id_token'] = $this->token->getTokenId();
+ }
+
+ $model->setFilter($filter);
+ }
+ }
+}
Added: trunk/library/classes/Gems/Snippets/Tracker/Answers/SurveyAnswersModelSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/Tracker/Answers/SurveyAnswersModelSnippet.php (rev 0)
+++ trunk/library/classes/Gems/Snippets/Tracker/Answers/SurveyAnswersModelSnippet.php 2012-11-29 11:06:23 UTC (rev 1046)
@@ -0,0 +1,78 @@
+<?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 Tracker
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: SurveyAnswersModelSnippet.php 946 2012-09-19 13:08:21Z mennodekker $
+ */
+
+/**
+ * Show all tokens of a certain survey type
+ *
+ * @package Gems
+ * @subpackage Tracker
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.5.7
+ */
+class Gems_Snippets_Tracker_Answers_SurveyAnswersModelSnippet extends Gems_Tracker_Snippets_AnswerModelSnippetGeneric
+{
+ /**
+ * Use compact view and show all tokens of the same surveyId in
+ * one view. Property used by respondent export
+ *
+ * @var boolean
+ */
+ public $grouped = true;
+
+ /**
+ * Overrule to implement snippet specific filtering and sorting.
+ *
+ * @param MUtil_Model_ModelAbstract $model
+ */
+ protected function processFilterAndSort(MUtil_Model_ModelAbstract $model)
+ {
+ if ($this->request) {
+ $this->processSortOnly($model);
+
+ if ($this->grouped) {
+ $filter['gto_id_respondent'] = $this->token->getRespondentId();
+ $filter['gto_id_organization'] = $this->token->getOrganizationId();
+ $filter['gto_id_survey'] = $this->token->getSurveyId();
+ } else {
+ $filter['gto_id_token'] = $this->token->getTokenId();
+ }
+
+ $model->setFilter($filter);
+ }
+ }
+}
Added: trunk/library/classes/Gems/Snippets/Tracker/Answers/TrackAnswersModelSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/Tracker/Answers/TrackAnswersModelSnippet.php (rev 0)
+++ trunk/library/classes/Gems/Snippets/Tracker/Answers/TrackAnswersModelSnippet.php 2012-11-29 11:06:23 UTC (rev 1046)
@@ -0,0 +1,77 @@
+<?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 Tracker
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: TrackAnswersModelSnippet.php 946 2012-09-19 13:08:21Z mennodekker $
+ */
+
+/**
+ * Show all answers for one survey within a track
+ *
+ * @package Gems
+ * @subpackage Tracker
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.4
+ */
+class Gems_Snippets_Tracker_Answers_TrackAnswersModelSnippet extends Gems_Tracker_Snippets_AnswerModelSnippetGeneric
+{
+ /**
+ * Use compact view and show all tokens of the same surveyId in
+ * one view. Property used by respondent export
+ *
+ * @var boolean
+ */
+ public $grouped = true;
+
+ /**
+ * Overrule to implement snippet specific filtering and sorting.
+ *
+ * @param MUtil_Model_ModelAbstract $model
+ */
+ protected function processFilterAndSort(MUtil_Model_ModelAbstract $model)
+ {
+ if ($this->request) {
+ $this->processSortOnly($model);
+
+ if ($this->grouped) {
+ $filter['gto_id_respondent_track'] = $this->token->getRespondentTrackId();
+ $filter['gto_id_survey'] = $this->token->getSurveyId();
+ } else {
+ $filter['gto_id_token'] = $this->token->getTokenId();
+ }
+
+ $model->setFilter($filter);
+ }
+ }
+}
Modified: trunk/library/classes/Gems/Tracker/Engine/SingleSurveyEngine.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Engine/SingleSurveyEngine.php 2012-11-28 16:18:00 UTC (rev 1045)
+++ trunk/library/classes/Gems/Tracker/Engine/SingleSurveyEngine.php 2012-11-29 11:06:23 UTC (rev 1046)
@@ -104,7 +104,7 @@
*/
public function getAnswerSnippetNames()
{
- return array('SingleTokenAnswerModelSnippet');
+ return array('Tracker_Answers_SingleTokenAnswerModelSnippet');
}
/**
Modified: trunk/library/classes/Gems/Tracker/Engine/StepEngineAbstract.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Engine/StepEngineAbstract.php 2012-11-28 16:18:00 UTC (rev 1045)
+++ trunk/library/classes/Gems/Tracker/Engine/StepEngineAbstract.php 2012-11-29 11:06:23 UTC (rev 1046)
@@ -339,7 +339,7 @@
*/
public function getAnswerSnippetNames()
{
- return array('TrackAnswersModelSnippet');
+ return array('Tracker_Answers_TrackAnswersModelSnippet');
}
/**
Deleted: trunk/library/classes/Gems/Tracker/Snippets/SingleSurveyAnswersModelSnippet.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Snippets/SingleSurveyAnswersModelSnippet.php 2012-11-28 16:18:00 UTC (rev 1045)
+++ trunk/library/classes/Gems/Tracker/Snippets/SingleSurveyAnswersModelSnippet.php 2012-11-29 11:06:23 UTC (rev 1046)
@@ -1,80 +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.
- *
- *
- * @package Gems
- * @subpackage Tracker
- * @author Matijs de Jong <mj...@ma...>
- * @copyright Copyright (c) 2011 Erasmus MC
- * @license New BSD License
- * @version $Id: SingleSurveyModelSnippet.php 946 2012-09-19 13:08:21Z mennodekker $
- */
-
-/**
- * Show answers for all standalone surveys of this survey type
- *
- * @package Gems
- * @subpackage Tracker
- * @copyright Copyright (c) 2011 Erasmus MC
- * @license New BSD License
- * @since Class available since version 1.4
- */
-class Gems_Tracker_Snippets_SingleSurveyAnswersModelSnippet extends Gems_Tracker_Snippets_AnswerModelSnippetGeneric
-{
- /**
- * Use compact view and show all tokens of the same surveyId in
- * one view. Property used by respondent export
- *
- * @var boolean
- */
- public $grouped = true;
-
- /**
- * Overrule to implement snippet specific filtering and sorting.
- *
- * @param MUtil_Model_ModelAbstract $model
- */
- protected function processFilterAndSort(MUtil_Model_ModelAbstract $model)
- {
- if ($this->request) {
- $this->processSortOnly($model);
-
- if ($this->grouped) {
- $filter['gto_id_track'] = $this->token->getTrackId();
- $filter['gto_id_respondent'] = $this->token->getRespondentId();
- $filter['gto_id_organization'] = $this->token->getOrganizationId();
- $filter['gto_id_survey'] = $this->token->getSurveyId();
- } else {
- $filter['gto_id_token'] = $this->token->getTokenId();
- }
-
- $model->setFilter($filter);
- }
- }
-}
Deleted: trunk/library/classes/Gems/Tracker/Snippets/SingleTokenAnswerModelSnippet.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Snippets/SingleTokenAnswerModelSnippet.php 2012-11-28 16:18:00 UTC (rev 1045)
+++ trunk/library/classes/Gems/Tracker/Snippets/SingleTokenAnswerModelSnippet.php 2012-11-29 11:06:23 UTC (rev 1046)
@@ -1,62 +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.
- *
- *
- * @package Gems
- * @subpackage Tracker
- * @author Matijs de Jong <mj...@ma...>
- * @copyright Copyright (c) 2011 Erasmus MC
- * @license New BSD License
- * @version $Id: SingleTokenAnswerModelSnippet.php 685 2012-05-16 15:11:59Z michieltcs $
- */
-
-/**
- * Displays answers to a survey.
- *
- * @package Gems
- * @subpackage Tracker
- * @copyright Copyright (c) 2011 Erasmus MC
- * @license New BSD License
- * @since Class available since version 1.5.7
- */
-class Gems_Tracker_Snippets_SingleTokenAnswerModelSnippet extends Gems_Tracker_Snippets_AnswerModelSnippetGeneric
-{
- /**
- * Overrule to implement snippet specific filtering and sorting.
- *
- * @param MUtil_Model_ModelAbstract $model
- */
- protected function processFilterAndSort(MUtil_Model_ModelAbstract $model)
- {
- if ($this->request) {
- $this->processSortOnly($model);
-
- $model->setFilter(array('gto_id_token' => $this->token->getTokenId()));
- }
- }
-}
Deleted: trunk/library/classes/Gems/Tracker/Snippets/SurveyAnswersModelSnippet.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Snippets/SurveyAnswersModelSnippet.php 2012-11-28 16:18:00 UTC (rev 1045)
+++ trunk/library/classes/Gems/Tracker/Snippets/SurveyAnswersModelSnippet.php 2012-11-29 11:06:23 UTC (rev 1046)
@@ -1,79 +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.
- *
- *
- * @package Gems
- * @subpackage Tracker
- * @author Matijs de Jong <mj...@ma...>
- * @copyright Copyright (c) 2011 Erasmus MC
- * @license New BSD License
- * @version $Id: SurveyAnswersModelSnippet.php 946 2012-09-19 13:08:21Z mennodekker $
- */
-
-/**
- * Show all tokens of a certain survey type
- *
- * @package Gems
- * @subpackage Tracker
- * @copyright Copyright (c) 2011 Erasmus MC
- * @license New BSD License
- * @since Class available since version 1.5.7
- */
-class Gems_Tracker_Snippets_SurveyAnswersModelSnippet extends Gems_Tracker_Snippets_AnswerModelSnippetGeneric
-{
- /**
- * Use compact view and show all tokens of the same surveyId in
- * one view. Property used by respondent export
- *
- * @var boolean
- */
- public $grouped = true;
-
- /**
- * Overrule to implement snippet specific filtering and sorting.
- *
- * @param MUtil_Model_ModelAbstract $model
- */
- protected function processFilterAndSort(MUtil_Model_ModelAbstract $model)
- {
- if ($this->request) {
- $this->processSortOnly($model);
-
- if ($this->grouped) {
- $filter['gto_id_respondent'] = $this->token->getRespondentId();
- $filter['gto_id_organization'] = $this->token->getOrganizationId();
- $filter['gto_id_survey'] = $this->token->getSurveyId();
- } else {
- $filter['gto_id_token'] = $this->token->getTokenId();
- }
-
- $model->setFilter($filter);
- }
- }
-}
Deleted: trunk/library/classes/Gems/Tracker/Snippets/TrackAnswersModelSnippet.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Snippets/TrackAnswersModelSnippet.php 2012-11-28 16:18:00 UTC (rev 1045)
+++ trunk/library/classes/Gems/Tracker/Snippets/TrackAnswersModelSnippet.php 2012-11-29 11:06:23 UTC (rev 1046)
@@ -1,78 +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.
- *
- *
- * @package Gems
- * @subpackage Tracker
- * @author Matijs de Jong <mj...@ma...>
- * @copyright Copyright (c) 2011 Erasmus MC
- * @license New BSD License
- * @version $Id: TrackAnswersModelSnippet.php 946 2012-09-19 13:08:21Z mennodekker $
- */
-
-/**
- * Class description of TrackAnswersModelSnippet
- *
- * @package Gems
- * @subpackage Tracker
- * @copyright Copyright (c) 2011 Erasmus MC
- * @license New BSD License
- * @since Class available since version 1.4
- */
-class Gems_Tracker_Snippets_TrackAnswersModelSnippet extends Gems_Tracker_Snippets_AnswerModelSnippetGeneric
-{
- /**
- * Use compact view and show all tokens of the same surveyId in
- * one view. Property used by respondent export
- *
- * @var boolean
- */
- public $grouped = true;
-
- /**
- * Overrule to implement snippet specific filtering and sorting.
- *
- * @param MUtil_Model_ModelAbstract $model
- */
- protected function processFilterAndSort(MUtil_Model_ModelAbstract $model)
- {
- if ($this->request) {
- $this->processSortOnly($model);
-
- if ($this->grouped) {
- $filter['gto_id_respondent_track'] = $this->token->getRespondentTrackId();
- $filter['gto_id_survey'] = $this->token->getSurveyId();
- } else {
- $filter['gto_id_token'] = $this->token->getTokenId();
- }
-
- $model->setFilter($filter);
- }
- }
-}
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2012-11-28 16:18:00 UTC (rev 1045)
+++ trunk/library/languages/default-en.po 2012-11-29 11:06:23 UTC (rev 1046)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-28 16:25+0100\n"
+"POT-Creation-Date: 2012-11-29 12:04+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -3439,9 +3439,9 @@
msgid "Show all answers for this survey type"
msgstr "Show all answers for this survey type"
-#: classes/Gems/Event/Survey/Display/AllSingleSurvey.php:73
-msgid "Show all stand alone surveys for this type"
-msgstr "Show all stand alone surveys for this type"
+#: classes/Gems/Event/Survey/Display/AllSingleTrack.php:73
+msgid "Show all tokens for this survey in this track type"
+msgstr "Show all tokens for this survey in this track type"
#: classes/Gems/Event/Survey/Display/ByValue.php:87
msgid "Show the highest answer first."
@@ -5176,6 +5176,9 @@
msgstr[1] ""
"After this survey there are another %d surveys we would like you to answer."
+#~ msgid "Show all stand alone surveys for this type"
+#~ msgstr "Show all stand alone surveys for this type"
+
#~ msgid "Gems project path"
#~ msgstr "Gems project path"
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2012-11-28 16:18:00 UTC (rev 1045)
+++ trunk/library/languages/default-nl.po 2012-11-29 11:06:23 UTC (rev 1046)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-28 16:25+0100\n"
+"POT-Creation-Date: 2012-11-29 12:04+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -3466,9 +3466,9 @@
msgid "Show all answers for this survey type"
msgstr "Toon alle antwoorden voor deze vragenlijst"
-#: classes/Gems/Event/Survey/Display/AllSingleSurvey.php:73
-msgid "Show all stand alone surveys for this type"
-msgstr "Toon alle antwoorden voor deze losse vragenlijst"
+#: classes/Gems/Event/Survey/Display/AllSingleTrack.php:73
+msgid "Show all tokens for this survey in this track type"
+msgstr "Toon alle antwoorden voor deze vragenlijst in dit traject type"
#: classes/Gems/Event/Survey/Display/ByValue.php:87
msgid "Show the highest answer first."
@@ -5232,6 +5232,9 @@
msgstr[0] "Na deze vragenlijst hebben we nog één andere vragenlijst voor u."
msgstr[1] "Na deze vragenlijst hebben we nog %d andere vragenlijsten voor u."
+#~ msgid "Show all stand alone surveys for this type"
+#~ msgstr "Toon alle antwoorden voor deze losse vragenlijst"
+
#~ msgid "Gems project path"
#~ msgstr "Gems project folder"
Modified: trunk/library/snippets/AnswerModelSnippet.php
===================================================================
--- trunk/library/snippets/AnswerModelSnippet.php 2012-11-28 16:18:00 UTC (rev 1045)
+++ trunk/library/snippets/AnswerModelSnippet.php 2012-11-29 11:06:23 UTC (rev 1046)
@@ -45,6 +45,6 @@
* @license New BSD License
* @since Class available since version 1.4
*/
-class AnswerModelSnippet extends Gems_Tracker_Snippets_SingleTokenAnswerModelSnippet
+class AnswerModelSnippet extends Gems_Snippets_Tracker_Answers_SingleTokenAnswerModelSnippet
{
}
Modified: trunk/library/snippets/TrackAnswersModelSnippet.php
===================================================================
--- trunk/library/snippets/TrackAnswersModelSnippet.php 2012-11-28 16:18:00 UTC (rev 1045)
+++ trunk/library/snippets/TrackAnswersModelSnippet.php 2012-11-29 11:06:23 UTC (rev 1046)
@@ -46,6 +46,6 @@
* @license New BSD License
* @since Class available since version 1.4
*/
-class TrackAnswersModelSnippet extends Gems_Tracker_Snippets_TrackAnswersModelSnippet
+class TrackAnswersModelSnippet extends Gems_Snippets_Tracker_Answers_TrackAnswersModelSnippet
{
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-28 16:18:12
|
Revision: 1045
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1045&view=rev
Author: matijsdejong
Date: 2012-11-28 16:18:00 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
New answer display filters that show all of survey for respondent or all single survey for respondent
Extended SnippetLoader.php to search in Tracker/Snippets directory as well
Modified Paths:
--------------
trunk/library/classes/Gems/Event/Survey/Display/ByValue.php
trunk/library/classes/Gems/Event/Survey/Display/Reverse.php
trunk/library/classes/Gems/Event/Survey/Display/YesOnTop.php
trunk/library/classes/Gems/Snippets/SnippetLoader.php
trunk/library/classes/Gems/Tracker/Engine/SingleSurveyEngine.php
trunk/library/languages/default-en.mo
trunk/library/languages/default-en.po
trunk/library/languages/default-nl.mo
trunk/library/languages/default-nl.po
trunk/library/snippets/AnswerModelSnippet.php
trunk/library/snippets/TrackAnswersModelSnippet.php
Added Paths:
-----------
trunk/library/classes/Gems/Event/Survey/Display/AllOfSurvey.php
trunk/library/classes/Gems/Event/Survey/Display/AllSingleSurvey.php
trunk/library/classes/Gems/Event/Survey/Display/TokenOnly.php
trunk/library/classes/Gems/Event/Survey/Display/TrackOnly.php
trunk/library/classes/Gems/Tracker/Snippets/SingleSurveyAnswersModelSnippet.php
trunk/library/classes/Gems/Tracker/Snippets/SingleTokenAnswerModelSnippet.php
trunk/library/classes/Gems/Tracker/Snippets/SurveyAnswersModelSnippet.php
trunk/library/classes/Gems/Tracker/Snippets/TrackAnswersModelSnippet.php
Added: trunk/library/classes/Gems/Event/Survey/Display/AllOfSurvey.php
===================================================================
--- trunk/library/classes/Gems/Event/Survey/Display/AllOfSurvey.php (rev 0)
+++ trunk/library/classes/Gems/Event/Survey/Display/AllOfSurvey.php 2012-11-28 16:18:00 UTC (rev 1045)
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * Copyright (c) 2012, 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 Events
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @version $id: AllOfSurvey.php 203 2012-01-01t 12:51:32Z matijs $
+ */
+
+/**
+ * Put the highest value first
+ *
+ * @package Gems
+ * @subpackage Events
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.5.7
+ */
+class Gems_Event_Survey_Display_AllOfSurvey extends Gems_Registry_TargetAbstract implements Gems_Event_SurveyDisplayEventInterface
+{
+ /**
+ *
+ * @var Zend_Translate
+ */
+ protected $translate;
+
+ /**
+ * Function that returns the snippets to use for this display.
+ *
+ * @param Gems_Tracker_Token $token The token to get the snippets for
+ * @return array of Snippet names or nothing
+ */
+ public function getAnswerDisplaySnippets(Gems_Tracker_Token $token)
+ {
+ return 'SurveyAnswersModelSnippet';
+ }
+
+ /**
+ * A pretty name for use in dropdown selection boxes.
+ *
+ * @return string Name
+ */
+ public function getEventName()
+ {
+ return $this->translate->_('Show all answers for this survey type');
+ }
+}
Added: trunk/library/classes/Gems/Event/Survey/Display/AllSingleSurvey.php
===================================================================
--- trunk/library/classes/Gems/Event/Survey/Display/AllSingleSurvey.php (rev 0)
+++ trunk/library/classes/Gems/Event/Survey/Display/AllSingleSurvey.php 2012-11-28 16:18:00 UTC (rev 1045)
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * Copyright (c) 2012, 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 Events
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @version $id: AllSingleSurvey.php 203 2012-01-01t 12:51:32Z matijs $
+ */
+
+/**
+ * Put the highest value first
+ *
+ * @package Gems
+ * @subpackage Events
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.5.7
+ */
+class Gems_Event_Survey_Display_AllSingleSurvey extends Gems_Registry_TargetAbstract implements Gems_Event_SurveyDisplayEventInterface
+{
+ /**
+ *
+ * @var Zend_Translate
+ */
+ protected $translate;
+
+ /**
+ * Function that returns the snippets to use for this display.
+ *
+ * @param Gems_Tracker_Token $token The token to get the snippets for
+ * @return array of Snippet names or nothing
+ */
+ public function getAnswerDisplaySnippets(Gems_Tracker_Token $token)
+ {
+ return 'SingleSurveyAnswersModelSnippet';
+ }
+
+ /**
+ * A pretty name for use in dropdown selection boxes.
+ *
+ * @return string Name
+ */
+ public function getEventName()
+ {
+ return $this->translate->_('Show all stand alone surveys for this type');
+ }
+}
Modified: trunk/library/classes/Gems/Event/Survey/Display/ByValue.php
===================================================================
--- trunk/library/classes/Gems/Event/Survey/Display/ByValue.php 2012-11-27 11:13:04 UTC (rev 1044)
+++ trunk/library/classes/Gems/Event/Survey/Display/ByValue.php 2012-11-28 16:18:00 UTC (rev 1045)
@@ -32,7 +32,7 @@
* @author Matijs de Jong <mj...@ma...>
* @copyright Copyright (c) 2012 Erasmus MC
* @license New BSD License
- * @version $id: OnlyAnswered.php 203 2012-01-01t 12:51:32Z matijs $
+ * @version $id: ByValue.php 203 2012-01-01t 12:51:32Z matijs $
*/
/**
Modified: trunk/library/classes/Gems/Event/Survey/Display/Reverse.php
===================================================================
--- trunk/library/classes/Gems/Event/Survey/Display/Reverse.php 2012-11-27 11:13:04 UTC (rev 1044)
+++ trunk/library/classes/Gems/Event/Survey/Display/Reverse.php 2012-11-28 16:18:00 UTC (rev 1045)
@@ -32,7 +32,7 @@
* @author Matijs de Jong <mj...@ma...>
* @copyright Copyright (c) 2012 Erasmus MC
* @license New BSD License
- * @version $id: OnlyAnswered.php 203 2012-01-01t 12:51:32Z matijs $
+ * @version $id: Reverse.php 203 2012-01-01t 12:51:32Z matijs $
*/
/**
Added: trunk/library/classes/Gems/Event/Survey/Display/TokenOnly.php
===================================================================
--- trunk/library/classes/Gems/Event/Survey/Display/TokenOnly.php (rev 0)
+++ trunk/library/classes/Gems/Event/Survey/Display/TokenOnly.php 2012-11-28 16:18:00 UTC (rev 1045)
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * Copyright (c) 2012, 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 Events
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @version $id: TokenOnly.php 203 2012-01-01t 12:51:32Z matijs $
+ */
+
+/**
+ * Put the highest value first
+ *
+ * @package Gems
+ * @subpackage Events
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.5.7
+ */
+class Gems_Event_Survey_Display_TokenOnly extends Gems_Registry_TargetAbstract implements Gems_Event_SurveyDisplayEventInterface
+{
+ /**
+ *
+ * @var Zend_Translate
+ */
+ protected $translate;
+
+ /**
+ * Function that returns the snippets to use for this display.
+ *
+ * @param Gems_Tracker_Token $token The token to get the snippets for
+ * @return array of Snippet names or nothing
+ */
+ public function getAnswerDisplaySnippets(Gems_Tracker_Token $token)
+ {
+ return 'SingleTokenAnswerModelSnippet';
+ }
+
+ /**
+ * A pretty name for use in dropdown selection boxes.
+ *
+ * @return string Name
+ */
+ public function getEventName()
+ {
+ return $this->translate->_('Show answers for this token only');
+ }
+}
Added: trunk/library/classes/Gems/Event/Survey/Display/TrackOnly.php
===================================================================
--- trunk/library/classes/Gems/Event/Survey/Display/TrackOnly.php (rev 0)
+++ trunk/library/classes/Gems/Event/Survey/Display/TrackOnly.php 2012-11-28 16:18:00 UTC (rev 1045)
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * Copyright (c) 2012, 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 Events
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @version $id: TrackOnly.php 203 2012-01-01t 12:51:32Z matijs $
+ */
+
+/**
+ * Put the highest value first
+ *
+ * @package Gems
+ * @subpackage Events
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.5.7
+ */
+class Gems_Event_Survey_Display_TrackOnly extends Gems_Registry_TargetAbstract implements Gems_Event_SurveyDisplayEventInterface
+{
+ /**
+ *
+ * @var Zend_Translate
+ */
+ protected $translate;
+
+ /**
+ * Function that returns the snippets to use for this display.
+ *
+ * @param Gems_Tracker_Token $token The token to get the snippets for
+ * @return array of Snippet names or nothing
+ */
+ public function getAnswerDisplaySnippets(Gems_Tracker_Token $token)
+ {
+ return 'TrackAnswersModelSnippet';
+ }
+
+ /**
+ * A pretty name for use in dropdown selection boxes.
+ *
+ * @return string Name
+ */
+ public function getEventName()
+ {
+ return $this->translate->_('Show all tokens for this survey in the track');
+ }
+}
Modified: trunk/library/classes/Gems/Event/Survey/Display/YesOnTop.php
===================================================================
--- trunk/library/classes/Gems/Event/Survey/Display/YesOnTop.php 2012-11-27 11:13:04 UTC (rev 1044)
+++ trunk/library/classes/Gems/Event/Survey/Display/YesOnTop.php 2012-11-28 16:18:00 UTC (rev 1045)
@@ -32,7 +32,7 @@
* @author Matijs de Jong <mj...@ma...>
* @copyright Copyright (c) 2012 Erasmus MC
* @license New BSD License
- * @version $id: OnlyAnswered.php 203 2012-01-01t 12:51:32Z matijs $
+ * @version $id: YesOnTop.php 203 2012-01-01t 12:51:32Z matijs $
*/
/**
Modified: trunk/library/classes/Gems/Snippets/SnippetLoader.php
===================================================================
--- trunk/library/classes/Gems/Snippets/SnippetLoader.php 2012-11-27 11:13:04 UTC (rev 1044)
+++ trunk/library/classes/Gems/Snippets/SnippetLoader.php 2012-11-28 16:18:00 UTC (rev 1045)
@@ -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
@@ -24,7 +24,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.
- *
+ *
* Gems specific version of the snippet loader
*
* @package Gems
@@ -49,6 +49,11 @@
*/
class Gems_Snippets_SnippetLoader extends Gems_Loader_TargetLoaderAbstract implements MUtil_Snippets_SnippetLoaderInterface
{
+ /**
+ * Allows sub classes of Gems_Loader_LoaderAbstract to specify the subdirectory where to look for.
+ *
+ * @var string $cascade An optional subdirectory where this subclass always loads from.
+ */
protected $cascade = 'Snippets';
protected $loader;
@@ -64,8 +69,13 @@
* @param mixed $container A container acting as source for MUtil_Registry_Source
* @param array $dirs The directories where to look for requested classes
*/
- public function __construct($container = null, $dirs = array()) {
+ public function __construct($container = null, $dirs = array())
+ {
+ // Add tracker snippets directory
+ $dirs['Gems_Tracker'] = realpath(__DIR__ . '/../..');
+
parent::__construct($container, $dirs);
+
$this->backup = new MUtil_Snippets_SnippetLoader($this);
$this->addDirectory(GEMS_LIBRARY_DIR . '/classes/MUtil/Snippets/Standard');
}
Modified: trunk/library/classes/Gems/Tracker/Engine/SingleSurveyEngine.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Engine/SingleSurveyEngine.php 2012-11-27 11:13:04 UTC (rev 1044)
+++ trunk/library/classes/Gems/Tracker/Engine/SingleSurveyEngine.php 2012-11-28 16:18:00 UTC (rev 1045)
@@ -104,7 +104,7 @@
*/
public function getAnswerSnippetNames()
{
- return array('AnswerModelSnippet');
+ return array('SingleTokenAnswerModelSnippet');
}
/**
Added: trunk/library/classes/Gems/Tracker/Snippets/SingleSurveyAnswersModelSnippet.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Snippets/SingleSurveyAnswersModelSnippet.php (rev 0)
+++ trunk/library/classes/Gems/Tracker/Snippets/SingleSurveyAnswersModelSnippet.php 2012-11-28 16:18:00 UTC (rev 1045)
@@ -0,0 +1,80 @@
+<?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 Tracker
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: SingleSurveyModelSnippet.php 946 2012-09-19 13:08:21Z mennodekker $
+ */
+
+/**
+ * Show answers for all standalone surveys of this survey type
+ *
+ * @package Gems
+ * @subpackage Tracker
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.4
+ */
+class Gems_Tracker_Snippets_SingleSurveyAnswersModelSnippet extends Gems_Tracker_Snippets_AnswerModelSnippetGeneric
+{
+ /**
+ * Use compact view and show all tokens of the same surveyId in
+ * one view. Property used by respondent export
+ *
+ * @var boolean
+ */
+ public $grouped = true;
+
+ /**
+ * Overrule to implement snippet specific filtering and sorting.
+ *
+ * @param MUtil_Model_ModelAbstract $model
+ */
+ protected function processFilterAndSort(MUtil_Model_ModelAbstract $model)
+ {
+ if ($this->request) {
+ $this->processSortOnly($model);
+
+ if ($this->grouped) {
+ $filter['gto_id_track'] = $this->token->getTrackId();
+ $filter['gto_id_respondent'] = $this->token->getRespondentId();
+ $filter['gto_id_organization'] = $this->token->getOrganizationId();
+ $filter['gto_id_survey'] = $this->token->getSurveyId();
+ } else {
+ $filter['gto_id_token'] = $this->token->getTokenId();
+ }
+
+ $model->setFilter($filter);
+ }
+ }
+}
Added: trunk/library/classes/Gems/Tracker/Snippets/SingleTokenAnswerModelSnippet.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Snippets/SingleTokenAnswerModelSnippet.php (rev 0)
+++ trunk/library/classes/Gems/Tracker/Snippets/SingleTokenAnswerModelSnippet.php 2012-11-28 16:18:00 UTC (rev 1045)
@@ -0,0 +1,62 @@
+<?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 Tracker
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: SingleTokenAnswerModelSnippet.php 685 2012-05-16 15:11:59Z michieltcs $
+ */
+
+/**
+ * Displays answers to a survey.
+ *
+ * @package Gems
+ * @subpackage Tracker
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.5.7
+ */
+class Gems_Tracker_Snippets_SingleTokenAnswerModelSnippet extends Gems_Tracker_Snippets_AnswerModelSnippetGeneric
+{
+ /**
+ * Overrule to implement snippet specific filtering and sorting.
+ *
+ * @param MUtil_Model_ModelAbstract $model
+ */
+ protected function processFilterAndSort(MUtil_Model_ModelAbstract $model)
+ {
+ if ($this->request) {
+ $this->processSortOnly($model);
+
+ $model->setFilter(array('gto_id_token' => $this->token->getTokenId()));
+ }
+ }
+}
Added: trunk/library/classes/Gems/Tracker/Snippets/SurveyAnswersModelSnippet.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Snippets/SurveyAnswersModelSnippet.php (rev 0)
+++ trunk/library/classes/Gems/Tracker/Snippets/SurveyAnswersModelSnippet.php 2012-11-28 16:18:00 UTC (rev 1045)
@@ -0,0 +1,79 @@
+<?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 Tracker
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: SurveyAnswersModelSnippet.php 946 2012-09-19 13:08:21Z mennodekker $
+ */
+
+/**
+ * Show all tokens of a certain survey type
+ *
+ * @package Gems
+ * @subpackage Tracker
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.5.7
+ */
+class Gems_Tracker_Snippets_SurveyAnswersModelSnippet extends Gems_Tracker_Snippets_AnswerModelSnippetGeneric
+{
+ /**
+ * Use compact view and show all tokens of the same surveyId in
+ * one view. Property used by respondent export
+ *
+ * @var boolean
+ */
+ public $grouped = true;
+
+ /**
+ * Overrule to implement snippet specific filtering and sorting.
+ *
+ * @param MUtil_Model_ModelAbstract $model
+ */
+ protected function processFilterAndSort(MUtil_Model_ModelAbstract $model)
+ {
+ if ($this->request) {
+ $this->processSortOnly($model);
+
+ if ($this->grouped) {
+ $filter['gto_id_respondent'] = $this->token->getRespondentId();
+ $filter['gto_id_organization'] = $this->token->getOrganizationId();
+ $filter['gto_id_survey'] = $this->token->getSurveyId();
+ } else {
+ $filter['gto_id_token'] = $this->token->getTokenId();
+ }
+
+ $model->setFilter($filter);
+ }
+ }
+}
Added: trunk/library/classes/Gems/Tracker/Snippets/TrackAnswersModelSnippet.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Snippets/TrackAnswersModelSnippet.php (rev 0)
+++ trunk/library/classes/Gems/Tracker/Snippets/TrackAnswersModelSnippet.php 2012-11-28 16:18:00 UTC (rev 1045)
@@ -0,0 +1,78 @@
+<?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 Tracker
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: TrackAnswersModelSnippet.php 946 2012-09-19 13:08:21Z mennodekker $
+ */
+
+/**
+ * Class description of TrackAnswersModelSnippet
+ *
+ * @package Gems
+ * @subpackage Tracker
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.4
+ */
+class Gems_Tracker_Snippets_TrackAnswersModelSnippet extends Gems_Tracker_Snippets_AnswerModelSnippetGeneric
+{
+ /**
+ * Use compact view and show all tokens of the same surveyId in
+ * one view. Property used by respondent export
+ *
+ * @var boolean
+ */
+ public $grouped = true;
+
+ /**
+ * Overrule to implement snippet specific filtering and sorting.
+ *
+ * @param MUtil_Model_ModelAbstract $model
+ */
+ protected function processFilterAndSort(MUtil_Model_ModelAbstract $model)
+ {
+ if ($this->request) {
+ $this->processSortOnly($model);
+
+ if ($this->grouped) {
+ $filter['gto_id_respondent_track'] = $this->token->getRespondentTrackId();
+ $filter['gto_id_survey'] = $this->token->getSurveyId();
+ } else {
+ $filter['gto_id_token'] = $this->token->getTokenId();
+ }
+
+ $model->setFilter($filter);
+ }
+ }
+}
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2012-11-27 11:13:04 UTC (rev 1044)
+++ trunk/library/languages/default-en.po 2012-11-28 16:18:00 UTC (rev 1045)
@@ -2,9 +2,9 @@
msgstr ""
"Project-Id-Version: GemsTracker EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 12:11+0100\n"
+"POT-Creation-Date: 2012-11-28 16:25+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"
"Language: en_GB\n"
"MIME-Version: 1.0\n"
@@ -1816,7 +1816,7 @@
msgstr "Can the organization be used?"
#: classes/Gems/Default/OrganizationAction.php:152
-#: classes/Gems/User/Form/LoginForm.php:151 views/scripts/index/login.phtml:7
+#: classes/Gems/User/Form/LoginForm.php:151
msgid "Login"
msgstr "Login"
@@ -3435,6 +3435,14 @@
msgid "Previous Version Answers Lookup"
msgstr "Previous Version Answers Lookup"
+#: classes/Gems/Event/Survey/Display/AllOfSurvey.php:73
+msgid "Show all answers for this survey type"
+msgstr "Show all answers for this survey type"
+
+#: classes/Gems/Event/Survey/Display/AllSingleSurvey.php:73
+msgid "Show all stand alone surveys for this type"
+msgstr "Show all stand alone surveys for this type"
+
#: classes/Gems/Event/Survey/Display/ByValue.php:87
msgid "Show the highest answer first."
msgstr "Show the highest answer first."
@@ -3447,6 +3455,14 @@
msgid "Reverse the question order."
msgstr "Reverse the question order."
+#: classes/Gems/Event/Survey/Display/TokenOnly.php:73
+msgid "Show answers for this token only"
+msgstr "Show answers for this token only"
+
+#: classes/Gems/Event/Survey/Display/TrackOnly.php:73
+msgid "Show all tokens for this survey in the track"
+msgstr "Show all tokens for this survey in the track"
+
#: classes/Gems/Event/Survey/Display/YesOnTop.php:102
msgid "Yes answers on top."
msgstr "Yes answers on top."
@@ -3555,7 +3571,6 @@
msgstr "Clean cache"
#: classes/Gems/Menu/MenuAbstract.php:421
-#: views/scripts/index/resetpassword.phtml:1
msgid "Reset password"
msgstr "Reset password"
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2012-11-27 11:13:04 UTC (rev 1044)
+++ trunk/library/languages/default-nl.po 2012-11-28 16:18:00 UTC (rev 1045)
@@ -2,9 +2,9 @@
msgstr ""
"Project-Id-Version: GemsTracker NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 12:09+0100\n"
+"POT-Creation-Date: 2012-11-28 16:25+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"
"Language: nl_NL\n"
"MIME-Version: 1.0\n"
@@ -1826,7 +1826,7 @@
msgstr "Is de organisatie in gebruik?"
#: classes/Gems/Default/OrganizationAction.php:152
-#: classes/Gems/User/Form/LoginForm.php:151 views/scripts/index/login.phtml:7
+#: classes/Gems/User/Form/LoginForm.php:151
msgid "Login"
msgstr "Inloggen"
@@ -3462,6 +3462,14 @@
msgid "Previous Version Answers Lookup"
msgstr "Antwoorden overnemen van vorige keer"
+#: classes/Gems/Event/Survey/Display/AllOfSurvey.php:73
+msgid "Show all answers for this survey type"
+msgstr "Toon alle antwoorden voor deze vragenlijst"
+
+#: classes/Gems/Event/Survey/Display/AllSingleSurvey.php:73
+msgid "Show all stand alone surveys for this type"
+msgstr "Toon alle antwoorden voor deze losse vragenlijst"
+
#: classes/Gems/Event/Survey/Display/ByValue.php:87
msgid "Show the highest answer first."
msgstr "Toon het hoogste antwoord eerst."
@@ -3474,6 +3482,14 @@
msgid "Reverse the question order."
msgstr "Draai de vraag volgorde om."
+#: classes/Gems/Event/Survey/Display/TokenOnly.php:73
+msgid "Show answers for this token only"
+msgstr "Toon alleen de antwoorden voor dit kenmerk"
+
+#: classes/Gems/Event/Survey/Display/TrackOnly.php:73
+msgid "Show all tokens for this survey in the track"
+msgstr "Toon alle antwoorden voor deze vragenlijst in dit traject"
+
#: classes/Gems/Event/Survey/Display/YesOnTop.php:102
msgid "Yes answers on top."
msgstr "Ja antwoorden bovenaan."
@@ -3583,7 +3599,6 @@
msgstr "Cache opruimen"
#: classes/Gems/Menu/MenuAbstract.php:421
-#: views/scripts/index/resetpassword.phtml:1
msgid "Reset password"
msgstr "Reset wachtwoord"
Modified: trunk/library/snippets/AnswerModelSnippet.php
===================================================================
--- trunk/library/snippets/AnswerModelSnippet.php 2012-11-27 11:13:04 UTC (rev 1044)
+++ trunk/library/snippets/AnswerModelSnippet.php 2012-11-28 16:18:00 UTC (rev 1045)
@@ -38,25 +38,13 @@
/**
* Displays answers to a survey.
*
+ * @deprecated
* @package Gems
* @subpackage Tracker
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
* @since Class available since version 1.4
*/
-class AnswerModelSnippet extends Gems_Tracker_Snippets_AnswerModelSnippetGeneric
+class AnswerModelSnippet extends Gems_Tracker_Snippets_SingleTokenAnswerModelSnippet
{
- /**
- * Overrule to implement snippet specific filtering and sorting.
- *
- * @param MUtil_Model_ModelAbstract $model
- */
- protected function processFilterAndSort(MUtil_Model_ModelAbstract $model)
- {
- if ($this->request) {
- $this->processSortOnly($model);
-
- $model->setFilter(array('gto_id_token' => $this->token->getTokenId()));
- }
- }
}
Modified: trunk/library/snippets/TrackAnswersModelSnippet.php
===================================================================
--- trunk/library/snippets/TrackAnswersModelSnippet.php 2012-11-27 11:13:04 UTC (rev 1044)
+++ trunk/library/snippets/TrackAnswersModelSnippet.php 2012-11-28 16:18:00 UTC (rev 1045)
@@ -39,40 +39,13 @@
/**
* Class description of TrackAnswersModelSnippet
*
+ * @deprecated
* @package Gems
* @subpackage Tracker
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
* @since Class available since version 1.4
*/
-class TrackAnswersModelSnippet extends Gems_Tracker_Snippets_AnswerModelSnippetGeneric
+class TrackAnswersModelSnippet extends Gems_Tracker_Snippets_TrackAnswersModelSnippet
{
- /**
- * Use compact view and show all tokens of the same surveyId in
- * one view. Property used by respondent export
- *
- * @var boolean
- */
- public $grouped = true;
-
- /**
- * Overrule to implement snippet specific filtering and sorting.
- *
- * @param MUtil_Model_ModelAbstract $model
- */
- protected function processFilterAndSort(MUtil_Model_ModelAbstract $model)
- {
- if ($this->request) {
- $this->processSortOnly($model);
-
- if ($this->grouped) {
- $filter['gto_id_respondent_track'] = $this->token->getRespondentTrackId();
- $filter['gto_id_survey'] = $this->token->getSurveyId();
- } else {
- $filter['gto_id_token'] = $this->token->getTokenId();
- }
-
- $model->setFilter($filter);
- }
- }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-27 11:13:16
|
Revision: 1044
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1044&view=rev
Author: mennodekker
Date: 2012-11-27 11:13:04 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Update language files
Modified Paths:
--------------
trunk/library/languages/default-en.mo
trunk/library/languages/default-en.po
trunk/library/languages/default-nl.mo
trunk/library/languages/default-nl.po
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2012-11-27 11:08:46 UTC (rev 1043)
+++ trunk/library/languages/default-en.po 2012-11-27 11:13:04 UTC (rev 1044)
@@ -2,14 +2,14 @@
msgstr ""
"Project-Id-Version: GemsTracker EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 12:56+0100\n"
+"POT-Creation-Date: 2012-11-27 12:11+0100\n"
"PO-Revision-Date: \n"
-"Last-Translator: Matijs de Jong <mj...@ma...>\n"
+"Last-Translator: Menno Dekker <men...@er...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
+"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Poedit-SourceCharset: iso-8859-1\n"
"X-Poedit-Basepath: ../\n"
@@ -17,81 +17,82 @@
"X-Generator: Poedit 1.5.4\n"
"X-Poedit-SearchPath-0: .\n"
-#: classes/GemsEscort.php:219
+#: classes/GemsEscort.php:228
#, php-format
msgid "Path %s not writable"
msgstr "Path %s not writable"
-#: classes/GemsEscort.php:606
+#: classes/GemsEscort.php:619
msgid " > "
msgstr " > "
-#: classes/GemsEscort.php:801
+#: classes/GemsEscort.php:819
#, php-format
msgid "You are logged in as %s"
msgstr "You are logged in as %s"
-#: classes/GemsEscort.php:803
-#: classes/Gems/Menu.php:263
+#: classes/GemsEscort.php:821 classes/Gems/Menu.php:263
msgid "Logoff"
msgstr "Logoff"
-#: classes/GemsEscort.php:806
+#: classes/GemsEscort.php:824
msgid "You are not logged in"
msgstr "You are not logged in"
-#: classes/GemsEscort.php:994
+#: classes/GemsEscort.php:1018
#, php-format
msgid "User: %s"
msgstr "User: %s"
-#: classes/GemsEscort.php:1019
+#: classes/GemsEscort.php:1043
msgid "version"
msgstr "version"
-#: classes/GemsEscort.php:1465
-msgid "Take note: your session has expired, your inputs were not saved. Please check the input data and try again"
-msgstr "Take note: your session has expired, your inputs were not saved. Please check the input data and try again"
+#: classes/GemsEscort.php:1518
+msgid ""
+"Take note: your session has expired, your inputs were not saved. Please "
+"check the input data and try again"
+msgstr ""
+"Take note: your session has expired, your inputs were not saved. Please "
+"check the input data and try again"
-#: classes/GemsEscort.php:1594
+#: classes/GemsEscort.php:1647
msgid "Please check back later."
msgstr "Please check back later."
-#: classes/GemsEscort.php:1596
-#: classes/GemsEscort.php:1600
-#: classes/GemsEscort.php:1601
+#: classes/GemsEscort.php:1649 classes/GemsEscort.php:1653
+#: classes/GemsEscort.php:1654
msgid "System is in maintenance mode"
msgstr "System is in maintenance mode"
-#: classes/GemsEscort.php:1611
+#: classes/GemsEscort.php:1665
msgid "No access to site."
msgstr "No access to site."
-#: classes/GemsEscort.php:1613
-#: classes/GemsEscort.php:1656
+#: classes/GemsEscort.php:1667 classes/GemsEscort.php:1710
msgid "You have no access to this site."
msgstr "You have no access to this site."
-#: classes/GemsEscort.php:1629
+#: classes/GemsEscort.php:1683 classes/Gems/Default/StaffAction.php:317
msgid "No access to page"
msgstr "No access to page"
-#: classes/GemsEscort.php:1631
+#: classes/GemsEscort.php:1685 classes/Gems/Default/OrganizationAction.php:106
+#: classes/Gems/Default/StaffAction.php:318
+#: classes/Gems/Model/HiddenOrganizationModel.php:115
#, 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:1641
-#: classes/GemsEscort.php:1654
+#: classes/GemsEscort.php:1695 classes/GemsEscort.php:1708
msgid "You are no longer logged in."
msgstr "You are no longer logged in."
-#: classes/GemsEscort.php:1642
+#: classes/GemsEscort.php:1696
msgid "You must login to access this page."
msgstr "You must login to access this page."
-#: classes/GemsEscort.php:1783
-#: classes/GemsEscort.php:1785
+#: classes/GemsEscort.php:1842 classes/GemsEscort.php:1844
#, php-format
msgid "%d survey"
msgid_plural "%d surveys"
@@ -147,7 +148,7 @@
msgid "Project setup"
msgstr "Project setup"
-#: classes/Gems/Menu.php:170
+#: classes/Gems/Menu.php:170 classes/Gems/Default/SourceAction.php:203
msgid "Database"
msgstr "Database"
@@ -155,11 +156,11 @@
msgid "Content"
msgstr "Content"
-#: classes/Gems/Menu.php:177
+#: classes/Gems/Menu.php:177 classes/Gems/Default/DatabaseAction.php:313
msgid "Execute"
msgstr "Execute"
-#: classes/Gems/Menu.php:182
+#: classes/Gems/Menu.php:182 classes/Gems/Default/DatabaseAction.php:289
msgid "Patches"
msgstr "Patches"
@@ -175,7 +176,7 @@
msgid "Run SQL"
msgstr "Run SQL"
-#: classes/Gems/Menu.php:190
+#: classes/Gems/Menu.php:190 classes/Gems/Default/ReceptionAction.php:131
msgid "Reception codes"
msgstr "Reception codes"
@@ -183,16 +184,16 @@
msgid "Consents"
msgstr "Consents"
-#: classes/Gems/Menu.php:196
+#: classes/Gems/Menu.php:196 classes/Gems/Default/RoleAction.php:309
msgid "Roles"
msgstr "Roles"
-#: classes/Gems/Menu.php:197
-#: classes/Gems/Menu.php:391
+#: classes/Gems/Menu.php:197 classes/Gems/Menu.php:390
msgid "Assigned"
msgstr "Assigned"
-#: classes/Gems/Menu.php:198
+#: classes/Gems/Menu.php:198 classes/Gems/Default/RoleAction.php:238
+#: classes/Gems/Default/RoleAction.php:324
msgid "Privileges"
msgstr "Privileges"
@@ -201,14 +202,20 @@
msgstr "Groups"
#: classes/Gems/Menu.php:204
+#: classes/Gems/Default/SurveyMaintenanceAction.php:210
+#: classes/Gems/Default/TrackMaintenanceAction.php:137
+#: classes/Gems/Email/MailTemplateForm.php:101
+#: classes/Gems/Tracker/Snippets/EditTrackEngineSnippetGeneric.php:140
msgid "Organizations"
msgstr "Organizations"
-#: classes/Gems/Menu.php:207
+#: classes/Gems/Menu.php:207 classes/Gems/Default/GroupAction.php:121
+#: classes/Gems/Default/LogAction.php:193
+#: classes/Gems/Default/StaffAction.php:470
msgid "Staff"
msgstr "Staff"
-#: classes/Gems/Menu.php:210
+#: classes/Gems/Menu.php:210 classes/Gems/Default/LogAction.php:213
msgid "Logging"
msgstr "Logging"
@@ -220,14 +227,15 @@
msgid "Upgrade"
msgstr "Upgrade"
-#: classes/Gems/Menu.php:220
-#: classes/Gems/Menu.php:221
+#: classes/Gems/Menu.php:220 classes/Gems/Menu.php:221
+#: classes/Gems/Default/ProjectInformationAction.php:113
+#: classes/Gems/Default/ProjectInformationAction.php:118
#, php-format
msgid "Changelog %s"
msgstr "Changelog %s"
-#: classes/Gems/Menu.php:222
-#: classes/Gems/Menu.php:355
+#: classes/Gems/Menu.php:222 classes/Gems/Menu.php:354
+#: classes/Gems/Menu/SubMenuItem.php:551
msgid "Show"
msgstr "Show"
@@ -256,7 +264,7 @@
msgid "Logon"
msgstr "Logon"
-#: classes/Gems/Menu.php:258
+#: classes/Gems/Menu.php:258 classes/Gems/User/Form/LoginForm.php:112
msgid "Lost password"
msgstr "Lost password"
@@ -264,168 +272,237 @@
msgid "Your account"
msgstr "Your account"
-#: classes/Gems/Menu.php:260
+#: classes/Gems/Menu.php:260 classes/Gems/Default/OptionAction.php:153
msgid "Activity overview"
msgstr "Activity overview"
-#: classes/Gems/Menu.php:261
+#: classes/Gems/Menu.php:261 classes/Gems/Default/OptionAction.php:78
msgid "Change password"
msgstr "Change password"
-#: classes/Gems/Menu.php:262
-#: classes/Gems/Menu.php:315
-#: classes/Gems/Menu.php:361
+#: classes/Gems/Menu.php:262 classes/Gems/Menu.php:314
+#: classes/Gems/Menu.php:360 classes/Gems/Default/MailLogAction.php:114
+#: classes/Gems/Default/TrackAction.php:459
+#: classes/Gems/Export/RespondentExport.php:158
+#: classes/Gems/Snippets/TokenModelSnippetAbstract.php:70
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:482
+#: classes/Gems/Tracker/Form/AskTokenForm.php:77
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:195
+#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:188
+#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:197
+#: snippets/BrowseSingleSurveyTokenSnippet.php:164
+#: snippets/TrackTokenOverviewSnippet.php:132
+#: snippets/Organization/OrganizationEditSnippet.php:89
+#: snippets/Track/Token/ShowAllOpenSnippet.php:88
+#: snippets/Track/Token/ShowFirstOpenSnippet.php:110
msgid "Token"
msgstr "Token"
-#: classes/Gems/Menu.php:303
+#: classes/Gems/Menu.php:302 classes/Gems/Export/RespondentExport.php:329
msgid "Export"
msgstr "Export"
-#: classes/Gems/Menu.php:310
+#: classes/Gems/Menu.php:309 classes/Gems/Default/MailJobAction.php:99
+#: classes/Gems/Default/ProjectTracksAction.php:64
+#: classes/Gems/Default/TrackAction.php:328
+#: classes/Gems/Default/TrackActionAbstract.php:219
+#: classes/Gems/Default/TrackFieldsAction.php:96
+#: classes/Gems/Email/OneMailForm.php:54
+#: classes/Gems/Export/RespondentExport.php:235
+#: classes/Gems/Export/RespondentExport.php:247
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:484
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:752
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:216
+#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:149
+#: classes/Gems/Tracker/Snippets/ShowTrackUsageAbstract.php:146
+#: snippets/Track/Token/ShowAllOpenSnippet.php:148
msgid "Track"
msgstr "Track"
-#: classes/Gems/Menu.php:318
-#: classes/Gems/Menu.php:343
-#: classes/Gems/Menu.php:385
+#: classes/Gems/Menu.php:317 classes/Gems/Menu.php:342
+#: classes/Gems/Menu.php:384
+#: classes/Gems/Default/TrackMaintenanceAction.php:389
+#: snippets/AddTracksSnippet.php:239
msgid "Add"
msgstr "Add"
-#: classes/Gems/Menu.php:324
-#: classes/Gems/Menu.php:424
+#: classes/Gems/Menu.php:323 classes/Gems/Menu.php:423
+#: classes/Gems/Email/EmailFormAbstract.php:280
+#: classes/Gems/Email/EmailFormAbstract.php:291
+#: classes/Gems/Menu/MenuAbstract.php:378
+#: classes/Gems/Menu/MenuAbstract.php:391
msgid "Preview"
msgstr "Preview"
-#: classes/Gems/Menu.php:333
+#: classes/Gems/Menu.php:332 classes/Gems/Default/ExportAction.php:149
+#: classes/Gems/Default/TrackMaintenanceAction.php:336
+#: classes/Gems/Menu/MenuAbstract.php:387
+#: classes/Gems/Menu/MenuAbstract.php:469 snippets/AddTracksSnippet.php:236
msgid "Tracks"
msgstr "Tracks"
-#: classes/Gems/Menu.php:349
+#: classes/Gems/Menu.php:348
msgid "Assignments"
msgstr "Assignments"
-#: classes/Gems/Menu.php:365
+#: classes/Gems/Menu.php:364 classes/Gems/Menu/SubMenuItem.php:417
msgid "Edit"
msgstr "Edit"
-#: classes/Gems/Menu.php:371
+#: classes/Gems/Menu.php:370 classes/Gems/Menu/SubMenuItem.php:398
msgid "Delete"
msgstr "Delete"
-#: classes/Gems/Menu.php:378
+#: classes/Gems/Menu.php:377
+#: classes/Gems/Default/SurveyMaintenanceAction.php:586
+#: classes/Gems/Menu/MenuAbstract.php:394
+#: classes/Gems/Menu/MenuAbstract.php:456
+#: classes/Gems/Tracker/Model/TrackModel.php:100
msgid "Surveys"
msgstr "Surveys"
-#: classes/Gems/Menu.php:415
+#: classes/Gems/Menu.php:414
msgid "Fill in"
msgstr "Fill in"
-#: classes/Gems/Menu.php:418
+#: classes/Gems/Menu.php:417
msgid "Print PDF"
msgstr "Print PDF"
-#: classes/Gems/Menu.php:421
+#: classes/Gems/Menu.php:420
msgid "E-Mail now!"
msgstr "E-Mail now!"
-#: classes/Gems/Menu.php:427
+#: classes/Gems/Menu.php:426
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:481
msgid "Answers"
msgstr "Answers"
-#: classes/Gems/Menu.php:579
+#: classes/Gems/Menu.php:578 classes/Gems/Default/GroupAction.php:122
+#: classes/Gems/Default/OrganizationAction.php:154
+#: classes/Gems/Default/RespondentAction.php:470
msgid "Respondents"
msgstr "Patients"
-#: classes/Gems/Menu.php:587
+#: classes/Gems/Menu.php:586
msgid "Overview"
msgstr "Overview"
-#: classes/Gems/Menu.php:594
+#: classes/Gems/Menu.php:593 classes/Gems/Menu/MenuAbstract.php:351
msgid "Project"
msgstr "Project"
-#: classes/Gems/Menu.php:597
+#: classes/Gems/Menu.php:596
msgid "Setup"
msgstr "Setup"
-#: classes/Gems/Menu.php:600
+#: classes/Gems/Menu.php:599
msgid "Track Builder"
msgstr "Track Builder"
-#: classes/Gems/Menu.php:603
+#: classes/Gems/Menu.php:602
msgid "Mail"
msgstr "Mail"
-#: classes/Gems/Menu.php:609
+#: classes/Gems/Menu.php:608 classes/Gems/Default/RespondentAction.php:364
+#: classes/Gems/Default/RespondentExportAction.php:60
msgid "Export respondent"
msgstr "Export respondent"
-#: classes/Gems/Menu.php:615
+#: classes/Gems/Menu.php:614 classes/Gems/Default/ContactAction.php:101
+#: snippets/Organization/OrganizationEditSnippet.php:82
msgid "Contact"
msgstr "Contact"
-#: classes/Gems/Menu.php:629
+#: classes/Gems/Menu.php:628
msgid "Changelog"
msgstr "Changelog"
-#: classes/Gems/Model.php:206
+#: classes/Gems/Model.php:212
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:213
msgid "Respondent nr"
msgstr "Patient nr"
-#: classes/Gems/Model.php:209
+#: classes/Gems/Model.php:215 classes/Gems/Default/ExportAction.php:172
+#: classes/Gems/Default/IndexAction.php:229
+#: classes/Gems/Default/LogAction.php:197
+#: classes/Gems/Default/MailJobAction.php:98
+#: classes/Gems/Default/StaffAction.php:340
+#: classes/Gems/Snippets/Export/ReportHeaderSnippet.php:63
+#: classes/Gems/User/Form/LayeredLoginForm.php:254
+#: classes/Gems/User/Form/OrganizationFormAbstract.php:166
+#: snippets/Organization/OrganizationEditSnippet.php:80
msgid "Organization"
msgstr "Organization"
-#: classes/Gems/Model.php:211
+#: classes/Gems/Model.php:217
msgid "Opened"
msgstr "Opened"
-#: classes/Gems/Model.php:212
+#: classes/Gems/Model.php:218
msgid "Consent"
msgstr "Consent"
-#: classes/Gems/Model.php:214
+#: classes/Gems/Model.php:220 classes/Gems/Default/OptionAction.php:130
+#: classes/Gems/Default/StaffAction.php:330
msgid "E-Mail"
msgstr "E-Mail"
-#: classes/Gems/Model.php:219
+#: classes/Gems/Model.php:225 classes/Gems/Default/OptionAction.php:134
+#: classes/Gems/Default/StaffAction.php:343
msgid "Gender"
msgstr "Gender"
-#: classes/Gems/Model.php:220
+#: classes/Gems/Model.php:226 classes/Gems/Default/OptionAction.php:131
+#: classes/Gems/Default/StaffAction.php:185
msgid "First name"
msgstr "First name"
-#: classes/Gems/Model.php:221
+#: classes/Gems/Model.php:227 classes/Gems/Default/OptionAction.php:132
+#: classes/Gems/Default/StaffAction.php:187
msgid "Surname prefix"
msgstr "Surname prefix"
-#: classes/Gems/Model.php:222
+#: classes/Gems/Model.php:228 classes/Gems/Default/OptionAction.php:133
+#: classes/Gems/Default/StaffAction.php:188
msgid "Last name"
msgstr "Last name"
-#: classes/Gems/Model.php:224
+#: classes/Gems/Model.php:230 classes/Gems/Default/DatabaseAction.php:135
+#: classes/Gems/Default/DatabaseAction.php:335
+#: classes/Gems/Default/GroupAction.php:115
+#: classes/Gems/Default/OrganizationAction.php:126
+#: classes/Gems/Default/RoleAction.php:231
+#: classes/Gems/Default/SourceAction.php:195
+#: classes/Gems/Default/StaffAction.php:328
+#: classes/Gems/Default/SurveyMaintenanceAction.php:435
+#: classes/Gems/Default/TokenPlanAction.php:121
+#: classes/Gems/Default/TrackFieldsAction.php:98
+#: classes/Gems/Default/TrackMaintenanceAction.php:249
+#: classes/Gems/Snippets/TokenPlanTableSnippet.php:60
+#: classes/Gems/Tracker/Model/TrackModel.php:98
msgid "Name"
msgstr "Name"
-#: classes/Gems/Model.php:227
+#: classes/Gems/Model.php:234
msgid "Street"
msgstr "Street"
-#: classes/Gems/Model.php:228
+#: classes/Gems/Model.php:235
msgid "Zipcode"
msgstr "Zipcode"
-#: classes/Gems/Model.php:229
+#: classes/Gems/Model.php:236
+#: classes/Gems/Default/RespondentPlanAction.php:134
msgid "City"
msgstr "City"
-#: classes/Gems/Model.php:231
+#: classes/Gems/Model.php:238
msgid "Phone"
msgstr "Phone"
-#: classes/Gems/Model.php:233
+#: classes/Gems/Model.php:240
+#: classes/Gems/Default/RespondentPlanAction.php:133
msgid "Birthday"
msgstr "Birthday"
@@ -449,11 +526,11 @@
msgid "Unable to run PDF conversion (%s): \"%s\""
msgstr "Unable to run PDF conversion (%s): \"%s\""
-#: classes/Gems/Upgrades.php:89
+#: classes/Gems/Upgrades.php:90
msgid "Syncing surveys for all sources"
msgstr "Syncing surveys for all sources"
-#: classes/Gems/Upgrades.php:149
+#: classes/Gems/Upgrades.php:150 classes/Gems/Upgrades.php:162
msgid "Make sure to read the changelog as it contains important instructions"
msgstr "Make sure to read the changelog as it contains important instructions"
@@ -472,61 +549,110 @@
msgstr "Trying upgrade for %s to level %s: %s"
#: classes/Gems/Controller/BrowseEditAction.php:357
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:239
+#: classes/Gems/Default/StaffAction.php:228
+#: classes/Gems/Snippets/ModelFormSnippetAbstract.php:186
#, php-format
msgid "New %s..."
msgstr "New %s..."
#: classes/Gems/Controller/BrowseEditAction.php:390
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:259
+#: classes/Gems/Default/TrackFieldsAction.php:130
+#: classes/Gems/Default/TrackRoundsAction.php:171
#, php-format
msgid "Delete %s"
msgstr "Delete %s"
#: classes/Gems/Controller/BrowseEditAction.php:394
+#: classes/Gems/Default/TrackFieldsAction.php:137
+#: classes/Gems/Default/TrackRoundsAction.php:186
+#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:134
+#: snippets/DeleteTrackTokenSnippet.php:152
#, php-format
msgid "%2$u %1$s deleted"
msgstr "%2$u %1$s deleted"
#: classes/Gems/Controller/BrowseEditAction.php:411
+#: classes/Gems/Default/OrganizationAction.php:212
#, php-format
msgid "Edit %s %s"
msgstr "Edit %s %s"
#: classes/Gems/Controller/BrowseEditAction.php:413
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:269
+#: classes/Gems/Snippets/ModelFormSnippetAbstract.php:188
#, php-format
msgid "Edit %s"
msgstr "Edit %s"
#: classes/Gems/Controller/BrowseEditAction.php:516
+#: classes/Gems/Snippets/AutosearchFormSnippet.php:166
msgid "Free search text"
msgstr "Free search text"
#: classes/Gems/Controller/BrowseEditAction.php:587
+#: classes/Gems/Snippets/AutosearchFormSnippet.php:241
msgid "Search"
msgstr "Search"
#: classes/Gems/Controller/BrowseEditAction.php:603
+#: classes/Gems/Default/TrackMaintenanceAction.php:383
#, php-format
msgid "No %s found"
msgstr "No %s found"
#: classes/Gems/Controller/BrowseEditAction.php:690
+#: classes/Gems/Default/ExportAction.php:245
#, php-format
msgid "No %s found."
msgstr "No %s found."
#: classes/Gems/Controller/BrowseEditAction.php:805
+#: classes/Gems/Default/TrackRoundsAction.php:244
+#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:94
msgid "Are you sure?"
msgstr "Are you sure?"
#: classes/Gems/Controller/BrowseEditAction.php:821
+#: classes/Gems/Default/DatabaseAction.php:187
+#: classes/Gems/Default/DatabaseAction.php:499
+#: classes/Gems/Default/StaffAction.php:276
+#: classes/Gems/Default/TrackAction.php:419
+#: classes/Gems/Default/TrackRoundsAction.php:265
+#: classes/Gems/Snippets/ModelItemYesNoDeleteSnippetAbstract.php:181
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:143
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:147
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:166
+#: classes/Gems/Util/Translated.php:263
+#: classes/MUtil/Snippets/ModelYesNoDeleteSnippetAbstract.php:192
+#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:124
msgid "Yes"
msgstr "Yes"
#: classes/Gems/Controller/BrowseEditAction.php:822
+#: classes/Gems/Default/DatabaseAction.php:188
+#: classes/Gems/Default/DatabaseAction.php:500
+#: classes/Gems/Default/StaffAction.php:277
+#: classes/Gems/Default/TrackAction.php:420
+#: classes/Gems/Default/TrackRoundsAction.php:266
+#: classes/Gems/Snippets/ModelItemYesNoDeleteSnippetAbstract.php:183
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:144
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:148
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:167
+#: classes/Gems/Util/ReceptionCodeLibrary.php:99
+#: classes/Gems/Util/ReceptionCodeLibrary.php:123
+#: classes/Gems/Util/Translated.php:263
+#: classes/MUtil/Snippets/ModelYesNoDeleteSnippetAbstract.php:194
+#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:125
msgid "No"
msgstr "No"
#: classes/Gems/Controller/BrowseEditAction.php:875
+#: classes/Gems/Default/RespondentAction.php:254
+#: classes/Gems/Default/RespondentAction.php:347
+#: classes/Gems/Default/RespondentAction.php:540
+#: classes/Gems/Default/TrackAction.php:554
#, php-format
msgid "Unknown %s requested"
msgstr "Unknown %s requested"
@@ -537,10 +663,15 @@
msgstr "New %1$s..."
#: classes/Gems/Controller/BrowseEditAction.php:906
+#: classes/Gems/Email/MailTemplateForm.php:108
+#: classes/Gems/User/Form/ChangePasswordForm.php:341
+#: classes/MUtil/Snippets/ModelFormSnippetAbstract.php:245
msgid "Save"
msgstr "Save"
#: classes/Gems/Controller/BrowseEditAction.php:942
+#: classes/Gems/Default/MailTemplateAction.php:116
+#: classes/MUtil/Snippets/ModelFormSnippetAbstract.php:209
#, php-format
msgid "%2$u %1$s saved"
msgstr "%2$u %1$s saved"
@@ -550,21 +681,31 @@
msgstr "No changes to save."
#: classes/Gems/Controller/BrowseEditAction.php:954
+#: classes/Gems/Default/RespondentAction.php:315
msgid "Input error! No changes saved!"
msgstr "Input error! No changes saved!"
#: classes/Gems/Controller/BrowseEditAction.php:982
+#: classes/Gems/Default/SurveyMaintenanceAction.php:615
#, php-format
msgid "Show %s"
msgstr "Show %s"
#: classes/Gems/Controller/BrowseEditAction.php:989
+#: classes/Gems/Default/SurveyMaintenanceAction.php:624
#, php-format
msgid "Unknown %s."
msgstr "Unknown %s."
#: classes/Gems/Controller/ModelActionAbstract.php:97
#: classes/Gems/Default/DatabaseAction.php:503
+#: classes/Gems/Default/SourceAction.php:292
+#: classes/Gems/Default/UpgradeAction.php:184
+#: classes/Gems/Snippets/ModelFormSnippetAbstract.php:171
+#: classes/Gems/Snippets/ModelItemTableSnippetAbstract.php:180
+#: classes/Gems/Tracker/Snippets/ShowRoundSnippetAbstract.php:193
+#: snippets/Generic/CurrentButtonRowSnippet.php:77
+#: snippets/Track/Token/ShowFirstOpenSnippet.php:133
msgid "Cancel"
msgstr "Cancel"
@@ -588,6 +729,8 @@
msgstr "Showing %s"
#: classes/Gems/Controller/ModelSnippetActionAbstract.php:390
+#: classes/Gems/Default/OptionAction.php:181
+#: classes/MUtil/Snippets/ModelFormSnippetAbstract.php:341
msgid "item"
msgid_plural "items"
msgstr[0] "item"
@@ -606,58 +749,87 @@
msgid "Nothing to do."
msgstr "Nothing to do."
-#: classes/Gems/Default/AskAction.php:88
+#: classes/Gems/Default/AskAction.php:167
#, php-format
msgid "Enter your %s token"
msgstr "Enter your %s token"
-#: classes/Gems/Default/AskAction.php:91
+#: classes/Gems/Default/AskAction.php:170
msgid "Tokens identify a survey that was assigned to you personally."
msgstr "Tokens identify a survey that was assigned to you personally."
-#: classes/Gems/Default/AskAction.php:91
+#: classes/Gems/Default/AskAction.php:170
msgid "Entering the token and pressing OK will open that survey."
msgstr "Entering the token and pressing OK will open that survey."
-#: classes/Gems/Default/AskAction.php:95
+#: classes/Gems/Default/AskAction.php:174
msgid "After answering the survey you will be logged off automatically."
msgstr "After answering the survey you will be logged off automatically."
-#: classes/Gems/Default/AskAction.php:100
-msgid "A token consists of two groups of four letters and numbers, separated by an optional hyphen. Tokens are case insensitive."
-msgstr "A token consists of two groups of four letters and numbers, separated by an optional hyphen. Tokens are case insensitive."
+#: classes/Gems/Default/AskAction.php:179
+msgid ""
+"A token consists of two groups of four letters and numbers, separated by an "
+"optional hyphen. Tokens are case insensitive."
+msgstr ""
+"A token consists of two groups of four letters and numbers, separated by an "
+"optional hyphen. Tokens are case insensitive."
-#: classes/Gems/Default/AskAction.php:101
-msgid "The number zero and the letter O are treated as the same; the same goes for the number one and the letter L."
-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/AskAction.php:180
+msgid ""
+"The number zero and the letter O are treated as the same; the same goes for "
+"the number one and the letter L."
+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/AskAction.php:136
+#: classes/Gems/Default/AskAction.php:199
#, php-format
-msgid "Thank you for answering. At the moment we have no further surveys for you to take."
-msgstr "Thank you for answering. At the moment we have no further surveys for you to take."
+msgid "The token %s does not exist (any more)."
+msgstr "The token %s does not exist (any more)."
-#: classes/Gems/Default/AskAction.php:138
+#: classes/Gems/Default/AskAction.php:224
#, php-format
-msgid "The survey for token %s has been answered and no further surveys are open."
-msgstr "The survey for token %s has been answered and no further surveys are open."
+msgid ""
+"Thank you for answering. At the moment we have no further surveys for you to "
+"take."
+msgstr ""
+"Thank you for answering. At the moment we have no further surveys for you to "
+"take."
-#: classes/Gems/Default/AskAction.php:145
+#: classes/Gems/Default/AskAction.php:229
#, php-format
-msgid "The token %s does not exist (any more)."
-msgstr "The token %s does not exist (any more)."
+msgid ""
+"The survey for token %s has been answered and no further surveys are open."
+msgstr ""
+"The survey for token %s has been answered and no further surveys are open."
-#: classes/Gems/Default/AskAction.php:273
+#: classes/Gems/Default/AskAction.php:360
#, php-format
msgid "The survey for token %s is no longer active."
msgstr "The survey for token %s is no longer active."
#: classes/Gems/Default/ConsentAction.php:68
#: classes/Gems/Default/GroupAction.php:116
+#: classes/Gems/Default/ReceptionAction.php:81
+#: classes/Gems/Default/RoleAction.php:232
+#: classes/Gems/Default/SurveyMaintenanceAction.php:206
+#: classes/Gems/Default/SurveyMaintenanceAction.php:436
+#: classes/Gems/Default/TrackActionAbstract.php:220
+#: classes/Gems/Default/TrackFieldsAction.php:101
+#: classes/Gems/Default/UpgradeAction.php:176
+#: classes/Gems/Export/RespondentExport.php:236
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:758
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:214
+#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:150
+#: classes/Gems/Tracker/Snippets/ShowTrackUsageAbstract.php:147
+#: snippets/TrackSurveyOverviewSnippet.php:115
msgid "Description"
msgstr "Description"
#: classes/Gems/Default/ConsentAction.php:70
#: classes/Gems/Default/DatabaseAction.php:139
+#: classes/Gems/Default/TrackFieldsAction.php:97
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:757
msgid "Order"
msgstr "Order"
@@ -670,8 +842,12 @@
msgstr "Consent code"
#: classes/Gems/Default/ConsentAction.php:75
-msgid "Internal code, not visible to users, copied with the token information to the source."
-msgstr "Internal code, not visible to users, copied with the token information to the source."
+msgid ""
+"Internal code, not visible to users, copied with the token information to "
+"the source."
+msgstr ""
+"Internal code, not visible to users, copied with the token information to "
+"the source."
#: classes/Gems/Default/ConsentAction.php:92
msgid "respondent consent"
@@ -715,15 +891,19 @@
msgid "Cron jobs turned off."
msgstr "Cron jobs turned off."
-#: classes/Gems/Default/CronAction.php:192
+#: classes/Gems/Default/CronAction.php:198
msgid "No mails sent."
msgstr "No mails sent."
-#: classes/Gems/Default/CronAction.php:195
+#: classes/Gems/Default/CronAction.php:201
+#: classes/Gems/Email/MultiMailForm.php:49
+#: classes/Gems/Email/OneMailForm.php:47
msgid "On this test system all mail will be delivered to the from address."
msgstr "On this test system all mail will be delivered to the from address."
#: classes/Gems/Default/DatabaseAction.php:75
+#: classes/Gems/Default/ProjectInformationAction.php:191
+#: classes/Gems/Task/CleanCache.php:58
msgid "Cache cleaned"
msgstr "Cache cleaned"
@@ -733,18 +913,25 @@
msgstr "No rows in %s."
#: classes/Gems/Default/DatabaseAction.php:134
+#: classes/Gems/Default/TrackFieldsAction.php:104
+#: classes/Gems/Default/TrackMaintenanceAction.php:251
msgid "Type"
msgstr "Type"
#: classes/Gems/Default/DatabaseAction.php:138
+#: classes/Gems/Default/SurveyMaintenanceAction.php:457
msgid "Group"
msgstr "Group"
#: classes/Gems/Default/DatabaseAction.php:140
+#: classes/Gems/Default/OrganizationAction.php:127
msgid "Location"
msgstr "Location"
#: classes/Gems/Default/DatabaseAction.php:143
+#: classes/Gems/Default/SourceAction.php:210
+#: classes/Gems/Export/RespondentExport.php:159
+#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:157
msgid "Status"
msgstr "Status"
@@ -755,6 +942,7 @@
#: classes/Gems/Default/DatabaseAction.php:148
#: classes/Gems/Default/DatabaseAction.php:293
#: classes/Gems/Default/DatabaseAction.php:340
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:204
msgid "Changed on"
msgstr "Changed on"
@@ -825,6 +1013,9 @@
#: classes/Gems/Default/DatabaseAction.php:287
#: classes/Gems/Default/DatabaseAction.php:333
+#: classes/Gems/Default/UpgradeAction.php:126
+#: classes/Gems/Default/UpgradeAction.php:153
+#: classes/Gems/Default/UpgradeAction.php:175
msgid "Level"
msgstr "Level"
@@ -857,6 +1048,7 @@
msgstr "%d new or changed patch(es)."
#: classes/Gems/Default/DatabaseAction.php:303
+#: classes/Gems/Default/ProjectInformationAction.php:137
msgid "Gems build"
msgstr "Gems build"
@@ -881,6 +1073,7 @@
msgstr "Show patches"
#: classes/Gems/Default/DatabaseAction.php:326
+#: classes/Gems/Task/Db/ExecutePatch.php:68
#, php-format
msgid "%d patch(es) executed."
msgstr "%d patch(es) executed."
@@ -924,6 +1117,7 @@
msgstr "Starting %d object creation scripts."
#: classes/Gems/Default/DatabaseAction.php:474
+#: classes/Gems/Task/Db/CreateNewTable.php:73
#, php-format
msgid "Finished %s creation script for object %d of %d"
msgstr "Finished %s creation script for object %d of %d"
@@ -958,6 +1152,7 @@
msgstr "Separate multiple commands with semicolons (;)."
#: classes/Gems/Default/DatabaseAction.php:522
+#: classes/Gems/Menu/MenuAbstract.php:286
msgid "Run"
msgstr "Run"
@@ -1001,6 +1196,14 @@
msgstr "Not patient nr, but respondent id as exported here."
#: classes/Gems/Default/ExportAction.php:154
+#: classes/Gems/Default/MailJobAction.php:100
+#: classes/Gems/Default/ProjectSurveysAction.php:67
+#: classes/Gems/Default/SurveyAction.php:201
+#: classes/Gems/Email/OneMailForm.php:57
+#: classes/Gems/Export/RespondentExport.php:156
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:755
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:215
+#: snippets/TrackSurveyOverviewSnippet.php:111
msgid "Survey"
msgstr "Survey"
@@ -1022,25 +1225,40 @@
msgstr "Export data"
#: classes/Gems/Default/GroupAction.php:71
+#: classes/Gems/Default/ReceptionAction.php:55
msgid "Can be assigned to"
msgstr "Can be assigned to"
#: classes/Gems/Default/GroupAction.php:117
#: classes/Gems/Default/LogAction.php:201
+#: classes/Gems/Default/RoleAction.php:298
msgid "Role"
msgstr "Role"
#: classes/Gems/Default/GroupAction.php:120
+#: classes/Gems/Default/MailJobAction.php:82
+#: classes/Gems/Default/OrganizationAction.php:151
+#: classes/Gems/Default/ReceptionAction.php:87
+#: classes/Gems/Default/SourceAction.php:101
+#: classes/Gems/Default/SurveyMaintenanceAction.php:448
+#: classes/Gems/Default/SurveyMaintenanceAction.php:503
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:761
+#: classes/Gems/Tracker/Model/TrackModel.php:102
+#: classes/Gems/Util/TrackData.php:147
msgid "Active"
msgstr "Active"
#: classes/Gems/Default/GroupAction.php:125
+#: classes/Gems/Default/OrganizationAction.php:175
msgid "Allowed IP Ranges"
msgstr "Allowed IP Ranges"
#: classes/Gems/Default/GroupAction.php:126
-msgid "Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)"
-msgstr "Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)"
+#: classes/Gems/Default/OrganizationAction.php:176
+msgid ""
+"Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)"
+msgstr ""
+"Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)"
#: classes/Gems/Default/GroupAction.php:136
msgid "group"
@@ -1065,8 +1283,12 @@
msgstr "Please enter your username or e-mail address. "
#: classes/Gems/Default/IndexAction.php:182
-msgid "We will then send you an e-mail with a link. The link will bring you to a page where you can set a new password of your choice."
-msgstr "We will then send you an e-mail with a link. The link will bring you to a page where you can set a new password of your choice."
+msgid ""
+"We will then send you an e-mail with a link. The link will bring you to a "
+"page where you can set a new password of your choice."
+msgstr ""
+"We will then send you an e-mail with a link. The link will bring you to a "
+"page where you can set a new password of your choice."
#: classes/Gems/Default/IndexAction.php:188
msgid "Execute password reset"
@@ -1090,6 +1312,7 @@
msgstr "Please enter your password of choice twice."
#: classes/Gems/Default/IndexAction.php:218
+#: classes/Gems/User/Form/LayeredLoginForm.php:258
msgid "Department"
msgstr "Department"
@@ -1108,18 +1331,26 @@
msgstr "Good bye: %s."
#: classes/Gems/Default/IndexAction.php:339
-msgid "Your password reset request is no longer valid, please request a new link."
-msgstr "Your password reset request is no longer valid, please request a new link."
+msgid ""
+"Your password reset request is no longer valid, please request a new link."
+msgstr ""
+"Your password reset request is no longer valid, please request a new link."
#: classes/Gems/Default/IndexAction.php:341
-msgid "Your password input request is no longer valid, please request a new link."
-msgstr "Your password input request is no longer valid, please request a new link."
+msgid ""
+"Your password input request is no longer valid, please request a new link."
+msgstr ""
+"Your password input request is no longer valid, please request a new link."
#: classes/Gems/Default/IndexAction.php:360
-msgid "We sent you an e-mail with a reset link. Click on the link in the e-mail."
-msgstr "We sent you an e-mail with a reset link. Click on the link in the e-mail."
+msgid ""
+"We sent you an e-mail with a reset link. Click on the link in the e-mail."
+msgstr ""
+"We sent you an e-mail with a reset link. Click on the link in the e-mail."
#: classes/Gems/Default/IndexAction.php:369
+#: classes/Gems/Default/OptionAction.php:94
+#: classes/Gems/Default/StaffAction.php:510
msgid "New password is active."
msgstr "New password is active."
@@ -1132,7 +1363,9 @@
"Dear {greeting},\n"
"\n"
"\n"
-"A new password was requested for your [b]{organization}[/b] account on the [b]{project}[/b] site, please click within {reset_in_hours} hours on [url={reset_url}]this link[/url] to enter the password of your choice.\n"
+"A new password was requested for your [b]{organization}[/b] account on the "
+"[b]{project}[/b] site, please click within {reset_in_hours} hours on [url="
+"{reset_url}]this link[/url] to enter the password of your choice.\n"
"\n"
"\n"
"{organization_signature}\n"
@@ -1142,7 +1375,9 @@
"Dear {greeting},\n"
"\n"
"\n"
-"A new password was requested for your [b]{organization}[/b] account on the [b]{project}[/b] site, please click within {reset_in_hours} hours on [url={reset_url}]this link[/url] to enter the password of your choice.\n"
+"A new password was requested for your [b]{organization}[/b] account on the "
+"[b]{project}[/b] site, please click within {reset_in_hours} hours on [url="
+"{reset_url}]this link[/url] to enter the password of your choice.\n"
"\n"
"\n"
"{organization_signature}\n"
@@ -1162,26 +1397,32 @@
msgstr "Invalid language setting."
#: classes/Gems/Default/LogAction.php:78
+#: classes/Gems/Default/TokenPlanAction.php:243
msgid "from"
msgstr "from"
#: classes/Gems/Default/LogAction.php:83
+#: classes/Gems/Default/TokenPlanAction.php:248
msgid "until"
msgstr "until"
#: classes/Gems/Default/LogAction.php:89
+#: classes/Gems/Default/TokenPlanAction.php:254
msgid "days"
msgstr "days"
#: classes/Gems/Default/LogAction.php:90
+#: classes/Gems/Default/TokenPlanAction.php:255
msgid "weeks"
msgstr "weeks"
#: classes/Gems/Default/LogAction.php:91
+#: classes/Gems/Default/TokenPlanAction.php:256
msgid "months"
msgstr "months"
#: classes/Gems/Default/LogAction.php:92
+#: classes/Gems/Default/TokenPlanAction.php:257
msgid "years"
msgstr "years"
@@ -1218,23 +1459,34 @@
msgstr "All actions"
#: classes/Gems/Default/LogAction.php:190
+#: classes/Gems/Default/TrackFieldsAction.php:92
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:472
msgid "Date"
msgstr "Date"
#: classes/Gems/Default/LogAction.php:191
#: classes/Gems/Default/LogMaintenanceAction.php:52
+#: classes/Gems/Default/UpgradeAction.php:177
msgid "Action"
msgstr "Action"
#: classes/Gems/Default/LogAction.php:192
+#: classes/Gems/Default/MailTemplateAction.php:66
+#: classes/Gems/Email/EmailFormAbstract.php:168
msgid "Message"
msgstr "Message"
#: classes/Gems/Default/LogAction.php:198
+#: classes/Gems/Default/TokenPlanAction.php:116
+#: classes/Gems/Snippets/TokenPlanTableSnippet.php:55
+#: snippets/RespondentDetailsSnippet.php:74
+#: snippets/RespondentDetailsWithAssignmentsSnippet.php:148
msgid "Respondent"
msgstr "Patient"
#: classes/Gems/Default/LogAction.php:202
+#: classes/Gems/Default/OptionAction.php:175
+#: classes/Gems/User/RadiusUserDefinition.php:163
msgid "IP address"
msgstr "IP address"
@@ -1248,6 +1500,7 @@
msgstr "Log:"
#: classes/Gems/Default/LogMaintenanceAction.php:72
+#: snippets/RespondentTokenTabsSnippet.php:69
msgid "All"
msgstr "All"
@@ -1261,6 +1514,7 @@
#: classes/Gems/Default/MailJobAction.php:78
#: classes/Gems/Default/MailLogAction.php:118
+#: classes/Gems/Email/EmailFormAbstract.php:308
msgid "Template"
msgstr "Template"
@@ -1327,6 +1581,10 @@
msgstr "Use the 'By staff member' address"
#: classes/Gems/Default/MailJobAction.php:133
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:290
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:338
+#: snippets/Organization/OrganizationEditSnippet.php:85
+#: snippets/Organization/OrganizationEditSnippet.php:131
msgid "Other"
msgstr "Other"
@@ -1350,8 +1608,12 @@
msgstr "Turn Automatic Mail Jobs ON"
#: classes/Gems/Default/MailJobAction.php:176
-msgid "With automatic mail jobs and a cron job on the server, mails can be sent without manual user action."
-msgstr "With automatic mail jobs and a cron job on the server, mails can be sent without manual user action."
+msgid ""
+"With automatic mail jobs and a cron job on the server, mails can be sent "
+"without manual user action."
+msgstr ""
+"With automatic mail jobs and a cron job on the server, mails can be sent "
+"without manual user action."
#: classes/Gems/Default/MailLogAction.php:109
msgid "Date sent"
@@ -1375,6 +1637,7 @@
#: classes/Gems/Default/MailLogAction.php:115
#: classes/Gems/Default/MailTemplateAction.php:62
+#: classes/Gems/Email/EmailFormAbstract.php:349
msgid "Subject"
msgstr "Subject"
@@ -1417,6 +1680,7 @@
msgstr "TLS"
#: classes/Gems/Default/MailServerAction.php:80
+#: classes/Gems/User/RadiusUserDefinition.php:164
msgid "Port"
msgstr "Port"
@@ -1429,16 +1693,20 @@
msgstr "User ID"
#: classes/Gems/Default/MailServerAction.php:88
+#: classes/Gems/User/Form/LoginForm.php:127
msgid "Password"
msgstr "Password"
#: classes/Gems/Default/MailServerAction.php:90
#: classes/Gems/Default/SourceAction.php:95
+#: classes/Gems/User/Form/ChangePasswordForm.php:241
+#: classes/Gems/User/Form/ChangePasswordForm.php:287
msgid "Repeat password"
msgstr "Repeat password"
#: classes/Gems/Default/MailServerAction.php:91
#: classes/Gems/Default/SourceAction.php:74
+#: classes/Gems/User/RadiusUserDefinition.php:169
msgid "Enter only when changing"
msgstr "Enter only when changing the password"
@@ -1453,7 +1721,9 @@
msgstr "Email servers"
#: classes/Gems/Default/MailTemplateAction.php:76
-#: classes/Gems/Default/RespondentAction.php:349
+#: classes/Gems/Default/RespondentAction.php:394
+#: classes/Gems/Default/StaffAction.php:335
+#: classes/Gems/Default/StaffAction.php:405
msgid "(all organizations)"
msgstr "(all organizations)"
@@ -1477,7 +1747,8 @@
#: classes/Gems/Default/OptionAction.php:136
#: classes/Gems/Default/OrganizationAction.php:147
-#: classes/Gems/Default/RespondentAction.php:195
+#: classes/Gems/Default/RespondentAction.php:203
+#: classes/Gems/Default/StaffAction.php:351
msgid "Language"
msgstr "Language"
@@ -1487,8 +1758,12 @@
msgstr "Options"
#: classes/Gems/Default/OptionAction.php:155
-msgid "This overview provides information about the last login activity on your account."
-msgstr "This overview provides information about the last login activity on your account."
+msgid ""
+"This overview provides information about the last login activity on your "
+"account."
+msgstr ""
+"This overview provides information about the last login activity on your "
+"account."
#: classes/Gems/Default/OptionAction.php:175
msgid "Date / time"
@@ -1499,6 +1774,7 @@
msgstr "Item"
#: classes/Gems/Default/OrganizationAction.php:104
+#: classes/Gems/Model/HiddenOrganizationModel.php:113
msgid "Inaccessible or unknown organization"
msgstr "Inaccessible or unknown organization"
@@ -1528,14 +1804,19 @@
#: classes/Gems/Default/OrganizationAction.php:141
#, php-format
-msgid "Always switch to this organization when %s is accessed from one of these space separated url's. The first is used for mails."
-msgstr "Always switch to this organization when %s is accessed from one of these space separated url's. The first is used for mails."
+msgid ""
+"Always switch to this organization when %s is accessed from one of these "
+"space separated url's. The first is used for mails."
+msgstr ""
+"Always switch to this organization when %s is accessed from one of these "
+"space separated url's. The first is used for mails."
#: classes/Gems/Default/OrganizationAction.php:151
msgid "Can the organization be used?"
msgstr "Can the organization be used?"
#: classes/Gems/Default/OrganizationAction.php:152
+#: classes/Gems/User/Form/LoginForm.php:151 views/scripts/index/login.phtml:7
msgid "Login"
msgstr "Login"
@@ -1585,10 +1866,12 @@
msgstr "Checked organizations see this organizations patients."
#: classes/Gems/Default/OrganizationAction.php:172
+#: classes/Gems/Default/SurveyMaintenanceAction.php:465
msgid "Code name"
msgstr "Code name"
#: classes/Gems/Default/OrganizationAction.php:172
+#: classes/Gems/Default/SurveyMaintenanceAction.php:465
msgid "Only for programmers."
msgstr "Only for programmers."
@@ -1597,6 +1880,7 @@
msgstr "This can not be changed yet"
#: classes/Gems/Default/OrganizationAction.php:192
+#: classes/Gems/Default/StaffAction.php:158
msgid "User Definition"
msgstr "User Definition"
@@ -1612,6 +1896,9 @@
#: classes/Gems/Default/OverviewPlanAction.php:115
#: classes/Gems/Default/ProjectSurveysAction.php:88
+#: classes/Gems/Default/SurveyAction.php:217
+#: classes/Gems/Default/SurveyMaintenanceAction.php:581
+#: classes/Gems/Tracker/Snippets/EditSingleSurveyTokenSnippetAbstract.php:157
msgid "survey"
msgid_plural "surveys"
msgstr[0] "survey"
@@ -1666,84 +1953,91 @@
msgstr "Gems code directory"
#: classes/Gems/Default/ProjectInformationAction.php:141
-msgid "Gems project path"
-msgstr "Gems project path"
-
-#: classes/Gems/Default/ProjectInformationAction.php:142
msgid "MUtil version"
msgstr "MUtil version"
-#: classes/Gems/Default/ProjectInformationAction.php:143
+#: classes/Gems/Default/ProjectInformationAction.php:142
msgid "Zend version"
msgstr "Zend version"
-#: classes/Gems/Default/ProjectInformationAction.php:144
+#: classes/Gems/Default/ProjectInformationAction.php:143
msgid "Application environment"
msgstr "Application environment"
-#: classes/Gems/Default/ProjectInformationAction.php:145
+#: classes/Gems/Default/ProjectInformationAction.php:144
msgid "Application baseuri"
msgstr "Application baseuri"
-#: classes/Gems/Default/ProjectInformationAction.php:146
+#: classes/Gems/Default/ProjectInformationAction.php:145
msgid "Application directory"
msgstr "Application directory"
-#: classes/Gems/Default/ProjectInformationAction.php:147
+#: classes/Gems/Default/ProjectInformationAction.php:146
msgid "PHP version"
msgstr "PHP version"
-#: classes/Gems/Default/ProjectInformationAction.php:148
+#: classes/Gems/Default/ProjectInformationAction.php:147
msgid "Server Hostname"
msgstr "Server Hostname"
-#: classes/Gems/Default/ProjectInformationAction.php:149
+#: classes/Gems/Default/ProjectInformationAction.php:148
msgid "Server OS"
msgstr "Server OS"
-#: classes/Gems/Default/ProjectInformationAction.php:150
+#: classes/Gems/Default/ProjectInformationAction.php:149
msgid "Time on server"
msgstr "Time on server"
-#: classes/Gems/Default/ProjectInformationAction.php:154
+#: classes/Gems/Default/ProjectInformationAction.php:153
msgid "Turn Maintenance Mode OFF"
msgstr "Turn Maintenance Mode OFF"
-#: classes/Gems/Default/ProjectInformationAction.php:156
+#: classes/Gems/Default/ProjectInformationAction.php:155
msgid "Turn Maintenance Mode ON"
msgstr "Turn Maintenance Mode ON"
-#: classes/Gems/Default/ProjectInformationAction.php:166
+#: classes/Gems/Default/ProjectInformationAction.php:165
msgid "Version information"
msgstr "Version information"
-#: classes/Gems/Default/ProjectInformationAction.php:200
+#: classes/Gems/Default/ProjectInformationAction.php:199
msgid "Server PHP Info"
msgstr "Server PHP Info"
-#: classes/Gems/Default/ProjectInformationAction.php:217
+#: classes/Gems/Default/ProjectInformationAction.php:216
msgid "Project settings"
msgstr "Project settings"
-#: classes/Gems/Default/ProjectInformationAction.php:224
+#: classes/Gems/Default/ProjectInformationAction.php:223
msgid "Session content"
msgstr "Session content"
-#: classes/Gems/Default/ProjectInformationAction.php:225
+#: classes/Gems/Default/ProjectInformationAction.php:224
+#: classes/Gems/Menu/MenuAbstract.php:352
msgid "Session"
msgstr "Session"
#: classes/Gems/Default/ProjectSurveysAction.php:68
+#: classes/Gems/Default/SurveyAction.php:202
+#: snippets/TrackSurveyOverviewSnippet.php:113
msgid "By"
msgstr "By"
#: classes/Gems/Default/ProjectSurveysAction.php:69
#: classes/Gems/Default/ProjectTracksAction.php:67
+#: classes/Gems/Default/SurveyAction.php:203
+#: classes/Gems/Default/TrackAction.php:330
+#: classes/Gems/Email/EmailFormAbstract.php:193
+#: classes/Gems/Email/EmailFormAbstract.php:251
+#: classes/Gems/Email/MailTemplateForm.php:81
+#: classes/Gems/Tracker/Model/TrackModel.php:103
msgid "From"
msgstr "From"
#: classes/Gems/Default/ProjectSurveysAction.php:70
#: classes/Gems/Default/ProjectTracksAction.php:68
+#: classes/Gems/Default/SurveyAction.php:207
+#: classes/Gems/Default/TrackAction.php:332
msgid "Until"
msgstr "Until"
@@ -1752,10 +2046,15 @@
msgstr "Active surveys"
#: classes/Gems/Default/ProjectTracksAction.php:65
+#: classes/Gems/Default/TrackAction.php:329
msgid "Survey #"
msgstr "Survey #"
#: classes/Gems/Default/ProjectTracksAction.php:85
+#: classes/Gems/Default/TrackAction.php:452
+#: classes/Gems/Default/TrackMaintenanceAction.php:331
+#: classes/Gems/Tracker/Snippets/EditTrackEngineSnippetGeneric.php:191
+#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:174
msgid "track"
msgid_plural "tracks"
msgstr[0] "track"
@@ -1771,6 +2070,7 @@
msgstr "Questions in survey %s"
#: classes/Gems/Default/ProjectTracksAction.php:118
+#: classes/Gems/Default/SurveyAction.php:93
#, php-format
msgid "Survey %s does not exist."
msgstr "Survey %s does not exist."
@@ -1780,6 +2080,7 @@
msgstr "Survey not specified."
#: classes/Gems/Default/ProjectTracksAction.php:132
+#: classes/Gems/Default/TrackActionAbstract.php:545
#, php-format
msgid "Track %s does not exist."
msgstr "Track %s does not exist."
@@ -1850,98 +2151,107 @@
msgstr[0] "reception code"
msgstr[1] "reception codes"
-#: classes/Gems/Default/RespondentAction.php:127
+#: classes/Gems/Default/RespondentAction.php:135
#, php-format
msgid "Random Example BSN: %s"
msgstr "Random Example BSN: %s"
-#: classes/Gems/Default/RespondentAction.php:129
+#: classes/Gems/Default/RespondentAction.php:137
msgid "Enter a 9-digit SSN number."
msgstr "Enter a 9-digit BSN number."
-#: classes/Gems/Default/RespondentAction.php:143
+#: classes/Gems/Default/RespondentAction.php:151
msgid "Identification"
msgstr "Identification"
-#: classes/Gems/Default/RespondentAction.php:154
+#: classes/Gems/Default/RespondentAction.php:162
msgid "SSN"
msgstr "BSN"
-#: classes/Gems/Default/RespondentAction.php:158
+#: classes/Gems/Default/RespondentAction.php:166
msgid "Patient number"
msgstr "Patient number"
-#: classes/Gems/Default/RespondentAction.php:167
+#: classes/Gems/Default/RespondentAction.php:175
msgid "Medical data"
msgstr "Medical data"
-#: classes/Gems/Default/RespondentAction.php:174
+#: classes/Gems/Default/RespondentAction.php:182
msgid "DBC's, etc..."
msgstr "DBC's, etc..."
-#: classes/Gems/Default/RespondentAction.php:177
+#: classes/Gems/Default/RespondentAction.php:185
msgid "Contact information"
msgstr "Contact information"
-#: classes/Gems/Default/RespondentAction.php:182
+#: classes/Gems/Default/RespondentAction.php:190
msgid "Respondent has no e-mail"
msgstr "Patient has no e-mail"
-#: classes/Gems/Default/RespondentAction.php:183
+#: classes/Gems/Default/RespondentAction.php:191
msgid "With housenumber"
msgstr "With housenumber"
-#: classes/Gems/Default/RespondentAction.php:190
+#: classes/Gems/Default/RespondentAction.php:198
msgid "Country"
msgstr "Country"
-#: classes/Gems/Default/RespondentAction.php:194
+#: classes/Gems/Default/RespondentAction.php:202
msgid "Settings"
msgstr "Settings"
-#: classes/Gems/Default/RespondentAction.php:196
+#: classes/Gems/Default/RespondentAction.php:204
msgid "Has the respondent signed the informed consent letter?"
msgstr "Has the patient signed the informed consent letter?"
-#: classes/Gems/Default/RespondentAction.php:228
+#: classes/Gems/Default/RespondentAction.php:236
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:203
msgid "Comments"
msgstr "Comments"
-#: classes/Gems/Default/RespondentAction.php:229
+#: classes/Gems/Default/RespondentAction.php:237
msgid "Treatment"
msgstr "Treatment"
-#: classes/Gems/Default/RespondentAction.php:257
+#: classes/Gems/Default/RespondentAction.php:265
+#: classes/Gems/Default/TrackAction.php:132
+#: classes/Gems/Default/TrackAction.php:482
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:212
+#: snippets/DeleteInSourceTrackSnippet.php:112
+#: snippets/EditTrackSnippet.php:95
msgid "Rejection code"
msgstr "Rejection code"
-#: classes/Gems/Default/RespondentAction.php:264
+#: classes/Gems/Default/RespondentAction.php:272
msgid "Delete respondent"
msgstr "Delete patient"
-#: classes/Gems/Default/RespondentAction.php:296
+#: classes/Gems/Default/RespondentAction.php:304
msgid "Respondent deleted."
msgstr "Patient deleted"
-#: classes/Gems/Default/RespondentAction.php:300
+#: classes/Gems/Default/RespondentAction.php:308
msgid "Respondent tracks stopped."
msgstr "Patient tracks stopped."
-#: classes/Gems/Default/RespondentAction.php:304
+#: classes/Gems/Default/RespondentAction.php:312
+#: classes/Gems/Default/TrackAction.php:405
msgid "Choose a reception code to delete."
msgstr "Choose a reception code to delete."
-#: classes/Gems/Default/RespondentAction.php:420
+#: classes/Gems/Default/RespondentAction.php:465
msgid "respondent"
msgid_plural "respondents"
msgstr[0] "patient"
msgstr[1] "patients"
-#: classes/Gems/Default/RespondentAction.php:495
+#: classes/Gems/Default/RespondentAction.php:557
msgid "Please settle the informed consent form for this respondent."
msgstr "Please settle the informed consent form for this patient."
#: classes/Gems/Default/RespondentExportAction.php:54
+#: classes/Gems/Default/TrackAction.php:121
+#: snippets/DeleteInSourceTrackSnippet.php:82 snippets/EditTrackSnippet.php:72
msgid "Respondent number"
msgstr "Patient number"
@@ -1950,18 +2260,37 @@
msgstr "Separate multiple respondents with a comma (,)"
#: classes/Gems/Default/RespondentPlanAction.php:67
+#: classes/Gems/Default/SurveyAction.php:181
+#: classes/Gems/Default/TrackAction.php:297
+#: snippets/DeleteInSourceTrackSnippet.php:132
+#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:174
+#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:145
+#: snippets/DeleteTrackTokenSnippet.php:195
+#: snippets/EditSingleSurveyTokenSnippet.php:134
+#: snippets/EditTrackSnippet.php:110 snippets/EditTrackTokenSnippet.php:144
+#: snippets/ShowSingleSurveyTokenSnippet.php:140
+#: snippets/ShowTrackTokenSnippet.php:146
msgid "Show respondent"
msgstr "Show patient"
#: classes/Gems/Default/RespondentPlanAction.php:73
+#: classes/Gems/Default/TrackAction.php:266
+#: classes/Gems/Default/TrackAction.php:285
+#: snippets/DeleteInSourceTrackSnippet.php:129
+#: snippets/EditTrackSnippet.php:108 snippets/EditTrackTokenSnippet.php:142
+#: snippets/ShowTrackTokenSnippet.php:145
msgid "Show track"
msgstr "Show track"
#: classes/Gems/Default/RespondentPlanAction.php:136
+#: classes/Gems/Default/TrackAction.php:317
+#: snippets/ShowTrackUsageSnippet.php:103
msgid " of "
msgstr " of "
#: classes/Gems/Default/RespondentPlanAction.php:137
+#: classes/Gems/Default/TrackAction.php:318
+#: snippets/ShowTrackUsageSnippet.php:104
msgid "Progress"
msgstr "Progress"
@@ -2060,20 +2389,40 @@
msgstr "Database Password"
#: classes/Gems/Default/SourceAction.php:115
-msgid "Check tokens for being answered or not, reruns survey and round event code on completed tokens and recalculates the start and end times of all tokens in tracks that have completed tokens."
-msgstr "Check tokens for being answered or not, reruns survey and round event code on completed tokens and recalculates the start and end times of all tokens in tracks that have completed tokens."
+msgid ""
+"Check tokens for being answered or not, reruns survey and round event code "
+"on completed tokens and recalculates the start and end times of all tokens "
+"in tracks that have completed tokens."
+msgstr ""
+"Check tokens for being answered or not, reruns survey and round event code "
+"on completed tokens and recalculates the start and end times of all tokens "
+"in tracks that have completed tokens."
#: classes/Gems/Default/SourceAction.php:116
-msgid "Run this code when survey result fields, survey or round events or the event code has changed or after bulk changes in a survey source."
-msgstr "Run this code when survey result fields, survey or round events or the event code has changed or after bulk changes in a survey source."
+msgid ""
+"Run this code when survey result fields, survey or round events or the event "
+"code has changed or after bulk changes in a survey source."
+msgstr ""
+"Run this code when survey result fields, survey or round events or the event "
+"code has changed or after bulk changes in a survey source."
#: classes/Gems/Default/SourceAction.php:126
-msgid "Check source for new surveys, changes in survey status and survey deletion. Can also perform maintenance on some sources, e.g. by changing the number of attributes."
-msgstr "Check source for new surveys, changes in survey status and survey deletion. Can also perform maintenance on some sources, e.g. by changing the number of attributes."
+msgid ""
+"Check source for new surveys, changes in survey status and survey deletion. "
+"Can also perform maintenance on some sources, e.g. by changing the number of "
+"attributes."
+msgstr ""
+"Check source for new surveys, changes in survey status and survey deletion. "
+"Can also perform maintenance on some sources, e.g. by changing the number of "
+"attributes."
#: classes/Gems/Default/SourceAction.php:127
-msgid "Run this code when the status of a survey in a source has changed or when the code has changed and the source must be adapted."
-msgstr "Run this code when the status of a survey in a source has changed or when the code has changed and the source must be adapted."
+msgid ""
+"Run this code when the status of a survey in a source has changed or when "
+"the code has changed and the source must be adapted."
+msgstr ""
+"Run this code when the status of a survey in a source has changed or when "
+"the code has changed and the source must be adapted."
#: classes/Gems/Default/SourceAction.php:140
#, php-format
@@ -2085,8 +2434,12 @@
msgstr "Refreshes the attributes for a token as stored in the source."
#: classes/Gems/Default/SourceAction.php:146
-msgid "Run this code when the number of attributes has changed or when you suspect the attributes have been corrupted somehow."
-msgstr "Run this code when the number of attributes has changed or when you suspect the attributes have been corrupted somehow."
+msgid ""
+"Run this code when the number of attributes has changed or when you suspect "
+"the attributes have been corrupted somehow."
+msgstr ""
+"Run this code when the number of attributes has changed or when you suspect "
+"the attributes have been corrupted somehow."
#: classes/Gems/Default/SourceAction.php:159
#, php-format
@@ -2140,6 +2493,7 @@
msgstr[1] "sources"
#: classes/Gems/Default/SourceAction.php:249
+#: classes/Gems/Menu/MenuAbstract.php:447
msgid "Survey Sources"
msgstr "Survey Sources"
@@ -2182,10 +2536,15 @@
#: classes/Gems/Default/StaffAction.php:268
#, php-format
-msgid "User with id %s already exists but is deleted, do you want to reactivate the account?"
-msgstr "User with id %s already exists but is deleted, do you want to reactivate the account?"
+msgid ""
+"User with id %s already exists but is deleted, do you want to reactivate the "
+"account?"
+msgstr ""
+"User with id %s already exists but is deleted, do you want to reactivate the "
+"account?"
-#: classes/Gems/Default/StaffAction.php:327
+#: classes/Gems/Default/StaffAction.php:327 classes/Gems/User/User.php:1208
+#: classes/Gems/User/Form/OrganizationFormAbstract.php:232
msgid "Username"
msgstr "Username"
@@ -2216,232 +2575,252 @@
msgid "You are not allowed to change this password."
msgstr "You are not allowed to change this password."
-#: classes/Gems/Default/SurveyAction.php:64
+#: classes/Gems/Default/SurveyAction.php:72
+#: classes/Gems/Tracker/Snippets/EditSingleSurveyTokenSnippetAbstract.php:179
msgid "Add survey"
msgstr "Add survey"
-#: classes/Gems/Default/SurveyAction.php:67
+#: classes/Gems/Default/SurveyAction.php:75
#, php-format
msgid "Add another %s survey"
msgstr "Add another %s survey"
-#: classes/Gems/Default/SurveyAction.php:70
+#: classes/Gems/Default/SurveyAction.php:78
#, php-format
msgid "Adding the %s survey to respondent %s"
msgstr "Adding the %s survey to patient %s"
-#: classes/Gems/Default/SurveyAction.php:73
+#: classes/Gems/Default/SurveyAction.php:81
msgid "Available surveys"
msgstr "Available surveys"
-#: classes/Gems/Default/SurveyAction.php:76
+#: classes/Gems/Default/SurveyAction.php:84
msgid "No surveys found"
msgstr "No surveys found"
-#: classes/Gems/Default/SurveyAction.php:79
+#: classes/Gems/Default/SurveyAction.php:87
#, php-format
msgid "Overview of %s...
[truncated message content] |
|
From: <gem...@li...> - 2012-11-27 11:08:53
|
Revision: 1043
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1043&view=rev
Author: mennodekker
Date: 2012-11-27 11:08:46 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Allow better fieldsize for SPSS export depending on answermodel
Added help for SPSS export
General SPSS export cleanup
Modified Paths:
--------------
trunk/library/classes/Gems/Export/Spss.php
Modified: trunk/library/classes/Gems/Export/Spss.php
===================================================================
--- trunk/library/classes/Gems/Export/Spss.php 2012-11-27 09:50:46 UTC (rev 1042)
+++ trunk/library/classes/Gems/Export/Spss.php 2012-11-27 11:08:46 UTC (rev 1043)
@@ -48,6 +48,22 @@
class Gems_Export_Spss extends Gems_Export_ExportAbstract
{
/**
+ * When no other size available in the answermodel, this will be used
+ * for the size of alphanumeric types
+ *
+ * @var int
+ */
+ public $defaultAlphaSize = 64;
+
+ /**
+ * When no other size available in the answermodel, this will be used
+ * for the size of numeric types
+ *
+ * @var int
+ */
+ public $defaultNumericSize = 5;
+
+ /**
* Set response headers and clean output
*
* @param string $filename
@@ -78,12 +94,13 @@
{
$element = new Zend_Form_Element_Radio('file');
$element->setLabel($this->_('Which file'));
- $element->setMultiOptions(array('syntax' => $this->_('syntax'),
- 'data' => $this->_('data')));
+ $element->setMultiOptions(array(
+ 'syntax' => $this->_('syntax'),
+ 'data' => $this->_('data')));
$elements[] = $element;
- $element = new MUtil_Form_Element_Exhibitor('help');
- $element->setValue($this->_('Some help for this export'));
+ $element = new MUtil_Form_Element_Exhibitor('help');
+ $element->setValue($this->_('You need both a syntax and a data file. After downloading, open the syntax file in SPSS and modify the line /FILE="filename.dat" to include the full path to your data file. Then choose Run -> All to execute the syntax.'));
$elements[] = $element;
return $elements;
@@ -116,13 +133,97 @@
if (isset($options['file'])) {
if ($options['file'] == 'syntax') {
- $filename = $survey->getName() . '.sps';
- $filenameDat = $survey->getName() . '.dat';
- $response = $this->_doHeaders($filename);
+ $this->handleExportSyntax($data, $survey, $answers, $answerModel, $language);
+ } else {
+ $this->handleExportData($data, $survey, $answers, $answerModel, $language);
+ }
+ }
+ }
- //first output our script
- $response->appendBody(
- "SET UNICODE=ON.
+ /**
+ * This method handles the export with the given options for a syntax file
+ *
+ * The method takes care of rendering the right script by using $this->export->controller to
+ * access the controller object.
+ *
+ * @param array $data The formdata
+ * @param Gems_Tracker_Survey $survey The survey object we are exporting
+ * @param array $answers The array of answers
+ * @param MUtil_Model_ModelAbstract $answerModel The modified answermodel that includes info about extra attributes
+ * @param string $language The language used / to use for the export
+ */
+ public function handeExportData($data, $survey, $answers, $answerModel, $language)
+ {
+ $filename = $survey->getName() . '.dat';
+ $response = $this->_doHeaders($filename);
+
+ //We should create a model with the transformations we need
+ //think of date translations, numers and strings
+ $answerRow = reset($answers);
+ $spssModel = new Gems_Export_ExportModel();
+ foreach ($answerRow as $key => $value) {
+ $options = array();
+ $type = $answerModel->get($key, 'type');
+ switch ($type) {
+ case MUtil_Model::TYPE_DATE:
+ $options['storageFormat'] = 'yyyy-MM-dd';
+ $options['dateFormat'] = 'yyyy-MM-dd';
+ break;
+
+ case MUtil_Model::TYPE_DATETIME:
+ $options['storageFormat'] = 'yyyy-MM-dd HH:mm:ss';
+ $options['dateFormat'] = 'dd-MM-yyyy HH:mm:ss';
+ break;
+
+ case MUtil_Model::TYPE_TIME:
+ $options['storageFormat'] = 'HH:mm:ss';
+ $options['dateFormat'] = 'HH:mm:ss';
+ break;
+
+ case MUtil_Model::TYPE_NUMERIC:
+ break;
+
+ //When no type set... assume string
+ case MUtil_Model::TYPE_STRING:
+ default:
+ $type = MUtil_Model::TYPE_STRING;
+ $options['formatFunction'] = $this->formatString;
+ break;
+ }
+ $options['type'] = $type;
+ $spssModel->set($key, $options);
+ }
+ //Now apply the model to the answers
+ $answers = new Gems_FormattedData($answers, $spssModel);
+
+ //And output the data
+ foreach ($answers as $answerRow) {
+ $resultRow = implode(',', $answerRow);
+ $response->appendBody($resultRow . "\n");
+ }
+ }
+
+ /**
+ * This method handles the export with the given options for a syntax file
+ *
+ * The method takes care of rendering the right script by using $this->export->controller to
+ * access the controller object.
+ *
+ * @param array $data The formdata
+ * @param Gems_Tracker_Survey $survey The survey object we are exporting
+ * @param array $answers The array of answers
+ * @param MUtil_Model_ModelAbstract $answerModel The modified answermodel that includes info about extra attributes
+ * @param string $language The language used / to use for the export
+ */
+ protected function handleExportSyntax($data, $survey, $answers, $answerModel, $language)
+ {
+ $filename = $survey->getName() . '.sps';
+ $filenameDat = $survey->getName() . '.dat';
+ $response = $this->_doHeaders($filename);
+
+ //first output our script
+ $response->appendBody(
+ "SET UNICODE=ON.
GET DATA
/TYPE=TXT
/FILE=\"" . $filenameDat . "\"
@@ -133,126 +234,79 @@
/FIRSTCASE=1
/IMPORTCASE=ALL
/VARIABLES=");
- $answerRow = reset($answers);
- $labels = array();
- $types = array();
- $fixedNames = array();
- $questions = $survey->getQuestionList($language);
- foreach ($answerRow as $key => $value) {
- $fixedNames[$key] = $this->fixName($key);
- $options = array();
- $type = $answerModel->get($key, 'type');
- switch ($type) {
- case MUtil_Model::TYPE_DATE:
- $type = 'SDATE10';
- break;
+ $answerRow = reset($answers);
+ $labels = array();
+ $types = array();
+ $fixedNames = array();
+ $questions = $survey->getQuestionList($language);
+ foreach ($answerRow as $key => $value) {
+ $fixedNames[$key] = $this->fixName($key);
+ $options = array();
+ $type = $answerModel->get($key, 'type');
+ switch ($type) {
+ case MUtil_Model::TYPE_DATE:
+ $type = 'SDATE10';
+ break;
- case MUtil_Model::TYPE_DATETIME:
- case MUtil_Model::TYPE_TIME:
- $type = 'DATETIME23';
- break;
+ case MUtil_Model::TYPE_DATETIME:
+ case MUtil_Model::TYPE_TIME:
+ $type = 'DATETIME23';
+ break;
- case MUtil_Model::TYPE_NUMERIC:
- $defaultSize = 5;
- $type = 'F';
- break;
+ case MUtil_Model::TYPE_NUMERIC:
+ $defaultSize = $this->defaultNumericSize;
+ $type = 'F';
+ break;
- //When no type set... assume string
- case MUtil_Model::TYPE_STRING:
- default:
- $defaultSize = 64;
- $type = 'A';
- break;
+ //When no type set... assume string
+ case MUtil_Model::TYPE_STRING:
+ default:
+ $defaultSize = $this->defaultAlphaSize;
+ $type = 'A';
+ break;
+ }
+ $types[$key] = $type;
+ if ($type == 'A' || $type == 'F') {
+ $size = $answerModel->get($key, 'maxlength'); // This comes from db when available
+ if (is_null($size)) {
+ $size = $answerModel->get($key, 'size'); // This is the display width
+ if ($is_null($size)) {
+ $size = $defaultSize; // We just don't know, make it the default
}
- $types[$key] = $type;
- if ($type == 'A' || $type == 'F') {
- $size = $answerModel->get($key, 'size');
- if (is_null($size)) {
- $size = $defaultSize;
- }
- if ($type == 'A') {
- $type = $type . $size;
- } else {
- $type = $type . $size . '.' . ($size - 1); //decimal
- }
- }
- if (isset($questions[$key])) {
- $labels[$key] = $questions[$key];
- }
- $response->appendBody("\n " . $fixedNames[$key] . ' ' . $type);
}
- $response->appendBody(".\nCACHE.\nEXECUTE.\n");
- $response->appendBody("\n*Define variable labels.\n");
- foreach ($labels as $key => $label) {
- $label = $this->formatString($label);
- $response->appendBody("VARIABLE LABELS " . $fixedNames[$key] . " " . $label . "." . "\n");
+ if ($type == 'A') {
+ $type = $type . $size;
+ } else {
+ $type = $type . $size . '.' . ($size - 1); //decimal
}
+ }
+ if (isset($questions[$key])) {
+ $labels[$key] = $questions[$key];
+ }
+ $response->appendBody("\n " . $fixedNames[$key] . ' ' . $type);
+ }
+ $response->appendBody(".\nCACHE.\nEXECUTE.\n");
+ $response->appendBody("\n*Define variable labels.\n");
+ foreach ($labels as $key => $label) {
+ $label = $this->formatString($label);
+ $response->appendBody("VARIABLE LABELS " . $fixedNames[$key] . " " . $label . "." . "\n");
+ }
- $response->appendBody("\n*Define value labels.\n");
- foreach ($answerRow as $key => $value) {
- if ($options = $answerModel->get($key, 'multiOptions')) {
- $response->appendBody('VALUE LABELS ' . $fixedNames[$key]);
- foreach ($options as $option => $label) {
- $label = $this->formatString($label);
- if ($types[$key] == 'F') {
- //Numeric
- $response->appendBody("\n" . $option . ' ' . $label);
- } else {
- //String
- $response->appendBody("\n" . '"' . $option . '" ' . $label);
- }
- }
- $response->appendBody(".\n\n");
+ $response->appendBody("\n*Define value labels.\n");
+ foreach ($answerRow as $key => $value) {
+ if ($options = $answerModel->get($key, 'multiOptions')) {
+ $response->appendBody('VALUE LABELS ' . $fixedNames[$key]);
+ foreach ($options as $option => $label) {
+ $label = $this->formatString($label);
+ if ($types[$key] == 'F') {
+ //Numeric
+ $response->appendBody("\n" . $option . ' ' . $label);
+ } else {
+ //String
+ $response->appendBody("\n" . '"' . $option . '" ' . $label);
}
}
- } else {
- $filename = $survey->getName() . '.dat';
- $response = $this->_doHeaders($filename);
-
- //We should create a model with the transformations we need
- //think of date translations, numers and strings
- $answerRow = reset($answers);
- $spssModel = new Gems_Export_ExportModel();
- foreach ($answerRow as $key => $value) {
- $options = array();
- $type = $answerModel->get($key, 'type');
- switch ($type) {
- case MUtil_Model::TYPE_DATE:
- $options['storageFormat'] = 'yyyy-MM-dd';
- $options['dateFormat'] = 'yyyy-MM-dd';
- break;
-
- case MUtil_Model::TYPE_DATETIME:
- $options['storageFormat'] = 'yyyy-MM-dd HH:mm:ss';
- $options['dateFormat'] = 'dd-MM-yyyy HH:mm:ss';
- break;
-
- case MUtil_Model::TYPE_TIME:
- $options['storageFormat'] = 'HH:mm:ss';
- $options['dateFormat'] = 'HH:mm:ss';
- break;
-
- case MUtil_Model::TYPE_NUMERIC:
- break;
-
- //When no type set... assume string
- case MUtil_Model::TYPE_STRING:
- default:
- $type = MUtil_Model::TYPE_STRING;
- $options['formatFunction'] = $this->formatString;
- break;
- }
- $options['type'] = $type;
- $spssModel->set($key, $options);
- }
- //Now apply the model to the answers
- $answers = new Gems_FormattedData($answers, $spssModel);
-
- //And output the data
- foreach ($answers as $answerRow) {
- $resultRow = implode(',', $answerRow);
- $response->appendBody($resultRow . "\n");
- }
+ $response->appendBody(".\n\n");
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-27 09:50:52
|
Revision: 1042
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1042&view=rev
Author: mennodekker
Date: 2012-11-27 09:50:46 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Some unfinished work...
Modified Paths:
--------------
branches/receptioncodes/library/classes/Gems/Tracker/ReceptionCode.php
Added Paths:
-----------
branches/receptioncodes/library/classes/Gems/Event/ReceptionCode/ReceptionCodeEventAbstract.php
branches/receptioncodes/library/classes/Gems/Tracker/Respondent.php
Added: branches/receptioncodes/library/classes/Gems/Event/ReceptionCode/ReceptionCodeEventAbstract.php
===================================================================
--- branches/receptioncodes/library/classes/Gems/Event/ReceptionCode/ReceptionCodeEventAbstract.php (rev 0)
+++ branches/receptioncodes/library/classes/Gems/Event/ReceptionCode/ReceptionCodeEventAbstract.php 2012-11-27 09:50:46 UTC (rev 1042)
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ * Description of ReceptionCodeEventAbstract
+ *
+ * @author 175780
+ */
+class Gems_Event_ReceptionCode_ReceptionCodeEventAbstract implements Gems_Event_ReceptionCodeEventInterface {
+
+ public function setReceptionCode($object, $receptionCode, $comment, $userId)
+ {
+ // Perform your own logic here
+ }
+
+ protected function cascade($object, $receptionCode, $comment, $userId) {
+ if ($object instanceof Gems_Tracker_Token) {
+ $this->cascadeToken($object, $receptionCode, $comment, $userId);
+ }
+ }
+
+ /**
+ * Handles cascading FROM a respondent object down
+ *
+ * @param type $object
+ * @param type $receptionCode
+ * @param type $comment
+ * @param type $userId
+ */
+ protected function cascadeRespondent($object, $receptionCode, $comment, $userId) {
+
+ }
+
+ protected function cascadeToken($object, $receptionCode, $comment, $userId) {
+
+ }
+
+ protected function cascadeTrack($object, $receptionCode, $comment, $userId) {
+
+ }
+}
\ No newline at end of file
Modified: branches/receptioncodes/library/classes/Gems/Tracker/ReceptionCode.php
===================================================================
--- branches/receptioncodes/library/classes/Gems/Tracker/ReceptionCode.php 2012-11-26 13:30:22 UTC (rev 1041)
+++ branches/receptioncodes/library/classes/Gems/Tracker/ReceptionCode.php 2012-11-27 09:50:46 UTC (rev 1042)
@@ -57,6 +57,12 @@
* @var Zend_Db_Adapter_Abstract
*/
protected $db;
+
+ /**
+ *
+ * @var Gems_Loader
+ */
+ protected $loader;
/**
* Compatibility mode, for use with logical operators returns this->getCode()
@@ -96,6 +102,31 @@
{
return $this->_get('grc_description');
}
+
+ /**
+ *
+ * @return Gems_Event_ReceptionCodeEventInterface
+ */
+ public function getEvent()
+ {
+ return $this->loader->getEvents()->loadReceptionCodeEvent($this->_get('grc_event'));
+ }
+
+ /**
+ * Handle the set receptioncode event
+ *
+ * This code is executed by the object where the reception code is set. Further
+ * cascading to other objects should be handled by the event.
+ *
+ * @param type $object The object that initially gets the receptioncode
+ * @param Gems_Tracker_ReceptionCode $receptionCode
+ * @param string $comment
+ * @param int $userId
+ * @return int 0 for no change 1 for any number of changes
+ */
+ public function handleEvent($object, $receptionCode, $comment, $userId) {
+ return $this->getEvent()->setReceptionCode($object, $receptionCode, $comment, $userId);
+ }
/**
*
Added: branches/receptioncodes/library/classes/Gems/Tracker/Respondent.php
===================================================================
--- branches/receptioncodes/library/classes/Gems/Tracker/Respondent.php (rev 0)
+++ branches/receptioncodes/library/classes/Gems/Tracker/Respondent.php 2012-11-27 09:50:46 UTC (rev 1042)
@@ -0,0 +1,241 @@
+<?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 Tracker
+ * @author Menno Dekker <men...@er...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: RespondentTrack.php 1033 2012-11-22 12:13:08Z mennodekker $
+ */
+
+/**
+ *
+ * @package Gems
+ * @subpackage Tracker
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.6
+ */
+class Gems_Tracker_Respondent extends Gems_Registry_TargetAbstract
+{
+ /**
+ *
+ * @var array The gems__respondents data
+ */
+ protected $_respondentData;
+
+ /**
+ *
+ * @var int The gems__respondents id
+ */
+ protected $_respondentId;
+
+ /**
+ *
+ * @var int The gems__respondent2org id
+ */
+ protected $_respondentOrgId;
+
+ /**
+ *
+ * @var Gems_Tracker
+ */
+ protected $tracker;
+
+ /**
+ *
+ * @var Gems_Loader
+ */
+ protected $loader;
+
+ /**
+ *
+ * @var Gems_Model_RespondentModel
+ */
+ protected $model;
+
+ /**
+ * @param mixed $respondentData RespondentId or array containing respondent & respondent2org record
+ * @param int $respondentOrgId Organization this respondent belongs to
+ */
+ public function __construct($respondentData, $respondentOrgId = null)
+ {
+ if (is_array($respondentData)) {
+ $this->_respondentData = $respondentData;
+ $this->init();
+ } else {
+ $this->_respondentId = $respondentData;
+ $this->_respondentOrgId = $respondentOrgId;
+ }
+ }
+
+
+ /**
+ * 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->_respondentData) {
+ $this->refresh();
+ }
+
+ return (boolean) $this->_respondentData;
+ }
+
+ /**
+ *
+ * @return string The respondents patient number
+ */
+ public function getPatientNumber()
+ {
+ if (! isset($this->_respTrackData['gr2o_patient_nr'])) {
+ $this->refresh();
+ }
+
+ return $this->_respTrackData['gr2o_patient_nr'];
+ }
+
+ /**
+ *
+ * @return int The organization id
+ */
+ public function getOrganizationId()
+ {
+ return $this->_respondentOrgId;
+ }
+
+ public function getReceptionCode()
+ {
+ return $this->tracker->getReceptionCode($this->_respondentData['gr2o_reception_code']);
+ }
+
+ /**
+ *
+ * @return int The respondent id
+ */
+ public function getRespondentId()
+ {
+ return $this->_respondentId;
+ }
+
+ /**
+ * Get the respondentmodel for this respondent
+ *
+ * Used internally for retrieving and storing respondents
+ *
+ * @return Gems_Model_RespondentModel
+ */
+ public function getRespondentModel()
+ {
+ if (! $this->_model instanceof Gems_Model_RespondentModel) {
+ $this->_model = $this->loader->getModels()->getRespondentModel(true);
+ }
+
+ return $this->_model;
+ }
+
+ /**
+ * Handles setting or resetting respondentId and RespondentOrgId
+ */
+ public function init() {
+ $this->_respondentId = isset($this->_respondentData['grs_id_user']) ? $this->_respondentData['grs_id_user'] : null;
+ $this->_respondentOrgId = isset($this->_respondentData['gr2o_id_organization']) ? $this->_respondentData['gr2o_id_organization'] : null;
+ }
+
+
+ /**
+ *
+ * @param array $respondentData Optional, the data refresh with, otherwise refresh from database.
+ * @return Gems_Tracker_RespondentTrack (continuation pattern)
+ */
+ public function refresh(array $respondentData = null)
+ {
+ if (is_array($respondentData)) {
+ $this->_respondentData = $respondentData + $this->_respondentData;
+ $this->init();
+
+ } elseif (!is_null($this->_respondentId)) {
+ $respondentData = $this->getRespondentModel()->loadFirst(array(
+ 'grs_id_user' => $this->_respondentId,
+ 'gr2o_id_organization' => $this->_respondentOrgId
+ ));
+ if ($respondentData) {
+ $this->_respondentData = $respondentData;
+ $this->init();
+ } else {
+ $this->_respondentData = array();
+ $this->init();
+ }
+
+ }
+
+ return $this;
+ }
+
+ /**
+ * Set the reception code for this respondent track and make sure the
+ * necessary cascade to the tokens and thus the source takes place.
+ *
+ * @param string $code The new (non-success) reception code or a Gems_Tracker_ReceptionCode object
+ * @param string $comment Comment for tokens. False values leave value unchanged
+ * @param int $userId The current user
+ * @return int 1 if the token has changed, 0 otherwise
+ */
+ public function setReceptionCode($code, $comment, $userId)
+ {
+ // Make sure it is a Gems_Tracker_ReceptionCode object
+ if (! $code instanceof Gems_Tracker_ReceptionCode) {
+ $code = $this->tracker->getReceptionCode($code);
+ }
+ $changed = 0;
+
+ $values = array(
+ 'grs_id_user'=>$this->_respondentId,
+ 'gr2o_id_organization'=>$this->_respondentId,
+ );
+ // We can not handle saving a comment for this code, so just enter the code
+ // $values['gr2t_comment'] = $comment;
+ $values['gr2o_reception_code'] = $code->getCode();
+
+ $model = $this->getRespondentModel();
+ $newValues = $model->save($values);
+ $changed = (bool) $model->getChanged();
+ if ($changed) {
+ $this->refresh();
+ }
+
+ $eventChanged = $code->handleEvent($this, $code, $comment, $userId);
+ $changed = ($changed || $eventChanged);
+
+ return $changed;
+ }
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-26 13:30:33
|
Revision: 1041
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1041&view=rev
Author: matijsdejong
Date: 2012-11-26 13:30:22 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
Mail jobs for specific surveys or tracks are handled before the more general mail jobs
Modified Paths:
--------------
trunk/library/classes/Gems/Default/CronAction.php
Modified: trunk/library/classes/Gems/Default/CronAction.php
===================================================================
--- trunk/library/classes/Gems/Default/CronAction.php 2012-11-23 16:01:24 UTC (rev 1040)
+++ trunk/library/classes/Gems/Default/CronAction.php 2012-11-26 13:30:22 UTC (rev 1041)
@@ -148,10 +148,16 @@
$model = $this->loader->getTracker()->getTokenModel();
$mailer = new Gems_Email_TemplateMailer($this->escort);
$mailer->continueOnError = true;
-
+
// $mailer->setDefaultTransport(new MUtil_Mail_Transport_EchoLog());
+ $sql = "SELECT *
+ FROM gems__mail_jobs
+ WHERE gmj_active = 1
+ ORDER BY CASE WHEN gmj_id_survey IS NULL THEN 1 ELSE 0 END,
+ CASE WHEN gmj_id_track IS NULL THEN 1 ELSE 0 END,
+ CASE WHEN gmj_id_organization IS NULL THEN 1 ELSE 0 END";
- $jobs = $this->db->fetchAll("SELECT * FROM gems__mail_jobs WHERE gmj_active = 1");
+ $jobs = $this->db->fetchAll($sql);
if ($jobs) {
foreach ($jobs as $job) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-23 16:01:34
|
Revision: 1040
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1040&view=rev
Author: matijsdejong
Date: 2012-11-23 16:01:24 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Moved code back to project
Modified Paths:
--------------
trunk/test/library/project-bootstrap.php
Modified: trunk/test/library/project-bootstrap.php
===================================================================
--- trunk/test/library/project-bootstrap.php 2012-11-22 17:30:58 UTC (rev 1039)
+++ trunk/test/library/project-bootstrap.php 2012-11-23 16:01:24 UTC (rev 1040)
@@ -40,6 +40,3 @@
$autoloader->registerNameSpace('ZFDebug_');
Zend_Session::$_unitTestEnabled = true;
-
-// Needed for url output while checking for errors
-$_SERVER['SERVER_NAME'] = 'test';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-22 17:31:08
|
Revision: 1039
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1039&view=rev
Author: matijsdejong
Date: 2012-11-22 17:30:58 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
Put the test classes earlier in class path to allow overruling
Made fake Cookies class
Modified Paths:
--------------
trunk/test/library/project-bootstrap.php
Added Paths:
-----------
trunk/test/library/Gems/Cookies.php
Added: trunk/test/library/Gems/Cookies.php
===================================================================
--- trunk/test/library/Gems/Cookies.php (rev 0)
+++ trunk/test/library/Gems/Cookies.php 2012-11-22 17:30:58 UTC (rev 1039)
@@ -0,0 +1,131 @@
+<?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 Cookies
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: Cookies.php 666 2012-05-04 09:44:43Z michieltcs $
+ */
+
+/**
+ * TEST Static Gems cookie utilities
+ *
+ * DOES NOT REALLY SET COOKIES
+ *
+ * @package Gems
+ * @subpackage Cookies
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
+ */
+class Gems_Cookies
+{
+ const LOCALE_COOKIE = 'gems_locale';
+ const ORGANIZATION_COOKIE = 'gems_organization';
+
+ /**
+ * Get a specific cookie from the request.
+ *
+ * @param Zend_Controller_Request_Abstract $request
+ * @param string $name
+ * @param mixed $default
+ * @return mixed Cookie value
+ */
+ public static function get(Zend_Controller_Request_Abstract $request, $name, $default = null)
+ {
+ return $request->getCookie($name, $default);
+ }
+
+ /**
+ * Get the current locale from the cookie.
+ *
+ * @param Zend_Controller_Request_Abstract $request
+ * @return string The current locale
+ */
+ public static function getLocale(Zend_Controller_Request_Abstract $request)
+ {
+ return self::get($request, self::LOCALE_COOKIE);
+ }
+
+ /**
+ * Get the current organization from the cookie.
+ *
+ * @param Zend_Controller_Request_Abstract $request
+ * @return int The current organization
+ */
+ public static function getOrganization(Zend_Controller_Request_Abstract $request)
+ {
+ return intval(self::get($request, self::ORGANIZATION_COOKIE));
+ }
+
+ /**
+ * Store this cookie in a generic save method that works for both sub-directory
+ * installations and own url installations.
+ *
+ * @param string $name Name of the cookie
+ * @param mixed $value Value to set
+ * @param int $days Number of days to keep this cookie
+ * @param string $basepath The folder of the domain, if any.
+ * @return boolean True if the cookie was stored.
+ */
+ public static function set($name, $value, $days = 30, $basepath = '/')
+ {
+ return true;
+ }
+
+ /**
+ * Store the locale in a cookie.
+ *
+ * @param string $locale Locale to store
+ * @param string $basepath The folder of the domain, if any.
+ * @return boolean True if the cookie was stored.
+ */
+ public static function setLocale($locale, $basepath = '/')
+ {
+ // Set the cookie for 30 days
+ return self::set(self::LOCALE_COOKIE, $locale, 30, $basepath);
+ }
+
+ /**
+ * Store the organization in a cookie.
+ *
+ * @param int $organization Organization to store
+ * @param string $basepath The folder of the domain, if any.
+ * @return boolean True if the cookie was stored.
+ */
+ public static function setOrganization($organization, $basepath = '/')
+ {
+ if ($organization) {
+ // Set the cookie for 30 days
+ return self::set(self::ORGANIZATION_COOKIE, $organization, 30, $basepath);
+ }
+ }
+}
Modified: trunk/test/library/project-bootstrap.php
===================================================================
--- trunk/test/library/project-bootstrap.php 2012-11-22 17:29:49 UTC (rev 1038)
+++ trunk/test/library/project-bootstrap.php 2012-11-22 17:30:58 UTC (rev 1039)
@@ -25,10 +25,10 @@
* Setup include path
*/
set_include_path(
+ GEMS_WEB_DIR . '/classes' . PATH_SEPARATOR . //Test folder
+ GEMS_WEB_DIR . '/library' . PATH_SEPARATOR . //Test folder
GEMS_LIBRARY_DIR . '/classes' . PATH_SEPARATOR .
GEMS_ROOT_DIR . '/application/classes' . PATH_SEPARATOR .
- GEMS_WEB_DIR . '/classes' . PATH_SEPARATOR . //Test folder
- GEMS_WEB_DIR . '/library' . PATH_SEPARATOR . //Test folder
get_include_path());
// Set up autoload.
@@ -40,3 +40,6 @@
$autoloader->registerNameSpace('ZFDebug_');
Zend_Session::$_unitTestEnabled = true;
+
+// Needed for url output while checking for errors
+$_SERVER['SERVER_NAME'] = 'test';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-22 17:29:56
|
Revision: 1038
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1038&view=rev
Author: matijsdejong
Date: 2012-11-22 17:29:49 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
Removed last uses of GEMS_PROJECT_PATH
Fixed bug occurring during tests
Modified Paths:
--------------
trunk/library/classes/Gems/Default/ProjectInformationAction.php
trunk/library/classes/Gems/Events.php
trunk/library/classes/GemsEscort.php
trunk/library/pre_bootstrap.php
Modified: trunk/library/classes/Gems/Default/ProjectInformationAction.php
===================================================================
--- trunk/library/classes/Gems/Default/ProjectInformationAction.php 2012-11-22 15:59:49 UTC (rev 1037)
+++ trunk/library/classes/Gems/Default/ProjectInformationAction.php 2012-11-22 17:29:49 UTC (rev 1038)
@@ -138,7 +138,6 @@
$data[$this->_('Gems project')] = GEMS_PROJECT_NAME;
$data[$this->_('Gems web directory')] = GEMS_ROOT_DIR;
$data[$this->_('Gems code directory')] = GEMS_LIBRARY_DIR;
- $data[$this->_('Gems project path')] = GEMS_PROJECT_PATH;
$data[$this->_('MUtil version')] = MUtil_Version::get();
$data[$this->_('Zend version')] = Zend_Version::VERSION;
$data[$this->_('Application environment')] = APPLICATION_ENV;
Modified: trunk/library/classes/Gems/Events.php
===================================================================
--- trunk/library/classes/Gems/Events.php 2012-11-22 15:59:49 UTC (rev 1037)
+++ trunk/library/classes/Gems/Events.php 2012-11-22 17:29:49 UTC (rev 1038)
@@ -110,7 +110,7 @@
$prefix = $name . '_' . self::EVENTS_DIR . '_' . $eventClass . '_';
$paths[$prefix] = $dir . '/' . $name . '/' . self::EVENTS_DIR . '/' . $eventType;
}
- $paths[''] = GEMS_PROJECT_PATH . '/' . strtolower(self::EVENTS_DIR . 's/' . $eventType);
+ $paths[''] = APPLICATION_PATH . '/' . strtolower(self::EVENTS_DIR . 's/' . $eventType);
// MUtil_Echo::track($paths);
return $paths;
@@ -290,7 +290,7 @@
{
return $this->_loadEvent($eventName, self::SURVEY_DISPLAY_EVENT);
}
-
+
/**
*
* @param string $eventName
Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php 2012-11-22 15:59:49 UTC (rev 1037)
+++ trunk/library/classes/GemsEscort.php 2012-11-22 17:29:49 UTC (rev 1038)
@@ -39,8 +39,6 @@
// $autoloader->registerNamespace has not yet run!!
include_once('MUtil/Application/Escort.php');
-// mb_internal_encoding('UTF-8');
-
/**
* Project Application Core code
*
@@ -588,9 +586,11 @@
); // tooltip
$contactDiv->a($menuItem->toHRefAttribute(), $menuItem->get('label'));
- $ul = $menuItem->toUl();
- $ul->class = 'dropdownContent tooltip';
- $contactDiv->append($ul);
+ // List may be empty
+ if ($ul = $menuItem->toUl()) {
+ $ul->class = 'dropdownContent tooltip';
+ $contactDiv->append($ul);
+ }
return $contactDiv;
}
@@ -1731,7 +1731,7 @@
$front = $this->frontController;
$controllerFileName = $front->getDispatcher()->getControllerClass($request) . '.php';
- // MUtil_Echo::r(GEMS_PROJECT_PATH . '/controllers/' . $controllerFileName);
+ // MUtil_Echo::r(APPLICATION_PATH . '/controllers/' . $controllerFileName);
// Set to project path if that controller exists
// TODO: Dirs & modules combineren.
Modified: trunk/library/pre_bootstrap.php
===================================================================
--- trunk/library/pre_bootstrap.php 2012-11-22 15:59:49 UTC (rev 1037)
+++ trunk/library/pre_bootstrap.php 2012-11-22 17:29:49 UTC (rev 1038)
@@ -55,7 +55,7 @@
defined('APPLICATION_PATH') || define('APPLICATION_PATH', GEMS_ROOT_DIR . '/application');
/**
- * Compatibility
+ * Compatibility, remove in 1.6
*/
define('GEMS_PROJECT_PATH', APPLICATION_PATH);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-22 15:59:58
|
Revision: 1037
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1037&view=rev
Author: matijsdejong
Date: 2012-11-22 15:59:49 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
Added decimal functions provided by Roel
Added Paths:
-----------
trunk/library/classes/MUtil/Dec.php
trunk/test/classes/MUtil/DecTest.php
Added: trunk/library/classes/MUtil/Dec.php
===================================================================
--- trunk/library/classes/MUtil/Dec.php (rev 0)
+++ trunk/library/classes/MUtil/Dec.php 2012-11-22 15:59:49 UTC (rev 1037)
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * @package MUtil
+ * @subpackage Math
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
+ */
+
+/**
+ * Decimal calculation utilities
+ *
+ * RF: winbill at hotmail dot com 16-Dec-2010 09:31
+ * There are issues around float rounding/flooring,
+ * use of intermediate typecasting to string (strval) avoids problems
+ *
+ * jolyon at mways dot co dot uk 10-Aug-2004 11:41
+ * The thing to remember here is that the way a float stores a value makes it
+ * very easy for these kind of things to happen. When 79.99 is multiplied
+ * by 100, the actual value stored in the float is probably something like
+ * 7998.9999999999999999999999999999999999, PHP would print out 7999 when the
+ * value is displayed but floor would therefore round this down to 7998.
+ *
+ *
+ * @package MUtil
+ * @subpackage Math
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.5
+ */
+class MUtil_Dec
+{
+ /**
+ * Get the floor using the specified precision
+ *
+ * @param float $number
+ * @param int $precision
+ * @return float
+ */
+ public static function floor($number, $precision)
+ {
+ $coefficient = pow(10,$precision);
+ return floor(strval($number*$coefficient))/$coefficient;
+ }
+
+ /**
+ * Get the ceiling using the specified precision
+ *
+ * @param float $number
+ * @param int $precision
+ * @return float
+ */
+ public static function ceil($number, $precision)
+ {
+ $coefficient = pow(10,$precision);
+ return ceil(strval($number*$coefficient))/$coefficient;
+ }
+
+}
Added: trunk/test/classes/MUtil/DecTest.php
===================================================================
--- trunk/test/classes/MUtil/DecTest.php (rev 0)
+++ trunk/test/classes/MUtil/DecTest.php 2012-11-22 15:59:49 UTC (rev 1037)
@@ -0,0 +1,113 @@
+<?php
+
+
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * @package MUtil
+ * @subpackage Dec
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
+ */
+
+require_once 'PHPUnit/Framework/TestCase.php';
+
+/**
+ * Unit test for class MUtil_String
+ *
+ * @package MUtil
+ * @subpackage Dec
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.5.7
+ */
+class MUtil_DecTest extends PHPUnit_Framework_TestCase
+{
+ /**
+ * Dataprovider
+ *
+ * @return array
+ */
+ public static function forCeiling()
+ {
+ return array(
+ array(10.49825, 1, 10.5),
+ array(10.99825, 1, 11.0),
+ array(10.09825, 1, 10.1),
+ array(10.09825, 2, 10.10),
+ array(10.09825, 3, 10.099),
+ array(79.99*100, 0, 7999),
+ array(79.99*100, -1, 8000),
+ array((10.02-10)*100, 1, 2.0),
+ );
+ }
+
+ /**
+ * Dataprovider
+ *
+ * @return array
+ */
+ public static function forFloor()
+ {
+ return array(
+ array(10.49825, 1, 10.4),
+ array(10.99825, 1, 10.9),
+ array(10.09825, 1, 10.0),
+ array(10.09825, 2, 10.09),
+ array(10.09825, 3, 10.098),
+ array(79.99*100, 0, 7999),
+ array(79.99*100, -1, 7990),
+ array((10.02-10)*100, 1, 2.0),
+ );
+ }
+
+ /**
+ *
+ * @dataProvider forCeiling
+ * @param float $float
+ * @param int $precision
+ * @param float $output
+ */
+ public function testCeil($float, $precision, $output)
+ {
+ $this->assertEquals($output, MUtil_Dec::ceil($float, $precision));
+ }
+
+ /**
+ *
+ * @dataProvider forFloor
+ * @param float $float
+ * @param int $precision
+ * @param float $output
+ */
+ public function testFloor($float, $precision, $output)
+ {
+ $this->assertEquals($output, MUtil_Dec::floor($float, $precision));
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-22 15:58:40
|
Revision: 1036
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1036&view=rev
Author: matijsdejong
Date: 2012-11-22 15:58:31 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
Now works correctly with Zend_Session
Modified Paths:
--------------
trunk/test/library/project-bootstrap.php
Modified: trunk/test/library/project-bootstrap.php
===================================================================
--- trunk/test/library/project-bootstrap.php 2012-11-22 13:21:02 UTC (rev 1035)
+++ trunk/test/library/project-bootstrap.php 2012-11-22 15:58:31 UTC (rev 1036)
@@ -37,4 +37,6 @@
$autoloader->registerNamespace('MUtil_');
$autoloader->registerNamespace('Gems_');
$autoloader->registerNameSpace(GEMS_PROJECT_NAME_UC . '_');
-$autoloader->registerNameSpace('ZFDebug_');
\ No newline at end of file
+$autoloader->registerNameSpace('ZFDebug_');
+
+Zend_Session::$_unitTestEnabled = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-22 13:21:12
|
Revision: 1035
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1035&view=rev
Author: matijsdejong
Date: 2012-11-22 13:21:02 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
Fix for #564 marker tags appeared in the href email address
Modified Paths:
--------------
trunk/library/classes/Gems/Default/RespondentAction.php
trunk/library/classes/MUtil/Model/TableBridgeAbstract.php
Modified: trunk/library/classes/Gems/Default/RespondentAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RespondentAction.php 2012-11-22 12:13:14 UTC (rev 1034)
+++ trunk/library/classes/Gems/Default/RespondentAction.php 2012-11-22 13:21:02 UTC (rev 1035)
@@ -46,6 +46,17 @@
*/
abstract class Gems_Default_RespondentAction extends Gems_Controller_BrowseEditAction implements Gems_Menu_ParameterSourceInterface
{
+ public $exportSnippets = array('RespondentDetailsSnippet');
+
+ public $filterStandard = array('grc_success' => 1);
+
+ /**
+ * Variable for correctly displaying e-mail addresses
+ *
+ * @var MUtil_Lazy_LazyAbstract
+ */
+ protected $grs_email;
+
public $showSnippets = array(
'RespondentDetailsSnippet',
'AddTracksSnippet',
@@ -53,10 +64,6 @@
'RespondentTokenSnippet',
);
- public $exportSnippets = array('RespondentDetailsSnippet');
-
- public $filterStandard = array('grc_success' => 1);
-
public $sortKey = array('gr2o_opened' => SORT_DESC);
public $useTabbedForms = true;
@@ -72,8 +79,9 @@
*/
protected function addBrowseTableColumns(MUtil_Model_TableBridge $bridge, MUtil_Model_ModelAbstract $model)
{
+ $this->grs_email = $bridge->getLazy('grs_email');
$model->setIfExists('gr2o_opened', 'tableDisplay', 'small');
- $model->setIfExists('grs_email', 'itemDisplay', 'MUtil_Html_AElement::ifmail');
+ $model->setIfExists('grs_email', 'itemDisplay', array($this, 'ifmail'));
if ($menuItem = $this->findAllowedMenuItem('show')) {
$bridge->addItemLink($menuItem->toActionLinkLower($this->getRequest(), $bridge));
@@ -329,6 +337,43 @@
$this->html[] = $form;
}
+ public function exportAction()
+ {
+ //First show the respondent snippet
+ $model = $this->getModel();
+ $data = $model->applyRequest($this->getRequest(), true)->loadFirst();
+
+ if (! isset($data['grs_id_user'])) {
+ $this->addMessage(sprintf($this->_('Unknown %s requested'), $this->getTopic()));
+ $this->_reroute(array('action' => 'index'));
+ }
+
+ $params['model'] = $model;
+ $params['baseUrl'] = array(MUtil_Model::REQUEST_ID1 => $this->_getParam(MUtil_Model::REQUEST_ID1), MUtil_Model::REQUEST_ID2 => $this->_getParam(MUtil_Model::REQUEST_ID2));
+ $params['buttons'] = $this->createMenuLinks();
+ $params['onclick'] = $this->findAllowedMenuItem('edit');
+ if ($params['onclick']) {
+ $params['onclick'] = $params['onclick']->toHRefAttribute($this->getRequest());
+ }
+ $params['respondentData'] = $data;
+ $this->addSnippets($this->exportSnippets, $params);
+
+ //Now show the export form
+ $export = $this->loader->getRespondentExport($this);
+ $form = $export->getForm();
+ $this->html->h2($this->_('Export respondent'));
+ $div = $this->html->div(array('id' => 'mainform'));
+ $div[] = $form;
+
+ $request = $this->getRequest();
+
+ $form->populate($request->getParams());
+
+ if ($request->isPost()) {
+ $export->render((array) $data['gr2o_patient_nr'], $this->getRequest()->getParam('group'), $this->getRequest()->getParam('format'));
+ }
+ }
+
/**
* Returns a text element for autosearch. Can be overruled.
*
@@ -426,6 +471,23 @@
}
/**
+ * Helper function for preventing the marker value being mixed up in the output
+ *
+ * @param MUtil_Lazy_LazyAbstract $value
+ * @return MUtil_Html_AElement
+ */
+ public function ifmail($value)
+ {
+ return MUtil_Lazy::iff($this->grs_email,
+ new MUtil_Html_AElement(
+ array('mailto:', $this->grs_email),
+ $value,
+ array('onclick' => 'event.cancelBubble=true;')
+ )
+ );
+ }
+
+ /**
* Overrule default index for the case that the current
* organization cannot have users.
*/
@@ -505,41 +567,4 @@
$params['respondentData'] = $data;
$this->addSnippets($this->showSnippets, $params);
}
-
- public function exportAction()
- {
- //First show the respondent snippet
- $model = $this->getModel();
- $data = $model->applyRequest($this->getRequest(), true)->loadFirst();
-
- if (! isset($data['grs_id_user'])) {
- $this->addMessage(sprintf($this->_('Unknown %s requested'), $this->getTopic()));
- $this->_reroute(array('action' => 'index'));
- }
-
- $params['model'] = $model;
- $params['baseUrl'] = array(MUtil_Model::REQUEST_ID1 => $this->_getParam(MUtil_Model::REQUEST_ID1), MUtil_Model::REQUEST_ID2 => $this->_getParam(MUtil_Model::REQUEST_ID2));
- $params['buttons'] = $this->createMenuLinks();
- $params['onclick'] = $this->findAllowedMenuItem('edit');
- if ($params['onclick']) {
- $params['onclick'] = $params['onclick']->toHRefAttribute($this->getRequest());
- }
- $params['respondentData'] = $data;
- $this->addSnippets($this->exportSnippets, $params);
-
- //Now show the export form
- $export = $this->loader->getRespondentExport($this);
- $form = $export->getForm();
- $this->html->h2($this->_('Export respondent'));
- $div = $this->html->div(array('id' => 'mainform'));
- $div[] = $form;
-
- $request = $this->getRequest();
-
- $form->populate($request->getParams());
-
- if ($request->isPost()) {
- $export->render((array) $data['gr2o_patient_nr'], $this->getRequest()->getParam('group'), $this->getRequest()->getParam('format'));
- }
- }
}
Modified: trunk/library/classes/MUtil/Model/TableBridgeAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Model/TableBridgeAbstract.php 2012-11-22 12:13:14 UTC (rev 1034)
+++ trunk/library/classes/MUtil/Model/TableBridgeAbstract.php 2012-11-22 13:21:02 UTC (rev 1035)
@@ -192,6 +192,12 @@
return $name;
}
+ /**
+ * Return the lazy value without any makeup.
+ *
+ * @param string $name
+ * @return MUtil_Lazy_LazyAbstract
+ */
public function getLazy($name)
{
if (! $this->repeater) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-22 12:13:24
|
Revision: 1034
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1034&view=rev
Author: matijsdejong
Date: 2012-11-22 12:13:14 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
Fix for #578 database patch level
JoinModel now accepts more complex join statements
Modified Paths:
--------------
trunk/library/classes/MUtil/Model/JoinModel.php
trunk/library/configs/db/tables/gems__patch_levels.10.sql
Modified: trunk/library/classes/MUtil/Model/JoinModel.php
===================================================================
--- trunk/library/classes/MUtil/Model/JoinModel.php 2012-11-22 12:13:08 UTC (rev 1033)
+++ trunk/library/classes/MUtil/Model/JoinModel.php 2012-11-22 12:13:14 UTC (rev 1034)
@@ -117,9 +117,15 @@
$table_name = $this->_getTableName($table);
$adapter = $table->getAdapter();
+ $joinSql = array();
foreach ($joinFields as $source => $target) {
- $this->_joinFields[$source] = $target;
- $joinSql[] = $adapter->quoteIdentifier($source) . ' = ' . $adapter->quoteIdentifier($target);
+ if (is_numeric($source)) {
+ // A join expression other than equality is used
+ $joinSql[] = $target;
+ } else {
+ $this->_joinFields[$source] = $target;
+ $joinSql[] = $adapter->quoteIdentifier($source) . ' = ' . $adapter->quoteIdentifier($target);
+ }
}
$this->_select->$join($table_name, implode(' ' . Zend_Db_Select::SQL_AND . ' ', $joinSql), array());
Modified: trunk/library/configs/db/tables/gems__patch_levels.10.sql
===================================================================
--- trunk/library/configs/db/tables/gems__patch_levels.10.sql 2012-11-22 12:13:08 UTC (rev 1033)
+++ trunk/library/configs/db/tables/gems__patch_levels.10.sql 2012-11-22 12:13:14 UTC (rev 1034)
@@ -11,4 +11,4 @@
INSERT INTO gems__patch_levels (gpl_level, gpl_created)
VALUES
- (48, CURRENT_TIMESTAMP);
+ (50, CURRENT_TIMESTAMP);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-11-22 12:13:14
|
Revision: 1033
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1033&view=rev
Author: mennodekker
Date: 2012-11-22 12:13:08 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
Changed all code to get receptioncode from tracker, updated respondenttrack to return an object instead of string
Modified Paths:
--------------
branches/receptioncodes/library/changelog.txt
branches/receptioncodes/library/classes/Gems/Default/RespondentAction.php
branches/receptioncodes/library/classes/Gems/Event/ReceptionCodeEventInterface.php
branches/receptioncodes/library/classes/Gems/Export/RespondentExport.php
branches/receptioncodes/library/classes/Gems/Tracker/RespondentTrack.php
branches/receptioncodes/library/classes/Gems/Tracker/Token.php
branches/receptioncodes/library/classes/Gems/Tracker/TrackerInterface.php
branches/receptioncodes/library/snippets/DeleteSingleSurveyInSourceTokenSnippet.php
branches/receptioncodes/library/snippets/DeleteTrackTokenSnippet.php
Modified: branches/receptioncodes/library/changelog.txt
===================================================================
--- branches/receptioncodes/library/changelog.txt 2012-11-22 11:59:58 UTC (rev 1032)
+++ branches/receptioncodes/library/changelog.txt 2012-11-22 12:13:08 UTC (rev 1033)
@@ -1,3 +1,8 @@
+Important changes from 1.5.x => 1.6
+============================================================
+Reception codes moved from Util to Tracker, update should warn for local classes
+--> Scan your own code for reference to Gems_Util_ReceptionCode or util->getReceptionCode
+
Important changes from 1.5.5 => 1.5.6
============================================================
Transparent lessCss compiling was added. When you add a .less file GemsTracker will take care of compiling it to css. If you need to force a recompile, add the ?compilecss parameter to your url.
Modified: branches/receptioncodes/library/classes/Gems/Default/RespondentAction.php
===================================================================
--- branches/receptioncodes/library/classes/Gems/Default/RespondentAction.php 2012-11-22 11:59:58 UTC (rev 1032)
+++ branches/receptioncodes/library/classes/Gems/Default/RespondentAction.php 2012-11-22 12:13:08 UTC (rev 1033)
@@ -268,7 +268,7 @@
$data = $_POST + $data;
if ($form->isValid($data )) {
- $code = $this->util->getReceptionCode($data['gr2o_reception_code']);
+ $code = $this->loader->getTracker()->getReceptionCode($data['gr2o_reception_code']);
// Is the respondent really removed
if (! $code->isSuccess()) {
Modified: branches/receptioncodes/library/classes/Gems/Event/ReceptionCodeEventInterface.php
===================================================================
--- branches/receptioncodes/library/classes/Gems/Event/ReceptionCodeEventInterface.php 2012-11-22 11:59:58 UTC (rev 1032)
+++ branches/receptioncodes/library/classes/Gems/Event/ReceptionCodeEventInterface.php 2012-11-22 12:13:08 UTC (rev 1033)
@@ -45,7 +45,7 @@
* @license New BSD License
* @since Class available since version 1.6
*/
-class Gems_Event_ReceptionCodeEventInterface extends Gems_Event_EventInterface
+interface Gems_Event_ReceptionCodeEventInterface extends Gems_Event_EventInterface
{
public function setReceptionCode($object, $receptionCode, $comment, $userId);
}
\ No newline at end of file
Modified: branches/receptioncodes/library/classes/Gems/Export/RespondentExport.php
===================================================================
--- branches/receptioncodes/library/classes/Gems/Export/RespondentExport.php 2012-11-22 11:59:58 UTC (rev 1032)
+++ branches/receptioncodes/library/classes/Gems/Export/RespondentExport.php 2012-11-22 12:13:08 UTC (rev 1033)
@@ -226,7 +226,7 @@
*/
protected function _exportTrack(Gems_Tracker_RespondentTrack $track)
{
- if ($track->getReceptionCode() != GemsEscort::RECEPTION_OK) {
+ if (!$track->getReceptionCode()->isSuccess()) {
return;
}
Modified: branches/receptioncodes/library/classes/Gems/Tracker/RespondentTrack.php
===================================================================
--- branches/receptioncodes/library/classes/Gems/Tracker/RespondentTrack.php 2012-11-22 11:59:58 UTC (rev 1032)
+++ branches/receptioncodes/library/classes/Gems/Tracker/RespondentTrack.php 2012-11-22 12:13:08 UTC (rev 1033)
@@ -504,7 +504,7 @@
public function getReceptionCode()
{
- return $this->_respTrackData['gr2t_reception_code'];
+ return $this->tracker->getReceptionCode($this->_respTrackData['gr2t_reception_code']);
}
/**
@@ -741,7 +741,7 @@
{
// Make sure it is a Gems_Tracker_ReceptionCode object
if (! $code instanceof Gems_Tracker_ReceptionCode) {
- $code = $this->util->getReceptionCode($code);
+ $code = $this->tracker->getReceptionCode($code);
}
$changed = 0;
Modified: branches/receptioncodes/library/classes/Gems/Tracker/Token.php
===================================================================
--- branches/receptioncodes/library/classes/Gems/Tracker/Token.php 2012-11-22 11:59:58 UTC (rev 1032)
+++ branches/receptioncodes/library/classes/Gems/Tracker/Token.php 2012-11-22 12:13:08 UTC (rev 1033)
@@ -1411,7 +1411,7 @@
{
// Make sure it is a Gems_Tracker_ReceptionCode object
if (! $code instanceof Gems_Tracker_ReceptionCode) {
- $code = $this->util->getReceptionCode($code);
+ $code = $this->tracker->getReceptionCode($code);
}
$values['gto_reception_code'] = $code->getCode();
Modified: branches/receptioncodes/library/classes/Gems/Tracker/TrackerInterface.php
===================================================================
--- branches/receptioncodes/library/classes/Gems/Tracker/TrackerInterface.php 2012-11-22 11:59:58 UTC (rev 1032)
+++ branches/receptioncodes/library/classes/Gems/Tracker/TrackerInterface.php 2012-11-22 12:13:08 UTC (rev 1033)
@@ -123,6 +123,14 @@
* @return Gems_Tracker_Form_AskTokenForm
*/
public function getAskTokenForm($args_array = null);
+
+ /**
+ * Returns a single reception code object.
+ *
+ * @param string $code
+ * @return Gems_Tracker_ReceptionCode
+ */
+ public function getReceptionCode($code);
/**
*
Modified: branches/receptioncodes/library/snippets/DeleteSingleSurveyInSourceTokenSnippet.php
===================================================================
--- branches/receptioncodes/library/snippets/DeleteSingleSurveyInSourceTokenSnippet.php 2012-11-22 11:59:58 UTC (rev 1032)
+++ branches/receptioncodes/library/snippets/DeleteSingleSurveyInSourceTokenSnippet.php 2012-11-22 12:13:08 UTC (rev 1033)
@@ -214,7 +214,7 @@
*/
protected function saveData()
{
- $code = $this->util->getReceptionCode($this->formData['gto_reception_code']);
+ $code = $this->loader->getTracker()->getReceptionCode($this->formData['gto_reception_code']);
$changed = $this->token->setReceptionCode($code, $this->formData['gto_comment'], $this->session->user_id);
Modified: branches/receptioncodes/library/snippets/DeleteTrackTokenSnippet.php
===================================================================
--- branches/receptioncodes/library/snippets/DeleteTrackTokenSnippet.php 2012-11-22 11:59:58 UTC (rev 1032)
+++ branches/receptioncodes/library/snippets/DeleteTrackTokenSnippet.php 2012-11-22 12:13:08 UTC (rev 1033)
@@ -236,7 +236,7 @@
protected function saveData()
{
// Get the code object
- $code = $this->util->getReceptionCode($this->formData['gto_reception_code']);
+ $code = $this->loader->getTracker()->getReceptionCode($this->formData['gto_reception_code']);
// Use the token function as that cascades the consent code
$changed = $this->token->setReceptionCode($code, $this->formData['gto_comment'], $this->session->user_id);
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.
