Menu
▾
▴
[Gemstracker-svn] SF.net SVN: gemstracker:[752] trunk/library
|
From: <gem...@li...> - 2012-06-11 12:56:08
|
Revision: 752
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=752&view=rev
Author: matijsdejong
Date: 2012-06-11 12:55:54 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
All bulk check/change processes now use Batch/Task to execute
Removed Batch() from function names for consistent naming (should be backward compatible)
Updated version numbers
Updated translations and changed some batch descriptions for clarity (I hope)
Modified Paths:
--------------
trunk/library/classes/Gems/Default/SourceAction.php
trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php
trunk/library/classes/Gems/Default/TokenPlanAction.php
trunk/library/classes/Gems/Default/TrackMaintenanceAction.php
trunk/library/classes/Gems/Menu/MenuAbstract.php
trunk/library/classes/Gems/Task/Tracker/CheckTrackRounds.php
trunk/library/classes/Gems/Tracker/Engine/TrackEngineAbstract.php
trunk/library/classes/Gems/Tracker/TrackerInterface.php
trunk/library/classes/Gems/Tracker.php
trunk/library/classes/Gems/Versions.php
trunk/library/classes/MUtil/Batch/BatchPull.js
trunk/library/configs/db/tables/gems__patch_levels.10.sql
trunk/library/languages/default-en.mo
trunk/library/languages/default-en.po
trunk/library/languages/default-nl.mo
trunk/library/languages/default-nl.po
Modified: trunk/library/classes/Gems/Default/SourceAction.php
===================================================================
--- trunk/library/classes/Gems/Default/SourceAction.php 2012-06-11 09:36:00 UTC (rev 751)
+++ trunk/library/classes/Gems/Default/SourceAction.php 2012-06-11 12:55:54 UTC (rev 752)
@@ -111,7 +111,7 @@
$sourceId = $this->getSourceId();
$where = $this->db->quoteInto('gsu_id_source = ?', $sourceId);
- $batch = $this->loader->getTracker()->refreshTokenAttributesBatch('sourceCheck' . $sourceId, $where);
+ $batch = $this->loader->getTracker()->refreshTokenAttributes('sourceCheck' . $sourceId, $where);
$title = sprintf($this->_('Refreshing token attributes for %s source.'),
$this->db->fetchOne("SELECT gso_source_name FROM gems__sources WHERE gso_id_source = ?", $sourceId));
@@ -127,7 +127,7 @@
$sourceId = $this->getSourceId();
$where = $this->db->quoteInto('gto_id_survey IN (SELECT gsu_id_survey FROM gems__surveys WHERE gsu_id_source = ?)', $sourceId);
- $batch = $this->loader->getTracker()->recalculateTokensBatch('sourceCheck' . $sourceId, $this->loader->getCurrentUser()->getUserId(), $where);
+ $batch = $this->loader->getTracker()->recalculateTokens('sourceCheck' . $sourceId, $this->loader->getCurrentUser()->getUserId(), $where);
$title = sprintf($this->_('Checking survey results for %s source.'),
$this->db->fetchOne("SELECT gso_source_name FROM gems__sources WHERE gso_id_source = ?", $sourceId));
@@ -139,7 +139,7 @@
*/
public function checkAllAction()
{
- $batch = $this->loader->getTracker()->recalculateTokensBatch('surveyCheckAll', $this->loader->getCurrentUser()->getUserId());
+ $batch = $this->loader->getTracker()->recalculateTokens('surveyCheckAll', $this->loader->getCurrentUser()->getUserId());
$title = $this->_('Checking survey results for all sources.');
$this->_helper->BatchRunner($batch, $title);
@@ -238,7 +238,7 @@
{
$sourceId = $this->getSourceId();
- $batch = $this->loader->getTracker()->synchronizeSourcesBatch($sourceId, $this->loader->getCurrentUser()->getUserId());
+ $batch = $this->loader->getTracker()->synchronizeSources($sourceId, $this->loader->getCurrentUser()->getUserId());
$title = sprintf($this->_('Synchronize the %s source.'),
$this->db->fetchOne("SELECT gso_source_name FROM gems__sources WHERE gso_id_source = ?", $sourceId));
@@ -251,11 +251,11 @@
public function synchronizeAllAction()
{
//*
- $batch = $this->loader->getTracker()->synchronizeSourcesBatch(null, $this->loader->getCurrentUser()->getUserId());
+ $batch = $this->loader->getTracker()->synchronizeSources(null, $this->loader->getCurrentUser()->getUserId());
$title = $this->_('Synchronize all sources.');
$this->_helper->BatchRunner($batch, $title);
-
+
$this->html->actionLink(array('action' => 'index'), $this->_('Cancel'));
}
}
Modified: trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php
===================================================================
--- trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php 2012-06-11 09:36:00 UTC (rev 751)
+++ trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php 2012-06-11 12:55:54 UTC (rev 752)
@@ -244,13 +244,13 @@
// Set the value of the field in the database.
$new_name = $data['gsu_id_survey'] . '.pdf';
-
+
if (file_exists($form->new_pdf->getDestination() . DIRECTORY_SEPARATOR . $new_name)) {
$data['gsu_survey_pdf'] = $new_name;
} else {
$data['gsu_survey_pdf'] = null;
}
-
+
$data['gtr_track_class'] = 'SingleSurveyEngine';
// feature request #200
@@ -274,7 +274,7 @@
$surveyId = $this->_getParam(MUtil_Model::REQUEST_ID);
$where = $this->db->quoteInto('gto_id_survey = ?', $surveyId);
- $batch = $this->loader->getTracker()->recalculateTokensBatch('surveyCheck' . $surveyId, $this->loader->getCurrentUser()->getUserId(), $where);
+ $batch = $this->loader->getTracker()->recalculateTokens('surveyCheck' . $surveyId, $this->loader->getCurrentUser()->getUserId(), $where);
$title = sprintf($this->_('Checking survey results for the %s survey.'),
$this->db->fetchOne("SELECT gsu_survey_name FROM gems__surveys WHERE gsu_id_survey = ?", $surveyId));
@@ -286,7 +286,7 @@
*/
public function checkAllAction()
{
- $batch = $this->loader->getTracker()->recalculateTokensBatch('surveyCheckAll', $this->loader->getCurrentUser()->getUserId());
+ $batch = $this->loader->getTracker()->recalculateTokens('surveyCheckAll', $this->loader->getCurrentUser()->getUserId());
$title = $this->_('Checking survey results for all surveys.');
$this->_helper->BatchRunner($batch, $title);
Modified: trunk/library/classes/Gems/Default/TokenPlanAction.php
===================================================================
--- trunk/library/classes/Gems/Default/TokenPlanAction.php 2012-06-11 09:36:00 UTC (rev 751)
+++ trunk/library/classes/Gems/Default/TokenPlanAction.php 2012-06-11 12:55:54 UTC (rev 752)
@@ -499,7 +499,7 @@
//$this->loader->getTracker()->processCompletedTokens(null, $this->session->user_id);
$filter = $this->getCachedRequestData(true);
$orgId = array_key_exists('gto_id_organization', $filter) ? $filter['gto_id_organization'] : null;
- $this->loader->getTracker()->processCompletedTokensBatch(null, $this->session->user_id, $orgId);
+ $this->loader->getTracker()->processCompletedTokens(null, $this->session->user_id, $orgId);
parent::indexAction();
}
Modified: trunk/library/classes/Gems/Default/TrackMaintenanceAction.php
===================================================================
--- trunk/library/classes/Gems/Default/TrackMaintenanceAction.php 2012-06-11 09:36:00 UTC (rev 751)
+++ trunk/library/classes/Gems/Default/TrackMaintenanceAction.php 2012-06-11 12:55:54 UTC (rev 752)
@@ -154,7 +154,7 @@
*/
public function checkAllAction()
{
- $batch = $this->loader->getTracker()->checkTrackRoundsBatch('trackCheckRoundsAll', $this->loader->getCurrentUser()->getUserId());
+ $batch = $this->loader->getTracker()->checkTrackRounds('trackCheckRoundsAll', $this->loader->getCurrentUser()->getUserId());
$this->_helper->BatchRunner($batch, $this->_('Checking round assignments for all tracks.'));
}
@@ -166,7 +166,7 @@
$id = $this->_getIdParam();
$track = $this->loader->getTracker()->getTrackEngine($id);
$where = $this->db->quoteInto('gr2t_id_track = ?', $id);
- $batch = $this->loader->getTracker()->checkTrackRoundsBatch('trackCheckRounds' . $id, $this->loader->getCurrentUser()->getUserId(), $where);
+ $batch = $this->loader->getTracker()->checkTrackRounds('trackCheckRounds' . $id, $this->loader->getCurrentUser()->getUserId(), $where);
$title = sprintf($this->_("Checking round assignments for track '%s'."), $track->getTrackName());
$this->_helper->BatchRunner($batch, $title);
Modified: trunk/library/classes/Gems/Menu/MenuAbstract.php
===================================================================
--- trunk/library/classes/Gems/Menu/MenuAbstract.php 2012-06-11 09:36:00 UTC (rev 751)
+++ trunk/library/classes/Gems/Menu/MenuAbstract.php 2012-06-11 12:55:54 UTC (rev 752)
@@ -418,10 +418,10 @@
$page = $setup->addBrowsePage($this->_('Survey Sources'), 'pr.source', 'source');
$page->addAction($this->_('Check status'), null, 'ping')->addParameters(MUtil_Model::REQUEST_ID);
$page->addAction($this->_('Synchronize surveys'), 'pr.source.synchronize', 'synchronize')->addParameters(MUtil_Model::REQUEST_ID);
- $page->addAction($this->_('Check answers'), 'pr.source.check-answers', 'check')->addParameters(MUtil_Model::REQUEST_ID);
+ $page->addAction($this->_('Check is answered'), 'pr.source.check-answers', 'check')->addParameters(MUtil_Model::REQUEST_ID);
$page->addAction($this->_('Check attributes'), 'pr.source.check-attributes', 'attributes')->addParameters(MUtil_Model::REQUEST_ID);
$page->addAction($this->_('Synchronize all surveys'), 'pr.source.synchronize-all', 'synchronize-all');
- $page->addAction($this->_('Check all answers'), 'pr.source.check-answers-all', 'check-all');
+ $page->addAction($this->_('Check all is answered'), 'pr.source.check-answers-all', 'check-all');
// SURVEY MAINTENANCE CONTROLLER
$page = $setup->addPage($this->_('Surveys'), 'pr.survey-maintenance', 'survey-maintenance');
@@ -430,8 +430,8 @@
$page->addPdfButton($this->_('PDF'), 'pr.survey-maintenance')
->addParameters(MUtil_Model::REQUEST_ID)
->setParameterFilter('gsu_has_pdf', 1);
- $page->addAction($this->_('Check answers'), 'pr.survey-maintenance.check', 'check')->addParameters(MUtil_Model::REQUEST_ID);
- $page->addAction($this->_('Check all answers'), 'pr.survey-maintenance.check-all', 'check-all');
+ $page->addAction($this->_('Check is answered'), 'pr.survey-maintenance.check', 'check')->addParameters(MUtil_Model::REQUEST_ID);
+ $page->addAction($this->_('Check all is answered'), 'pr.survey-maintenance.check-all', 'check-all');
$page->addAutofilterAction();
Modified: trunk/library/classes/Gems/Task/Tracker/CheckTrackRounds.php
===================================================================
--- trunk/library/classes/Gems/Task/Tracker/CheckTrackRounds.php 2012-06-11 09:36:00 UTC (rev 751)
+++ trunk/library/classes/Gems/Task/Tracker/CheckTrackRounds.php 2012-06-11 12:55:54 UTC (rev 752)
@@ -60,6 +60,5 @@
$engine = $respTrack->getTrackEngine();
$engine->checkRoundsFor($respTrack, $userId, $this->_batch);
- $this->_batch->addToCounter('checkedRespondentTracks');
}
}
\ No newline at end of file
Modified: trunk/library/classes/Gems/Tracker/Engine/TrackEngineAbstract.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Engine/TrackEngineAbstract.php 2012-06-11 09:36:00 UTC (rev 751)
+++ trunk/library/classes/Gems/Tracker/Engine/TrackEngineAbstract.php 2012-06-11 12:55:54 UTC (rev 752)
@@ -410,20 +410,25 @@
public function checkRoundsFor(Gems_Tracker_RespondentTrack $respTrack, $userId, Gems_Task_TaskRunnerBatch $batch)
{
//Step one: update existing tokens
- $batch->addToCounter('roundChangeUpdates', $this->checkExistingRoundsFor($respTrack, $userId));
+ $i = $batch->addToCounter('roundChangeUpdates', $this->checkExistingRoundsFor($respTrack, $userId));
+ $batch->setMessage('roundChangeUpdates', sprintf($this->_('Round changes propagated to %d tokens.'), $i));
//Step two: deactivate inactive rounds
- $batch->addToCounter('deletedTokens', $this->removeInactiveRounds($respTrack, $userId));
+ $i = $batch->addToCounter('deletedTokens', $this->removeInactiveRounds($respTrack, $userId));
+ $batch->setMessage('deletedTokens', sprintf($this->_('%d tokens deleted by round changes.'), $i));
// Step three: create lacking tokens
- $batch->addToCounter('createdTokens', $this->addNewTokens($respTrack, $userId));
+ $i = $batch->addToCounter('createdTokens', $this->addNewTokens($respTrack, $userId));
+ $batch->setMessage('createdTokens', sprintf($this->_('%d tokens created to by round changes.'), $i));
// Step four: set the dates and times
$changed = $this->checkTokensFromStart($respTrack, $userId);
- if ($changed) {
- $batch->addToCounter('tokenDateCauses');
- $batch->addToCounter('tokenDateChanges', $changed);
- }
+ $ica = $batch->addToCounter('tokenDateCauses', $changed ? 1 : 0);
+ $ich = $batch->addToCounter('tokenDateChanges', $changed);
+ $batch->setMessage('tokenDateChanges', sprintf($this->_('%2$d token date changes in %1$d tracks.'), $ica, $ich));
+
+ $i = $batch->addToCounter('checkedRespondentTracks');
+ $batch->setMessage('checkedRespondentTracks', sprintf($this->_('Checked %d tracks.'), $i));
}
/**
Modified: trunk/library/classes/Gems/Tracker/TrackerInterface.php
===================================================================
--- trunk/library/classes/Gems/Tracker/TrackerInterface.php 2012-06-11 09:36:00 UTC (rev 751)
+++ trunk/library/classes/Gems/Tracker/TrackerInterface.php 2012-06-11 12:55:54 UTC (rev 752)
@@ -53,8 +53,8 @@
* how tokens are created and checked), TokenSelect (Gems_Tracker_Token_TokenSelect
* extension) and TokenValidator.
*
- * Other functions are general utility functions, e.g. checkTrackRoundsBatch(), createToken(),
- * processCompletedTokensBatch() and recalculateTokensBatch().
+ * Other functions are general utility functions, e.g. checkTrackRounds(), createToken(),
+ * processCompletedTokens() and recalculateTokens().
*
* @package Gems
* @subpackage Tracker
@@ -75,7 +75,7 @@
* @param string $cond Optional where statement for selecting tracks
* @return Gems_Task_TaskRunnerBatch A batch to process the changes
*/
- public function checkTrackRoundsBatch($batchId, $userId = null, $cond = null);
+ public function checkTrackRounds($batchId, $userId = null, $cond = null);
/**
* Create a new track for a patient
@@ -283,9 +283,10 @@
*
* @param int $respondentId Id of the respondent to check for or NULL
* @param int $userId Id of the user who takes the action (for logging)
+ * @param int $orgId Optional Id of the organization to check for
* @return bool Did we find new answers?
*/
- public function processCompletedTokens($respondentId, $userId = null);
+ public function processCompletedTokens($respondentId, $userId = null, $orgId = null);
/**
* Recalculates all token dates, timing and results
@@ -297,7 +298,7 @@
* @param int $userId Id of the user who takes the action (for logging)
* @return Gems_Tracker_Batch_SynchronizeSourcesBatch A batch to process the synchronization
*/
- public function synchronizeSourcesBatch($sourceId = null, $userId = null);
+ public function synchronizeSources($sourceId = null, $userId = null);
/**
* Recalculates all token dates, timing and results
@@ -310,7 +311,7 @@
* @param string $cond
* @return Gems_Task_TaskRunnerBatch A batch to process the changes
*/
- public function recalculateTokensBatch($batch_id, $userId = null, $cond = null);
+ public function recalculateTokens($batch_id, $userId = null, $cond = null);
/**
* Refreshes the tokens in the source
@@ -319,5 +320,5 @@
* @param string $cond An optional where statement
* @return Gems_Task_TaskRunnerBatch A batch to process the changes
*/
- public function refreshTokenAttributesBatch($batch_id, $cond = null);
+ public function refreshTokenAttributes($batch_id, $cond = null);
}
Modified: trunk/library/classes/Gems/Tracker.php
===================================================================
--- trunk/library/classes/Gems/Tracker.php 2012-06-11 09:36:00 UTC (rev 751)
+++ trunk/library/classes/Gems/Tracker.php 2012-06-11 12:55:54 UTC (rev 752)
@@ -47,8 +47,8 @@
* how tokens are created and checked), TokenSelect (Gems_Tracker_Token_TokenSelect
* extension) and TokenValidator.
*
- * Other functions are general utility functions, e.g. checkTrackRoundsBatch(), createToken(),
- * processCompletedTokensBatch() and recalculateTokensBatch().
+ * Other functions are general utility functions, e.g. checkTrackRounds(), createToken(),
+ * processCompletedTokens() and recalculateTokens().
*
* @package Gems
* @subpackage Tracker
@@ -199,7 +199,7 @@
* @param string $cond Optional where statement for selecting tracks
* @return Gems_Task_TaskRunnerBatch A batch to process the changes
*/
- public function checkTrackRoundsBatch($batchId, $userId = null, $cond = null)
+ public function checkTrackRounds($batchId, $userId = null, $cond = null)
{
$userId = $this->_checkUserId($userId);
$respTrackSelect = $this->db->select();
@@ -754,33 +754,11 @@
*
* @param int $respondentId Id of the respondent to check for or NULL
* @param int $userId Id of the user who takes the action (for logging)
+ * @param int $orgId Optional Id of the organization to check for
* @return bool Did we find new answers?
*/
- public function processCompletedTokens($respondentId, $userId = null)
+ public function processCompletedTokens($respondentId, $userId = null, $orgId = null)
{
- return $this->processCompletedTokensBatch($respondentId, $userId, null);
-
- /*$userId = $this->_checkUserId($userId);
- $tokenSelect = $this->getTokenSelect(true)
- ->onlyActive()
- ->forRespondent($respondentId)
- ->andReceptionCodes()
- ->order('gto_round_order DESC');
-
- $changes = $this->processTokens($tokenSelect, $userId);
-
- if (self::$verbose) {
- if ($t = Zend_Registry::get('Zend_Translate')) {
- MUtil_Echo::r($changes->getMessages($t), $t->_('Checks performed'));
- }
- }
-
- return $changes->hasChanged();
- */
- }
-
- public function processCompletedTokensBatch($respondentId, $userId = null, $orgId = null)
- {
$userId = $this->_checkUserId($userId);
$tokenSelect = $this->getTokenSelect();
$tokenSelect->onlyActive()
@@ -788,7 +766,7 @@
->andSurveys(array())
->forWhere('gsu_surveyor_active = 1');
- if (!is_null($orgId)) {
+ if (null !== $orgId) {
$tokenSelect->forWhere('gto_id_organization = ?', $orgId);
}
@@ -824,70 +802,6 @@
*
* Does not reflect changes to tracks or rounds.
*
- * @param Gems_Tracker_Token_TokenSelect Select statements selecting tokens
- * @param int $userId Id of the user who takes the action (for logging)
- * @return Gems_Tracker_ChangeTracker What changes have taken places
- */
- protected function processTokens(Gems_Tracker_Token_TokenSelect $tokenSelect, $userId)
- {
- $tokenRows = $tokenSelect->fetchAll();
- $changes = new Gems_Tracker_ChangeTracker();
- $tokens = array();
-
- // FIRST: process each individual token
- foreach ($tokenRows as $tokenData) {
-
- $changes->checkedTokens++;
- $token = $this->getToken($tokenData);
- $tokens[] = $token;
-
- if ($result = $token->checkTokenCompletion($userId)) {
- if ($result & Gems_Tracker_Token::COMPLETION_DATACHANGE) {
- $changes->resultDataChanges++;
- }
- if ($result & Gems_Tracker_Token::COMPLETION_EVENTCHANGE) {
- $changes->surveyCompletionChanges++;
- }
- }
- }
-
- $respTracks = array();
-
- // SECOND: Process the completed rounds (all tokens now have any new values from answered surveys)
- foreach ($tokens as $token) {
- if ($token->isCompleted()) {
- $respTrack = $token->getRespondentTrack();
- $respTracks[$respTrack->getRespondentTrackId()] = $respTrack;
-
- if ($result = $respTrack->handleRoundCompletion($token, $userId)) {
- $changes->roundCompletionCauses++;
- $changes->roundCompletionChanges += $result;
- }
- }
- }
-
- if ($respTracks) {
- // THIRD: Process date changes
- foreach ($respTracks as $respTrackId => $respTrack) {
- if ($result = $respTrack->checkTrackTokens($userId)) {
- $changes->tokenDateCauses++;
- $changes->tokenDateChanges += $result;
- }
- }
- }
-
- return $changes;
- }
-
- /**
- * Checks the token table to see if there are any answered surveys to be processed
- *
- * If the survey was started (and the token was forwarded to limesurvey) we need to check
- * if is was completed. If so, we might want to check the track the survey is in to enable
- * or disable future rounds
- *
- * Does not reflect changes to tracks or rounds.
- *
* @param string $batch_id A unique identifier for the current batch
* @param Gems_Tracker_Token_TokenSelect Select statements selecting tokens
* @param int $userId Id of the user who takes the action (for logging)
@@ -924,7 +838,7 @@
* @param int $userId Id of the user who takes the action (for logging)
* @return Gems_Tracker_Batch_SynchronizeSourcesBatch A batch to process the synchronization
*/
- public function synchronizeSourcesBatch($sourceId = null, $userId = null)
+ public function synchronizeSources($sourceId = null, $userId = null)
{
$batch_id = 'source_synch' . ($sourceId ? '_' . $sourceId : '');
$batch = $this->loader->getTaskRunnerBatch($batch_id);
@@ -959,7 +873,7 @@
* @param string $cond
* @return Gems_Task_TaskRunnerBatch A batch to process the changes
*/
- public function recalculateTokensBatch($batch_id, $userId = null, $cond = null)
+ public function recalculateTokens($batch_id, $userId = null, $cond = null)
{
$userId = $this->_checkUserId($userId);
$tokenSelect = $this->getTokenSelect(array('gto_id_token'));
@@ -985,7 +899,7 @@
* @param string $cond An optional where statement
* @return Gems_Task_TaskRunnerBatch A batch to process the changes
*/
- public function refreshTokenAttributesBatch($batch_id, $cond = null)
+ public function refreshTokenAttributes($batch_id, $cond = null)
{
$batch = $this->loader->getTaskRunnerBatch($batch_id);
Modified: trunk/library/classes/Gems/Versions.php
===================================================================
--- trunk/library/classes/Gems/Versions.php 2012-06-11 09:36:00 UTC (rev 751)
+++ trunk/library/classes/Gems/Versions.php 2012-06-11 12:55:54 UTC (rev 752)
@@ -59,7 +59,7 @@
* This means that future patches for the current level
* will be loaded, but that previous patches are ignored.
*/
- return 47;
+ return 48;
}
/**
@@ -69,7 +69,7 @@
*/
public final function getGemsVersion()
{
- return '1.5.4';
+ return '1.5.5';
}
/**
Modified: trunk/library/classes/MUtil/Batch/BatchPull.js
===================================================================
--- trunk/library/classes/MUtil/Batch/BatchPull.js 2012-06-11 09:36:00 UTC (rev 751)
+++ trunk/library/classes/MUtil/Batch/BatchPull.js 2012-06-11 12:55:54 UTC (rev 752)
@@ -33,8 +33,8 @@
},
error: function (request, status, error) {
- alert('Communication error: ' + status);
- this.progressTarget.after('<p>' + request.responseText + '</p>');
+ // alert('Communication error: ' + status);
+ this.progressTarget.after('<h3>Communication error</h3><p><strong>' + status + '</strong><br/>' + request.responseText + '</p>');
// console.log(request);
},
Modified: trunk/library/configs/db/tables/gems__patch_levels.10.sql
===================================================================
--- trunk/library/configs/db/tables/gems__patch_levels.10.sql 2012-06-11 09:36:00 UTC (rev 751)
+++ trunk/library/configs/db/tables/gems__patch_levels.10.sql 2012-06-11 12:55:54 UTC (rev 752)
@@ -11,5 +11,4 @@
INSERT INTO gems__patch_levels (gpl_level, gpl_created)
VALUES
- (47, CURRENT_TIMESTAMP);
-
+ (48, CURRENT_TIMESTAMP);
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2012-06-11 09:36:00 UTC (rev 751)
+++ trunk/library/languages/default-en.po 2012-06-11 12:55:54 UTC (rev 752)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-31 16:28+0100\n"
+"POT-Creation-Date: 2012-06-11 14:50+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -99,31 +99,31 @@
msgid "Database needs to be updated!"
msgstr "Database needs to be updated!"
-#: classes/Gems/Html.php:154
+#: classes/Gems/Html.php:155
msgid "<< First"
msgstr "<< First"
-#: classes/Gems/Html.php:155
+#: classes/Gems/Html.php:156
msgid "< Previous"
msgstr "< Previous"
-#: classes/Gems/Html.php:156
+#: classes/Gems/Html.php:157
msgid "Next >"
msgstr "Next >"
-#: classes/Gems/Html.php:157
+#: classes/Gems/Html.php:158
msgid "Last >>"
msgstr "Last >>"
-#: classes/Gems/Html.php:158
+#: classes/Gems/Html.php:159
msgid " | "
msgstr " | "
-#: classes/Gems/Html.php:162
+#: classes/Gems/Html.php:163
msgid "to"
msgstr "to"
-#: classes/Gems/Html.php:163
+#: classes/Gems/Html.php:164
msgid "of"
msgstr "of"
@@ -269,6 +269,10 @@
msgid "Token"
msgstr "Token"
+#: classes/Gems/Menu.php:280
+msgid "Export"
+msgstr "Export"
+
#: classes/Gems/Menu.php:285
msgid "Track"
msgstr "Track"
@@ -344,6 +348,10 @@
msgid "Track Builder"
msgstr "Track Builder"
+#: classes/Gems/Menu.php:561
+msgid "Export respondent"
+msgstr "Export respondent"
+
#: classes/Gems/Menu.php:567
msgid "Contact"
msgstr "Contact"
@@ -423,7 +431,7 @@
msgid " The error message is: %s"
msgstr " The error message is: %s"
-#: classes/Gems/Upgrades.php:77
+#: classes/Gems/Upgrades.php:79
msgid "Syncing surveys for all sources"
msgstr "Syncing surveys for all sources"
@@ -441,94 +449,94 @@
msgid "Trying upgrade for %s to level %s: %s"
msgstr "Trying upgrade for %s to level %s: %s"
-#: classes/Gems/Controller/BrowseEditAction.php:354
+#: classes/Gems/Controller/BrowseEditAction.php:355
#, php-format
msgid "New %s..."
msgstr "New %s..."
-#: classes/Gems/Controller/BrowseEditAction.php:387
+#: classes/Gems/Controller/BrowseEditAction.php:388
#, php-format
msgid "Delete %s"
msgstr "Delete %s"
-#: classes/Gems/Controller/BrowseEditAction.php:391
+#: classes/Gems/Controller/BrowseEditAction.php:392
#, php-format
msgid "%2$u %1$s deleted"
msgstr "%2$u %1$s deleted"
-#: classes/Gems/Controller/BrowseEditAction.php:408
+#: classes/Gems/Controller/BrowseEditAction.php:409
#, php-format
msgid "Edit %s %s"
msgstr "Edit %s %s"
-#: classes/Gems/Controller/BrowseEditAction.php:410
+#: classes/Gems/Controller/BrowseEditAction.php:411
#, php-format
msgid "Edit %s"
msgstr "Edit %s"
-#: classes/Gems/Controller/BrowseEditAction.php:508
+#: classes/Gems/Controller/BrowseEditAction.php:509
msgid "Free search text"
msgstr "Free search text"
-#: classes/Gems/Controller/BrowseEditAction.php:579
+#: classes/Gems/Controller/BrowseEditAction.php:580
msgid "Search"
msgstr "Search"
-#: classes/Gems/Controller/BrowseEditAction.php:595
+#: classes/Gems/Controller/BrowseEditAction.php:596
#, php-format
msgid "No %s found"
msgstr "No %s found"
-#: classes/Gems/Controller/BrowseEditAction.php:679
+#: classes/Gems/Controller/BrowseEditAction.php:680
#, php-format
msgid "No %s found."
msgstr "No %s found."
-#: classes/Gems/Controller/BrowseEditAction.php:797
+#: classes/Gems/Controller/BrowseEditAction.php:798
msgid "Are you sure?"
msgstr "Are you sure?"
-#: classes/Gems/Controller/BrowseEditAction.php:813
+#: classes/Gems/Controller/BrowseEditAction.php:814
msgid "Yes"
msgstr "Yes"
-#: classes/Gems/Controller/BrowseEditAction.php:814
+#: classes/Gems/Controller/BrowseEditAction.php:815
msgid "No"
msgstr "No"
-#: classes/Gems/Controller/BrowseEditAction.php:867
+#: classes/Gems/Controller/BrowseEditAction.php:868
#, php-format
msgid "Unknown %s requested"
msgstr "Unknown %s requested"
-#: classes/Gems/Controller/BrowseEditAction.php:890
+#: classes/Gems/Controller/BrowseEditAction.php:891
#, php-format
msgid "New %1$s..."
msgstr "New %1$s..."
-#: classes/Gems/Controller/BrowseEditAction.php:898
+#: classes/Gems/Controller/BrowseEditAction.php:899
msgid "Save"
msgstr "Save"
-#: classes/Gems/Controller/BrowseEditAction.php:934
+#: classes/Gems/Controller/BrowseEditAction.php:935
#, php-format
msgid "%2$u %1$s saved"
msgstr "%2$u %1$s saved"
-#: classes/Gems/Controller/BrowseEditAction.php:937
+#: classes/Gems/Controller/BrowseEditAction.php:938
msgid "No changes to save."
msgstr "No changes to save."
-#: classes/Gems/Controller/BrowseEditAction.php:946
+#: classes/Gems/Controller/BrowseEditAction.php:947
msgid "Input error! No changes saved!"
msgstr "Input error! No changes saved!"
-#: classes/Gems/Controller/BrowseEditAction.php:974
+#: classes/Gems/Controller/BrowseEditAction.php:975
#, php-format
msgid "Show %s"
msgstr "Show %s"
-#: classes/Gems/Controller/BrowseEditAction.php:981
+#: classes/Gems/Controller/BrowseEditAction.php:982
#, php-format
msgid "Unknown %s."
msgstr "Unknown %s."
@@ -1908,78 +1916,93 @@
msgstr "Patient number"
#: classes/Gems/Default/RespondentExportAction.php:78
+msgid "Separate multiple respondents with a comma (,)"
+msgstr "Separate multiple respondents with a comma (,)"
+
+#: classes/Gems/Default/RespondentExportAction.php:84
msgid "Group surveys"
msgstr "Group surveys"
-#: classes/Gems/Default/RespondentExportAction.php:87
+#: classes/Gems/Default/RespondentExportAction.php:89
msgid "Output format"
msgstr "Output format"
-#: classes/Gems/Default/RespondentExportAction.php:92
-msgid "Export"
-msgstr "Export"
-
-#: classes/Gems/Default/RespondentExportAction.php:124
+#: classes/Gems/Default/RespondentExportAction.php:131
#, php-format
msgid "Unable to run PDF conversion: \"%s\""
msgstr "Unable to run PDF conversion: \"%s\""
-#: classes/Gems/Default/RespondentExportAction.php:149
+#: classes/Gems/Default/RespondentExportAction.php:169
msgid "Round"
msgstr "Round"
-#: classes/Gems/Default/RespondentExportAction.php:151
+#: classes/Gems/Default/RespondentExportAction.php:180
+msgid "Open"
+msgstr "Open"
+
+#: classes/Gems/Default/RespondentExportAction.php:183
msgid "Completed"
msgstr "Completed"
-#: classes/Gems/Default/RespondentExportAction.php:156
+#: classes/Gems/Default/RespondentExportAction.php:189
+msgid "Missed"
+msgstr "Missed"
+
+#: classes/Gems/Default/RespondentExportAction.php:191
+#: classes/Gems/Default/RespondentExportAction.php:193
+msgid "Future"
+msgstr "Future"
+
+#: classes/Gems/Default/RespondentExportAction.php:198
msgid "Single Survey"
msgstr "Single Survey"
-#: classes/Gems/Default/RespondentExportAction.php:197
+#: classes/Gems/Default/RespondentExportAction.php:244
msgid "Enter the particulars concerning the assignment to this respondent."
msgstr "Enter the particulars concerning the assignment to this patient."
-#: classes/Gems/Default/RespondentExportAction.php:198
+#: classes/Gems/Default/RespondentExportAction.php:245
msgid "Assigned by"
msgstr "Assigned by"
-#: classes/Gems/Default/RespondentExportAction.php:199
+#: classes/Gems/Default/RespondentExportAction.php:246
msgid "Start"
msgstr "Start"
-#: classes/Gems/Default/RespondentExportAction.php:203
+#: classes/Gems/Default/RespondentExportAction.php:250
msgid "Comment"
msgstr "Comment"
-#: classes/Gems/Default/RespondentExportAction.php:211
+#: classes/Gems/Default/RespondentExportAction.php:258
msgid "Track information"
msgstr "Track information"
-#: classes/Gems/Default/RespondentExportAction.php:255
+#: classes/Gems/Default/RespondentExportAction.php:296
+#, php-format
+msgid "Unknown respondent %s"
+msgstr "Unknown respondent %s"
+
+#: classes/Gems/Default/RespondentExportAction.php:302
+#: classes/Gems/Default/RespondentExportAction.php:310
msgid "Respondent information"
msgstr "Patient information"
-#: classes/Gems/Default/RespondentExportAction.php:282
+#: classes/Gems/Default/RespondentExportAction.php:330
msgid "Respondent report"
msgstr "Respondent report"
-#: classes/Gems/Default/RespondentExportAction.php:286
+#: classes/Gems/Default/RespondentExportAction.php:334
msgid "Report information"
msgstr "Report information"
-#: classes/Gems/Default/RespondentExportAction.php:287
+#: classes/Gems/Default/RespondentExportAction.php:335
msgid "Generated by"
msgstr "Generated by"
-#: classes/Gems/Default/RespondentExportAction.php:289
+#: classes/Gems/Default/RespondentExportAction.php:337
msgid "Generated on"
msgstr "Generated on"
-#: classes/Gems/Default/RespondentExportAction.php:330
-msgid "Export respondent"
-msgstr "Export respondent"
-
#: classes/Gems/Default/RespondentPlanAction.php:67
msgid "Show respondent"
msgstr "Show patient"
@@ -2146,6 +2169,10 @@
msgid "Synchronize all sources."
msgstr "Synchronize all sources."
+#: classes/Gems/Default/StaffAction.php:122
+msgid "reset"
+msgstr "reset"
+
#: classes/Gems/Default/StaffAction.php:164
msgid "Unsupported User Definition"
msgstr "Unsupported User Definition"
@@ -2167,34 +2194,34 @@
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:309
+#: classes/Gems/Default/StaffAction.php:327
msgid "Username"
msgstr "Username"
-#: classes/Gems/Default/StaffAction.php:324
+#: classes/Gems/Default/StaffAction.php:342
msgid "Primary function"
msgstr "Primary function"
-#: classes/Gems/Default/StaffAction.php:334
+#: classes/Gems/Default/StaffAction.php:352
msgid "Can login"
msgstr "Can login"
-#: classes/Gems/Default/StaffAction.php:335
+#: classes/Gems/Default/StaffAction.php:353
msgid "Logout on survey"
msgstr "Logout on survey"
-#: classes/Gems/Default/StaffAction.php:410
+#: classes/Gems/Default/StaffAction.php:465
msgid "staff member"
msgid_plural "staff members"
msgstr[0] "staff member"
msgstr[1] "staff members"
-#: classes/Gems/Default/StaffAction.php:442
+#: classes/Gems/Default/StaffAction.php:494
#, php-format
msgid "Reset password for: %s"
msgstr "Reset password for: %s"
-#: classes/Gems/Default/StaffAction.php:445
+#: classes/Gems/Default/StaffAction.php:497
msgid "You are not allowed to change this password."
msgstr "You are not allowed to change this password."
@@ -2421,10 +2448,6 @@
msgid "Answered"
msgstr "Answered"
-#: classes/Gems/Default/TokenPlanAction.php:327
-msgid "Missed"
-msgstr "Missed"
-
#: classes/Gems/Default/TokenPlanAction.php:341
msgid "(all fillers)"
msgstr "(all fillers)"
@@ -2579,12 +2602,12 @@
msgstr "Code Name"
#: classes/Gems/Default/TrackFieldsAction.php:121
-#: classes/Gems/Default/TrackMaintenanceAction.php:224
+#: classes/Gems/Default/TrackMaintenanceAction.php:206
msgid "Values"
msgstr "Values"
#: classes/Gems/Default/TrackFieldsAction.php:123
-#: classes/Gems/Default/TrackMaintenanceAction.php:226
+#: classes/Gems/Default/TrackMaintenanceAction.php:208
msgid "Required"
msgstr "Required"
@@ -2602,31 +2625,24 @@
msgid "Fields"
msgstr "Fields"
-#: classes/Gems/Default/TrackMaintenanceAction.php:162
-msgid "This may take a while!"
-msgstr "This may take a while!"
+#: classes/Gems/Default/TrackMaintenanceAction.php:158
+msgid "Checking round assignments for all tracks."
+msgstr "Checking round assignments for all tracks."
-#: classes/Gems/Default/TrackMaintenanceAction.php:163
-msgid "Check all tracks"
-msgstr "Check all tracks"
+#: classes/Gems/Default/TrackMaintenanceAction.php:171
+#, php-format
+msgid "Checking round assignments for track '%s'."
+msgstr "Checking round assignments for track '%s'."
-#: classes/Gems/Default/TrackMaintenanceAction.php:164
-msgid "Checking all tracks will update all existing rounds to the current surveys in the tracks instead of those in use when the track was created."
-msgstr "Checking all tracks will update all existing rounds to the current surveys in the tracks instead of those in use when the track was created."
-
-#: classes/Gems/Default/TrackMaintenanceAction.php:165
-msgid "Completed tracks will not be changed. No new tokens will be created when later tokens were completed."
-msgstr "Completed tracks will not be changed. No new tokens will be created when later tokens were completed."
-
-#: classes/Gems/Default/TrackMaintenanceAction.php:279
+#: classes/Gems/Default/TrackMaintenanceAction.php:261
msgid "fields"
msgstr "fields"
-#: classes/Gems/Default/TrackMaintenanceAction.php:280
+#: classes/Gems/Default/TrackMaintenanceAction.php:262
msgid "rounds"
msgstr "rounds"
-#: classes/Gems/Default/TrackMaintenanceAction.php:306
+#: classes/Gems/Default/TrackMaintenanceAction.php:288
#, php-format
msgid "%s in track"
msgstr "%s in track"
@@ -2884,8 +2900,8 @@
#: classes/Gems/Menu/MenuAbstract.php:421
#: classes/Gems/Menu/MenuAbstract.php:433
-msgid "Check answers"
-msgstr "Check answers"
+msgid "Check is answered"
+msgstr "Check is answered"
#: classes/Gems/Menu/MenuAbstract.php:422
msgid "Check attributes"
@@ -2897,8 +2913,8 @@
#: classes/Gems/Menu/MenuAbstract.php:424
#: classes/Gems/Menu/MenuAbstract.php:434
-msgid "Check all answers"
-msgstr "Check all answers"
+msgid "Check all is answered"
+msgstr "Check all is answered"
#: classes/Gems/Menu/MenuAbstract.php:430
msgid "PDF"
@@ -3182,6 +3198,7 @@
msgstr "%d sources checked."
#: classes/Gems/Tracker/Engine/AnyStepEngine.php:95
+#: classes/Gems/Tracker/Engine/NextStepEngine.php:92
msgid "This round"
msgstr "This round"
@@ -3302,32 +3319,32 @@
msgid "Use a track level date."
msgstr "Use a track level date."
-#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:445
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:443
#, php-format
msgid "%s track engines cannot be converted to %s track engines."
msgstr "%s track engines cannot be converted to %s track engines."
-#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:688
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:686
#, php-format
msgid "%d: %s - %s"
msgstr "%d: %s - %s"
-#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:691
-#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:694
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:689
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:692
#, php-format
msgid "%d: %s"
msgstr "%d: %s"
-#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:697
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:695
#, php-format
msgid "%s - %s"
msgstr "%s - %s"
-#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:737
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:735
msgid "Icon"
msgstr "Icon"
-#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:740
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:738
msgid "After change"
msgstr "After change"
@@ -3717,33 +3734,33 @@
msgid "Shared secret"
msgstr "Shared secret"
-#: classes/Gems/User/User.php:392
+#: classes/Gems/User/User.php:395
#, php-format
msgid "Your account is temporarily blocked, please wait a minute."
msgid_plural "Your account is temporarily blocked, please wait %d minutes."
msgstr[0] "Your account is temporarily blocked, please wait a minute."
msgstr[1] "Your account is temporarily blocked, please wait %d minutes."
-#: classes/Gems/User/User.php:431
-#: classes/Gems/User/User.php:458
+#: classes/Gems/User/User.php:434
+#: classes/Gems/User/User.php:461
msgid "You are not allowed to login from this location."
msgstr "You are not allowed to login from this location."
-#: classes/Gems/User/User.php:1123
+#: classes/Gems/User/User.php:1140
msgid "Your birthday"
msgstr "Your birthday"
-#: classes/Gems/User/User.php:1139
+#: classes/Gems/User/User.php:1156
#: classes/Gems/User/Form/ChangePasswordForm.php:163
#, php-format
msgid "%s is not correct."
msgstr "%s is not correct."
-#: classes/Gems/User/User.php:1221
+#: classes/Gems/User/User.php:1238
msgid "Trying to send a password reset to a user that cannot be reset."
msgstr "Trying to send a password reset to a user that cannot be reset."
-#: classes/Gems/User/User.php:1249
+#: classes/Gems/User/User.php:1266
msgid "Unable to send e-mail."
msgstr "Unable to send e-mail."
@@ -3997,7 +4014,7 @@
msgstr "Value is required and can't be empty"
#: languages/FakeTranslations.php:41
-#: languages/FakeTranslations.php:81
+#: languages/FakeTranslations.php:82
msgid "Invalid type given, value should be string, integer or float"
msgstr "Invalid type given, value should be string, integer or float"
@@ -4015,72 +4032,76 @@
msgid "Date should be '%dateAfter%' or later."
msgstr "Date should be '%dateAfter%' or later."
-#: languages/FakeTranslations.php:53
+#: languages/FakeTranslations.php:51
+msgid "Should be empty if valid from date is not set."
+msgstr "Should be empty if valid from date is not set."
+
+#: languages/FakeTranslations.php:54
#, php-format
msgid "Date should be '%dateBefore%' or earlier."
msgstr "Date should be '%dateBefore%' or earlier."
-#: languages/FakeTranslations.php:56
+#: languages/FakeTranslations.php:57
msgid "%value% is not a valid date."
msgstr "%value% is not a valid date."
-#: languages/FakeTranslations.php:59
+#: languages/FakeTranslations.php:60
msgid "No record matching %value% was found."
msgstr "No record matching %value% was found."
-#: languages/FakeTranslations.php:60
+#: languages/FakeTranslations.php:61
msgid "A duplicate record matching '%value%' was found."
msgstr "A duplicate record matching '%value%' was found."
-#: languages/FakeTranslations.php:63
+#: languages/FakeTranslations.php:64
msgid "This is not a valid %testDescription%."
msgstr "This is not a valid %testDescription%."
-#: languages/FakeTranslations.php:64
+#: languages/FakeTranslations.php:65
msgid "A %testDescription% cannot contain letters."
msgstr "A %testDescription% cannot contain letters."
-#: languages/FakeTranslations.php:65
+#: languages/FakeTranslations.php:66
msgid "%value% is too long for a %testDescription%. Should be %length% digits."
msgstr "%value% is too long for a %testDescription%. Should be %length% digits."
-#: languages/FakeTranslations.php:66
+#: languages/FakeTranslations.php:67
msgid "%value% is too short for a %testDescription%. Should be %length% digits."
msgstr "%value% is too short for a %testDescription%. Should be %length% digits."
-#: languages/FakeTranslations.php:72
+#: languages/FakeTranslations.php:73
msgid "'%value%' is not a phone number (e.g. +12 (0)34-567 890)."
msgstr "'%value%' is not a phone number (e.g. +12 (0)34-567 890)."
-#: languages/FakeTranslations.php:75
+#: languages/FakeTranslations.php:76
msgid "Unsupported PDF version %value% - only versions 1.0 - 1.4 are supported."
msgstr "Unsupported PDF version %value% - only versions 1.0 - 1.4 are supported."
-#: languages/FakeTranslations.php:78
+#: languages/FakeTranslations.php:79
msgid "To set '%description%' you have to set '%fieldDescription%'."
msgstr "To set '%description%' you have to set '%fieldDescription%'."
-#: languages/FakeTranslations.php:82
+#: languages/FakeTranslations.php:83
msgid "'%value%' is not an email address (e.g. na...@so...)."
msgstr "'%value%' is not an email address (e.g. na...@so...)."
-#: languages/FakeTranslations.php:85
+#: languages/FakeTranslations.php:86
msgid "'%value%' is not a series of email addresses (e.g. na...@so..., no...@no...)."
msgstr "'%value%' is not a series of email addresses (e.g. na...@so..., no...@no...)."
-#: languages/FakeTranslations.php:88
+#: languages/FakeTranslations.php:89
msgid "'%value%' must contain only digits"
msgstr "'%value%' must contain only digits"
-#: languages/FakeTranslations.php:89
+#: languages/FakeTranslations.php:90
msgid "'%value%' is an empty string"
msgstr "'%value%' is an empty string"
-#: languages/FakeTranslations.php:90
+#: languages/FakeTranslations.php:91
msgid "Invalid type given. String, integer or float expected"
msgstr "Invalid type given. String, integer or float expected"
-#: languages/FakeTranslations.php:93
+#: languages/FakeTranslations.php:94
msgid "One or more IPs are illegal."
msgstr "One or more IPs are illegal."
@@ -4340,6 +4361,29 @@
msgstr[0] "After this survey there is one other survey we would like you to answer."
msgstr[1] "After this survey there are another %d surveys we would like you to answer."
+#~ msgid "Check all is answersed"
+#~ msgstr "Check all is answersed"
+
+#~ msgid "This may take a while!"
+#~ msgstr "This may take a while!"
+
+#~ msgid "Check all tracks"
+#~ msgstr "Check all tracks"
+
+#~ msgid ""
+#~ "Checking all tracks will update all existing rounds to the current "
+#~ "surveys in the tracks instead of those in use when the track was created."
+#~ msgstr ""
+#~ "Checking all tracks will update all existing rounds to the current "
+#~ "surveys in the tracks instead of those in use when the track was created."
+
+#~ msgid ""
+#~ "Completed tracks will not be changed. No new tokens will be created when "
+#~ "later tokens were completed."
+#~ msgstr ""
+#~ "Completed tracks will not be changed. No new tokens will be created when "
+#~ "later tokens were completed."
+
#~ msgid "The Pulse software was made possible thanks to support from "
#~ msgstr "The Pulse software was made possible thanks to support from "
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2012-06-11 09:36:00 UTC (rev 751)
+++ trunk/library/languages/default-nl.po 2012-06-11 12:55:54 UTC (rev 752)
@@ -1,5099 +1,5129 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: GemsTracker NL\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-11 11:34+0100\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Michiel Rook <in...@to...>\n"
-"Language-Team: Erasmus MGZ <mat...@ma...>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Poedit-Language: Dutch\n"
-"X-Poedit-Country: NETHERLANDS\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Poedit-Basepath: ../\n"
-"X-Poedit-KeywordsList: plural:1,2\n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: classes/GemsEscort.php:214
-#, php-format
-msgid "Path %s not writable"
-msgstr "Path %s niet schrijfbaar"
-
-#: classes/GemsEscort.php:756
-#, php-format
-msgid "You are logged in as %s"
-msgstr "Ingelogd als %s"
-
-#: classes/GemsEscort.php:758
-msgid "Logoff"
-msgstr "Uitloggen"
-
-#: classes/GemsEscort.php:761
-msgid "You are not logged in"
-msgstr "U bent niet ingelogd"
-
-#: classes/GemsEscort.php:945
-#, php-format
-msgid "User: %s"
-msgstr "Login: %s"
-
-#: classes/GemsEscort.php:970
-msgid "version"
-msgstr "versie"
-
-#: classes/GemsEscort.php:1412
-msgid "Take note: your session has expired, your inputs were not saved. Please check the input data and try again"
-msgstr "Let op: uw sessie is verlopen, uw invoer is niet opgeslagen. Controleer uw gegevens en probeer a.u.b. opnieuw."
-
-#: classes/GemsEscort.php:1543
-msgid "Please check back later."
-msgstr "Probeer het later opnieuw."
-
-#: classes/GemsEscort.php:1545
-#: classes/GemsEscort.php:1550
-msgid "System is in maintenance mode"
-msgstr "Systeem is in onderhoudsmodus"
-
-#: classes/GemsEscort.php:1560
-msgid "No access to site."
-msgstr "Geen toegang tot website."
-
-#: classes/GemsEscort.php:1562
-msgid "You have no access to this site."
-msgstr "U heeft geen toegang tot deze website."
-
-#: classes/GemsEscort.php:1578
-msgid "No access to page"
-msgstr "Geen toegang tot pagina"
-
-#: classes/GemsEscort.php:1580
-#, php-format
-msgid "Access to this page is not allowed for current role: %s."
-msgstr "U heeft geen toegang tot deze pagina. Uw huidige rol is: %s."
-
-#: classes/GemsEscort.php:1590
-msgid "You are no longer logged in."
-msgstr "U bent niet meer ingelogd."
-
-#: classes/GemsEscort.php:1591
-msgid "You must login to access this page."
-msgstr "U moet ingelogd zijn voor toegang tot deze pagina."
-
-#: classes/GemsEscort.php:1732
-#, php-format
-msgid "%d survey"
-msgid_plural "%d surveys"
-msgstr[0] "%d vragenlijst"
-msgstr[1] "%d vragenlijsten"
-
-#: classes/Gems/Pdf.php:198
-#, php-format
-msgid "PDF Source File '%s' not found!"
-msgstr "PDF bron bestand %s niet gevonden!"
-
-#: classes/Gems/Pdf.php:240
-#, php-format
-msgid "Could not create '%s' directory."
-msgstr "Kon de directory '%s' niet aanmaken."
-
-#: classes/Gems/Pdf.php:283
-#, php-format
-msgid " The error message is: %s"
-msgstr "De foutmelding is: %s"
-
-#: classes/Gems/Upgrades.php:79
-msgid "Syncing surveys for all sources"
-msgstr "Vragenlijsten synchroniseren voor alle bronnen."
-
-#: classes/Gems/AccessLog.php:236
-msgid "Database needs to be updated!"
-msgstr "Database dient ververst te worden!"
-
-#: classes/Gems/Html.php:155
-msgid "<< First"
-msgstr "<< Eerste"
-
-#: classes/Gems/Html.php:156
-msgid "< Previous"
-msgstr "< Terug"
-
-#: classes/Gems/Html.php:157
-msgid "Next >"
-msgstr "Verder >"
-
-#: classes/Gems/Html.php:158
-msgid "Last >>"
-msgstr "Laatste >>"
-
-#: classes/Gems/Html.php:159
-msgid " | "
-msgstr " | "
-
-#: classes/Gems/Html.php:163
-msgid "to"
-msgstr "tot"
-
-#: classes/Gems/Html.php:164
-msgid "of"
-msgstr "van"
-
-#: classes/Gems/Menu.php:140
-#, php-format
-msgid "About %s"
-msgstr "Over %s"
-
-#: classes/Gems/Menu.php:144
-msgid "Reporting bugs"
-msgstr "Meld een bug"
-
-#: classes/Gems/Menu.php:147
-msgid "Support"
-msgstr "Ondersteuning"
-
-#: classes/Gems/Menu.php:167
-msgid "Project setup"
-msgstr "Projectinfo"
-
-#: classes/Gems/Menu.php:170
-msgid "Database"
-msgstr "Database"
-
-#: classes/Gems/Menu.php:174
-msgid "Content"
-msgstr "Inhoud"
-
-#: classes/Gems/Menu.php:177
-msgid "Execute"
-msgstr "Uitvoeren"
-
-#: classes/Gems/Menu.php:182
-msgid "Patches"
-msgstr "Patches"
-
-#: classes/Gems/Menu.php:183
-msgid "Execute new"
-msgstr "Nieuwe aanmaken"
-
-#: classes/Gems/Menu.php:185
-msgid "Refresh translateables"
-msgstr "Ververs vertaalbaren"
-
-#: classes/Gems/Menu.php:187
-msgid "Run SQL"
-msgstr "SQL uitvoeren"
-
-#: classes/Gems/Menu.php:190
-msgid "Reception codes"
-msgstr "Ontvangst codes"
-
-#: classes/Gems/Menu.php:193
-msgid "Consents"
-msgstr "Toestemmingen"
-
-#: classes/Gems/Menu.php:196
-msgid "Roles"
-msgstr "Rollen"
-
-#: classes/Gems/Menu.php:197
-msgid "Assigned"
-msgstr "Toegewezen"
-
-#: classes/Gems/Menu.php:198
-msgid "Privileges"
-msgstr "Priviléges"
-
-#: classes/Gems/Menu.php:201
-msgid "Groups"
-msgstr "Groepen"
-
-#: classes/Gems/Menu.php:204
-msgid "Organizations"
-msgstr "Organisaties"
-
-#: classes/Gems/Menu.php:207
-msgid "Staff"
-msgstr "Medewerkers"
-
-#: classes/Gems/Menu.php:210
-msgid "Logging"
-msgstr "Logboek"
-
-#: classes/Gems/Menu.php:214
-msgid "Maintenance"
-msgstr "Onderhoud"
-
-#: classes/Gems/Menu.php:219
-msgid "Upgrade"
-msgstr "Upgrade"
-
-#: classes/Gems/Menu.php:220
-msgid "Show"
-msgstr "Toon"
-
-#: classes/Gems/Menu.php:221
-msgid "Execute all"
-msgstr "Alles uitvoeren"
-
-#: classes/Gems/Menu.php:222
-msgid "Execute this"
-msgstr "Dit uitvoeren"
-
-#: classes/Gems/Menu.php:223
-msgid "Execute from here"
-msgstr "Uitvoeren vanaf hier"
-
-#: classes/Gems/Menu.php:224
-msgid "Execute to here"
-msgstr "Uitvoeren tot hier"
-
-#: classes/Gems/Menu.php:236
-#, php-format
-msgid "Stand-alone privilige: %s"
-msgstr "Zelfstandig privilege: %s"
-
-#: classes/Gems/Menu.php:243
-msgid "Logon"
-msgstr "Login"
-
-#: classes/Gems/Menu.php:244
-msgid "Lost password"
-msgstr "Wachtwoord vergeten"
-
-#: classes/Gems/Menu.php:245
-msgid "Your account"
-msgstr "Uw account"
-
-#: classes/Gems/Menu.php:246
-msgid "Activity overview"
-msgstr "Activiteiten overzicht"
-
-#: classes/Gems/Menu.php:247
-msgid "Change password"
-msgstr "Uw wachtwoord"
-
-#: classes/Gems/Menu.php:248
-#: classes/Gems/Menu.php:324
-msgid "Token"
-msgstr "Kenmerk"
-
-#: classes/Gems/Menu.php:280
-msgid "Export"
-msgstr "Exporteer"
-
-#: classes/Gems/Menu.php:285
-msgid "Track"
-msgstr "Traject"
-
-#: classes/Gems/Menu.php:292
-#: classes/Gems/Menu.php:343
-msgid "Add"
-msgstr "Voeg toe"
-
-#: classes/Gems/Menu.php:296
-msgid "Preview"
-msgstr "Preview"
-
-#: classes/Gems/Menu.php:303
-msgid "Tracks"
-msgstr "Trajecten"
-
-#: classes/Gems/Menu.php:316
-msgid "Assignments"
-msgstr "Toewijzingen"
-
-#: classes/Gems/Menu.php:328
-msgid "Edit"
-msgstr "Wijzig"
-
-#: classes/Gems/Menu.php:332
-msgid "Delete"
-msgstr "Verwijder"
-
-#: classes/Gems/Menu.php:337
-msgid "Surveys"
-msgstr "Vragenlijsten"
-
-#: classes/Gems/Menu.php:369
-msgid "Fill in"
-msgstr "Vul in"
-
-#: classes/Gems/Menu.php:372
-msgid "Print PDF"
-msgstr "Print PDF"
-
-#: classes/Gems/Menu.php:375
-msgid "E-Mail now!"
-msgstr "Email nu!"
-
-#: classes/Gems/Menu.php:381
-msgid "Answers"
-msgstr "Antwoorden"
-
-#: classes/Gems/Menu.php:531
-msgid "Respondents"
-msgstr "Patiënten"
-
-#: classes/Gems/Menu.php:539
-msgid "Overview"
-msgstr "Overzicht"
-
-#: classes/Gems/Menu.php:546
-msgid "Project"
-msgstr "Project"
-
-#: classes/Gems/Menu.php:549
-msgid "Setup"
-msgstr "Beheer"
-
-#: classes/Gems/Menu.php:552
-msgid "Mail"
-msgstr "Email"
-
-#: classes/Gems/Menu.php:555
-msgid "Track Builder"
-msgstr "Traject bouwer"
-
-#: classes/Gems/Menu.php:561
-msgid "Export respondent"
-msgstr "Exporteer patiënt"
-
-#: classes/Gems/Menu.php:567
-msgid "Contact"
-msgstr "Contact"
-
-#: classes/Gems/Menu.php:580
-msgid "Changelog"
-msgstr "Changelog"
-
-#: classes/Gems/Model.php:230
-msgid "Respondent nr"
-msgstr "Patiënt nr"
-
-#: classes/Gems/Model.php:231
-msgid "Opened"
-msgstr "Bekeken op"
-
-#: classes/Gems/Model.php:232
-msgid "Consent"
-msgstr "Toestemming"
-
-#: classes/Gems/Model.php:234
-msgid "E-Mail"
-msgstr "Email"
-
-#: classes/Gems/Model.php:239
-msgid "Gender"
-msgstr "Geslacht"
-
-#: classes/Gems/Model.php:240
-msgid "First name"
-msgstr "Voornaam"
-
-#: classes/Gems/Model.php:241
-msgid "Surname prefix"
-msgstr "Tussenvoegsel"
-
-#: classes/Gems/Model.php:242
-msgid "Last name"
-msgstr "Achternaam"
-
-#: classes/Gems/Model.php:244
-msgid "Name"
-msgstr "Naam"
-
-#: classes/Gems/Model.php:247
-msgid "Street"
-msgstr "Straat"
-
-#: classes/Gems/Model.php:248
-msgid "Zipcode"
-msgstr "Postcode"
-
-#: classes/Gems/Model.php:249
-msgid "City"
-msgstr "Woonplaats"
-
-#: classes/Gems/Model.php:251
-msgid "Phone"
-msgstr "Telefoon"
-
-#: classes/Gems/Model.php:253
-msgid "Birthday"
-msgstr "Geboren op"
-
-#: classes/Gems/UpgradesAbstract.php:154
-msgid "Already at max. level."
-msgstr "Al op het hoogste niveau."
-
-#: classes/Gems/UpgradesAbstract.php:161
-#, php-format
-msgid "Trying upgrade for %s from level %s to level %s"
-msgstr "Probeert upgrade voor %s van niveau %s naar niveau %s uit te voeren"
-
-#: classes/Gems/UpgradesAbstract.php:169
-#, php-format
-msgid "Trying upgrade for %s to level %s: %s"
-msgstr "Probeert upgrade voor %s naar niveau %s: %s"
-
-#: classes/Gems/Model/DbaModel.php:97
-msgid "created"
-msgstr "bestaat"
-
-#: classes/Gems/Model/DbaModel.php:98
-msgid "not created"
-msgstr "niet aanwezig"
-
-#: classes/Gems/Model/DbaModel.php:99
-msgid "unknown"
-msgstr "onbekend"
-
-#: classes/Gems/Model/DbaModel.php:420
-#, php-format
-msgid "Executed %2$s creation script %1$s:"
-msgstr "Uitvoerresultaat %2$s script %1$s:"
-
-#: classes/Gems/Model/DbaModel.php:430
-#, php-format
-msgid "%d record(s) returned as result set %d in step %d of %d."
-msgstr "%d rij(en) in resultaat %d in stap %d van %d."
-
-#: classes/Gems/Model/DbaModel.php:434
-#, php-format
-msgid "%d record(s) updated in step %d of %d."
-msgstr "In stap %2$d van %3$d zijn %1$d rij(en) aangepast."
-
-#: classes/Gems/Model/DbaModel.php:437
-#, php-format
-msgid "Script ran step %d of %d succesfully."
-msgstr "Stap %d van %d in het script met succes uitgevoerd."
-
-#: classes/Gems/Model/DbaModel.php:440
-msgid " in step "
-msgstr " in stap "
-
-#: classes/Gems/Model/DbaModel.php:445
-#, php-format
-msgid "No script for %1$s."
-msgstr "Geen script voor %1$s:"
-
-#: classes/Gems/Export/Spss.php:59
-msgid "Which file"
-msgstr "Kies bestand"
-
-#: classes/Gems/Export/Spss.php:60
-msgid "syntax"
-msgstr "syntax"
-
-#: classes/Gems/Export/Spss.php:61
-msgid "data"
-msgstr "data"
-
-#: classes/Gems/Export/Spss.php:66
-msgid "Some help for this export"
-msgstr "Uitleg over deze export mogelijkheid"
-
-#: classes/Gems/Export/Excel.php:60
-msgid "Excel options"
-msgstr "Excel opties"
-
-#: classes/Gems/Export/Excel.php:62
-msgid "Export questions instead of variable names"
-msgstr "Exporteer vragen in plaats van variabele namen"
-
-#: classes/Gems/Export/Excel.php:63
-msgid "Format answers"
-msgstr "Antwoorden opmaken"
-
-#: classes/Gems/Util/Translated.php:81
-msgid "-"
-msgstr "n.v.t."
-
-#: classes/Gems/Util/Translated.php:96
-msgid "forever"
-msgstr "altijd"
-
-#: classes/Gems/Util/Translated.php:105
-msgid "n/a"
-msgstr "n.v.t."
-
-#: classes/Gems/Util/Translated.php:114
-msgid "never"
-msgstr "nooit"
-
-#: classes/Gems/Util/Translated.php:139
-msgid "2 days ago"
-msgstr "Eergisteren"
-
-#: classes/Gems/Util/Translated.php:142
-msgid "Yesterday"
-msgstr "Gisteren"
-
-#: classes/Gems/Util/Translated.php:145
-msgid "Today"
-msgstr "Vandaag"
-
-#: classes/Gems/Util/Translated.php:148
-msgid "Tomorrow"
-msgstr "Morgen"
-
-#: classes/Gems/Util/Translated.php:151
-msgid "Over 2 days"
-msgstr "Overmorgen"
-
-#: classes/Gems/Util/Translated.php:156
-#, php-format
-msgid "Over %d days"
-msgstr "Over %d dagen"
-
-#: classes/Gems/Util/Translated.php:158
-#, php-format
-msgid "%d days ago"
-msgstr "%d dagen terug"
-
-#: classes/Gems/Util/Translated.php:177
-msgid "Send multiple mails per respondent, one for each checked token."
-msgstr "Verstuur meerdere emails per patiënt, één per gekozen kenmerk."
-
-#: classes/Gems/Util/Translated.php:178
-msgid "Send one mail per respondent, mark all checked tokens as send."
-msgstr "Verstuur één email per patiënt, zet alle gekozen kenmerken op verzonden."
-
-#: classes/Gems/Util/Translated.php:179
-msgid "Send one mail per respondent, mark only mailed tokens as send."
-msgstr "Verstuur één email per patiënt, zet alleen de verzonden kenmerken op verzonden."
-
-#: classes/Gems/Util/Translated.php:204
-msgid "Male"
-msgstr "Man"
-
-#: classes/Gems/Util/Translated.php:204
-msgid "Female"
-msgstr "Vrouw...
[truncated message content] |
