Menu
▾
▴
[Gemstracker-svn] SF.net SVN: gemstracker:[51] trunk/library
|
From: <gem...@li...> - 2011-09-20 15:42:19
|
Revision: 51
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=51&view=rev
Author: matijsdejong
Date: 2011-09-20 15:42:08 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
- put the log into respondent_communications table name
- added template save to OneMailForm.php
- made temporary old style controller for mail log
Modified Paths:
--------------
trunk/library/classes/Gems/Default/MailLogAction.php
trunk/library/classes/Gems/Default/RespondentAction.php
trunk/library/classes/Gems/Email/OneMailForm.php
trunk/library/classes/Gems/Email/TemplateMailer.php
trunk/library/classes/Gems/Tracker/Model/StandardTokenModel.php
trunk/library/configs/db/patches.sql
trunk/library/controllers/MailLogController.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
Added Paths:
-----------
trunk/library/classes/Gems/Default/MailLogActionOldStyle.php
trunk/library/configs/db/tables/gems__log_respondent_communications.500.sql
trunk/library/configs/db/tables/gems__mail_jobs.300.sql
Removed Paths:
-------------
trunk/library/configs/db/tables/gems__respondent_communications.60.sql
Modified: trunk/library/classes/Gems/Default/MailLogAction.php
===================================================================
--- trunk/library/classes/Gems/Default/MailLogAction.php 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/classes/Gems/Default/MailLogAction.php 2011-09-20 15:42:08 UTC (rev 51)
@@ -62,16 +62,44 @@
*/
public function createModel($detailed, $action)
{
- $model = new MUtil_Model_TableModel('gems__respondent_communications');
+ $model = new Gems_Model_JoinModel('maillog', 'gems__log_respondent_communications');
- // $model->set('grco_id_to', 'label', $this->_(''));
- // $model->set('grco_id_by', 'label', $this->_(''));
- $model->set('grco_address', 'label', $this->_('To'));
- $model->set('grco_sender', 'label', $this->_('From'));
- $model->set('grco_topic', 'label', $this->_('Subject'));
- $model->set('grco_created', 'label', $this->_('Date sent'));
- // $model->set('', 'label', $this->_(''));
+ $model->addLeftTable('gems__respondents', array('grco_id_to' => 'grs_id_user'));
+ $model->addLeftTable('gems__staff', array('grco_id_by' => 'gsf_id_user'));
+ $model->addLeftTable('gems__mail_templates', array('grco_id_message' => 'gmt_id_message'));
+ $model->addColumn(
+ "TRIM(CONCAT(COALESCE(CONCAT(grs_last_name, ', '), '-, '), COALESCE(CONCAT(grs_first_name, ' '), ''), COALESCE(grs_surname_prefix, '')))",
+ 'respondent_name');
+ $model->addColumn(
+ "CASE WHEN gems__staff.gsf_id_user IS NULL
+ THEN '-'
+ ELSE
+ CONCAT(
+ COALESCE(gems__staff.gsf_last_name, ''),
+ ', ',
+ COALESCE(gems__staff.gsf_first_name, ''),
+ COALESCE(CONCAT(' ', gems__staff.gsf_surname_prefix), '')
+ )
+ END",
+ 'assigned_by');
+
+ $model->resetOrder();
+
+ $model->set('grco_created', 'label', $this->_('Date sent'));
+ $model->set('respondent_name', 'label', $this->_('Receiver'));
+ $model->set('grco_address', 'label', $this->_('To address'), 'itemDisplay', 'MUtil_Html_AElement::ifmail');
+ $model->set('assigned_by', 'label', $this->_('Sender'));
+ $model->set('grco_sender', 'label', $this->_('From address'), 'itemDisplay', 'MUtil_Html_AElement::ifmail');
+ $model->set('grco_id_token', 'label', $this->_('Token'));
+ $model->set('grco_topic', 'label', $this->_('Subject'));
+
+ if ($detailed) {
+ $model->set('gmt_subject', 'label', $this->_('Template'));
+ } else {
+ $model->set('grco_created', 'formatFunction', $this->util->getTranslated()->formatDate);
+ }
+
return $model;
}
Added: trunk/library/classes/Gems/Default/MailLogActionOldStyle.php
===================================================================
--- trunk/library/classes/Gems/Default/MailLogActionOldStyle.php (rev 0)
+++ trunk/library/classes/Gems/Default/MailLogActionOldStyle.php 2011-09-20 15:42:08 UTC (rev 51)
@@ -0,0 +1,150 @@
+<?php
+
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Short description of file
+ *
+ * @package Gems
+ * @subpackage Default
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: Sample.php 203 2011-07-07 12:51:32Z matijs $
+ */
+
+/**
+ * Temprary class until Gems_Controller_ModelSnippetActionAbstract works
+ *
+ * @package Gems
+ * @subpackage Default
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.4.2
+ */
+class Gems_Default_MailLogActionOldStyle extends Gems_Controller_BrowseEditAction
+{
+ public $sortKey = array('grco_created' => SORT_DESC);
+
+ /**
+ * Adds columns from the model to the bridge that creates the browse table.
+ *
+ * Adds a button column to the model, if such a button exists in the model.
+ *
+ * @param MUtil_Model_TableBridge $bridge
+ * @param MUtil_Model_ModelAbstract $model
+ * @rturn void
+ */
+ protected function addBrowseTableColumns(MUtil_Model_TableBridge $bridge, MUtil_Model_ModelAbstract $model)
+ {
+ if ($menuItem = $this->findAllowedMenuItem('show')) {
+ $bridge->addItemLink($menuItem->toActionLinkLower($this->getRequest(), $bridge));
+ }
+
+ // Newline placeholder
+ $br = MUtil_Html::create('br');
+
+ $bridge->addMultiSort('grco_created', $br, 'respondent_name', $br, 'grco_address');
+ $bridge->addMultiSort('grco_id_token', $br, 'assigned_by', $br, 'grco_sender');
+ $bridge->addMultiSort('grco_topic');
+ }
+
+ /**
+ * Creates a model for getModel(). Called only for each new $action.
+ *
+ * The parameters allow you to easily adapt the model to the current action. The $detailed
+ * parameter was added, because the most common use of action is a split between detailed
+ * and summarized actions.
+ *
+ * @param boolean $detailed True when the current action is not in $summarizedActions.
+ * @param string $action The current action.
+ * @return MUtil_Model_ModelAbstract
+ */
+ public function createModel($detailed, $action)
+ {
+ $model = new Gems_Model_JoinModel('maillog', 'gems__log_respondent_communications');
+
+ $model->addLeftTable('gems__respondents', array('grco_id_to' => 'grs_id_user'));
+ $model->addLeftTable('gems__staff', array('grco_id_by' => 'gsf_id_user'));
+ $model->addLeftTable('gems__mail_templates', array('grco_id_message' => 'gmt_id_message'));
+
+ $model->addColumn(
+ "TRIM(CONCAT(COALESCE(CONCAT(grs_last_name, ', '), '-, '), COALESCE(CONCAT(grs_first_name, ' '), ''), COALESCE(grs_surname_prefix, '')))",
+ 'respondent_name');
+ $model->addColumn(
+ "CASE WHEN gems__staff.gsf_id_user IS NULL
+ THEN '-'
+ ELSE
+ CONCAT(
+ COALESCE(gems__staff.gsf_last_name, ''),
+ ', ',
+ COALESCE(gems__staff.gsf_first_name, ''),
+ COALESCE(CONCAT(' ', gems__staff.gsf_surname_prefix), '')
+ )
+ END",
+ 'assigned_by');
+
+ $model->resetOrder();
+
+ $model->set('grco_created', 'label', $this->_('Date sent'));
+ $model->set('respondent_name', 'label', $this->_('Receiver'));
+ $model->set('grco_address', 'label', $this->_('To address'), 'itemDisplay', 'MUtil_Html_AElement::ifmail');
+ $model->set('assigned_by', 'label', $this->_('Sender'));
+ $model->set('grco_sender', 'label', $this->_('From address'), 'itemDisplay', 'MUtil_Html_AElement::ifmail');
+ $model->set('grco_id_token', 'label', $this->_('Token'));
+ $model->set('grco_topic', 'label', $this->_('Subject'));
+
+ if ($detailed) {
+ $model->set('gmt_subject', 'label', $this->_('Template'));
+ } else {
+ $model->set('grco_created', 'formatFunction', $this->util->getTranslated()->formatDate);
+ }
+
+ return $model;
+ }
+
+ /**
+ * Helper function to allow generalized statements about the items in the model.
+ *
+ * @param int $count
+ * @return $string
+ */
+ public function getTopic($count = 1)
+ {
+ return $this->plural('Activity Log', 'Activity Logs', $count);
+ }
+
+
+ /**
+ * Helper function to allow generalized treatment of the header.
+ *
+ * return $string
+ */
+ public function getTopicTitle()
+ {
+ return $this->_('Mail Activity Log');
+ }
+}
Modified: trunk/library/classes/Gems/Default/RespondentAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RespondentAction.php 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/classes/Gems/Default/RespondentAction.php 2011-09-20 15:42:08 UTC (rev 51)
@@ -59,6 +59,15 @@
public $useTabbedForms = true;
+ /**
+ * Adds columns from the model to the bridge that creates the browse table.
+ *
+ * Adds a button column to the model, if such a button exists in the model.
+ *
+ * @param MUtil_Model_TableBridge $bridge
+ * @param MUtil_Model_ModelAbstract $model
+ * @rturn void
+ */
protected function addBrowseTableColumns(MUtil_Model_TableBridge $bridge, MUtil_Model_ModelAbstract $model)
{
$model->setIfExists('gr2o_opened', 'tableDisplay', 'small');
Modified: trunk/library/classes/Gems/Email/OneMailForm.php
===================================================================
--- trunk/library/classes/Gems/Email/OneMailForm.php 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/classes/Gems/Email/OneMailForm.php 2011-09-20 15:42:08 UTC (rev 51)
@@ -134,6 +134,7 @@
$this->mailer->setSubject($this->getValue('gmt_subject'));
$this->mailer->setBody($this->getValue('gmt_body'));
+ $this->mailer->setTemplateId($this->getValue('select_subject'));
if ($message = $this->mailer->processMail($tokenData)) {
$this->addMessage($this->escort->_('Mail failed to send.'));
Modified: trunk/library/classes/Gems/Email/TemplateMailer.php
===================================================================
--- trunk/library/classes/Gems/Email/TemplateMailer.php 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/classes/Gems/Email/TemplateMailer.php 2011-09-20 15:42:08 UTC (rev 51)
@@ -481,7 +481,7 @@
$cdata['grco_id_by'] = $uid;
$cdata['grco_organization'] = $tokenData['gor_id_organization'];
$cdata['grco_id_token'] = $tokenData['gto_id_token'];
-
+
$cdata['grco_method'] = 'email';
$cdata['grco_topic'] = substr($this->_mailSubject, 0, 120);
$cdata['grco_address'] = substr($to, 0, 120);
@@ -494,7 +494,7 @@
$cdata['grco_created'] = $this->_changeDate;
$cdata['grco_created_by'] = $uid;
- $db->insert('gems__respondent_communications', $cdata);
+ $db->insert('gems__log_respondent_communications', $cdata);
}
}
}
Modified: trunk/library/classes/Gems/Tracker/Model/StandardTokenModel.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Model/StandardTokenModel.php 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/classes/Gems/Tracker/Model/StandardTokenModel.php 2011-09-20 15:42:08 UTC (rev 51)
@@ -206,7 +206,7 @@
// Token items
$this->set('gto_id_token', 'label', $this->translate->_('Token'));
$this->set('gto_round_description', 'label', $this->translate->_('Round'));
- $this->set('gto_valid_from', 'label', $this->translate->_('Measure(d) on'), 'formatFunction', $translated->formatDateNever, 'tdClass', 'date');
+ $this->set('gto_valid_from', 'label', $this->translate->_('Measure(d) on'), 'formatFunction', $translated->formatDateNever, 'tdClass', 'date');
$this->set('gto_valid_until', 'label', $this->translate->_('Valid until'), 'formatFunction', $translated->formatDateForever, 'tdClass', 'date');
$this->set('gto_mail_sent_date', 'label', $this->translate->_('Last contact'), 'formatFunction', $translated->formatDateNever, 'tdClass', 'date');
$this->set('gto_completion_time', 'label', $this->translate->_('Completed'), 'formatFunction', $translated->formatDateNa, 'tdClass', 'date');
Modified: trunk/library/configs/db/patches.sql
===================================================================
--- trunk/library/configs/db/patches.sql 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/configs/db/patches.sql 2011-09-20 15:42:08 UTC (rev 51)
@@ -190,6 +190,9 @@
-- PATCH: Organization codes
ALTER TABLE `gems__organizations` ADD gor_code varchar(20) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' AFTER gor_name;
--- PATCH: Extra log
-ALTER TABLE gems__respondent_communications ADD grco_sender varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null AFTER grco_address;
-ALTER TABLE gems__respondent_communications ADD grco_id_message bigint unsigned null references gems__mail_templates (gmt_id_message) AFTER grco_comments;
+-- PATCH: Extra mail logging
+RENAME TABLE gems__respondent_communications TO gems__log_respondent_communications;
+
+ALTER TABLE gems__log_respondent_communications ADD grco_sender varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null AFTER grco_address;
+ALTER TABLE gems__log_respondent_communications ADD grco_id_message bigint unsigned null references gems__mail_templates (gmt_id_message) AFTER grco_comments;
+
Copied: trunk/library/configs/db/tables/gems__log_respondent_communications.500.sql (from rev 46, trunk/library/configs/db/tables/gems__respondent_communications.60.sql)
===================================================================
--- trunk/library/configs/db/tables/gems__log_respondent_communications.500.sql (rev 0)
+++ trunk/library/configs/db/tables/gems__log_respondent_communications.500.sql 2011-09-20 15:42:08 UTC (rev 51)
@@ -0,0 +1,29 @@
+
+CREATE TABLE if not exists gems__log_respondent_communications (
+ grco_id_action bigint unsigned not null auto_increment,
+
+ grco_id_to bigint unsigned not null references gems__respondents (grs_id_user),
+ grco_id_by bigint unsigned null default 0 references gems__staff (gsf_id_user),
+ grco_organization bigint unsigned not null references gems__organizations (gor_id_organization),
+
+ grco_id_token varchar(9) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null references gems__tokens (gto_id_token),
+
+ grco_method varchar(12) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
+ grco_topic varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
+ grco_address varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
+ grco_sender varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
+ grco_comments varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
+
+ grco_id_message bigint unsigned null references gems__mail_templates (gmt_id_message),
+
+ grco_changed timestamp not null default current_timestamp,
+ grco_changed_by bigint unsigned not null,
+ grco_created timestamp not null,
+ grco_created_by bigint unsigned not null,
+
+ PRIMARY KEY (grco_id_action)
+ )
+ ENGINE=InnoDB
+ auto_increment = 200000
+ CHARACTER SET 'utf8' COLLATE 'utf8_general_ci';
+
Copied: trunk/library/configs/db/tables/gems__mail_jobs.300.sql (from rev 39, trunk/library/configs/db/tables/gems__mail_templates.200.sql)
===================================================================
--- trunk/library/configs/db/tables/gems__mail_jobs.300.sql (rev 0)
+++ trunk/library/configs/db/tables/gems__mail_jobs.300.sql 2011-09-20 15:42:08 UTC (rev 51)
@@ -0,0 +1,36 @@
+
+CREATE TABLE if not exists gems__mail_jobs (
+ gmj_id_message bigint unsigned not null auto_increment,
+
+ gmj_id_organization bigint unsigned not null
+ references gems__organizations (gor_id_organization),
+ gmj_id_message bigint unsigned not null
+ references gems__mail_templates (gmt_id_message),
+
+ gmj_id_user_as bigint unsigned not null
+ references gems__staff (gsf_id_user),
+
+ -- O Use organization from address
+ -- S Use site from address
+ -- U Use gmj_id_user_as from address
+ gmj_from_method varchar(1) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
+
+ -- M => multiple per respondent, one for each token
+ -- O => One per respondent, mark all tokens as send
+ -- U / A? => Send only one token, do not mark
+ gmj_process_method varchar(1) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
+
+ -- N => notmailed
+ -- R => reminder
+ gmj_filter_mode varchar(1) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
+
+ gmj_changed timestamp not null default current_timestamp on update current_timestamp,
+ gmj_changed_by bigint unsigned not null,
+ gmj_created timestamp not null default '0000-00-00 00:00:00',
+ gmj_created_by bigint unsigned not null,
+
+ PRIMARY KEY (gmj_id_message)
+ )
+ ENGINE=InnoDB
+ AUTO_INCREMENT = 800
+ CHARACTER SET 'utf8' COLLATE 'utf8_general_ci';
Deleted: trunk/library/configs/db/tables/gems__respondent_communications.60.sql
===================================================================
--- trunk/library/configs/db/tables/gems__respondent_communications.60.sql 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/configs/db/tables/gems__respondent_communications.60.sql 2011-09-20 15:42:08 UTC (rev 51)
@@ -1,29 +0,0 @@
-
-CREATE TABLE if not exists gems__respondent_communications (
- grco_id_action bigint unsigned not null auto_increment,
-
- grco_id_to bigint unsigned not null references gems__respondents (grs_id_user),
- grco_id_by bigint unsigned null default 0 references gems_staff (gsf_id_user),
- grco_organization bigint unsigned not null references gems__organizations (gor_id_organization),
-
- grco_id_token varchar(9) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null references gems__tokens (gto_id_token),
-
- grco_method varchar(12) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
- grco_topic varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
- grco_address varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
- grco_sender varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
- grco_comments varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
-
- grco_id_message bigint unsigned null references gems__mail_templates (gmt_id_message),
-
- grco_changed timestamp not null default current_timestamp,
- grco_changed_by bigint unsigned not null,
- grco_created timestamp not null,
- grco_created_by bigint unsigned not null,
-
- PRIMARY KEY (grco_id_action)
- )
- ENGINE=InnoDB
- auto_increment = 200000
- CHARACTER SET 'utf8' COLLATE 'utf8_general_ci';
-
Modified: trunk/library/controllers/MailLogController.php
===================================================================
--- trunk/library/controllers/MailLogController.php 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/controllers/MailLogController.php 2011-09-20 15:42:08 UTC (rev 51)
@@ -42,6 +42,6 @@
* @license New BSD License
* @since Class available since version 1.4.2
*/
-class MailLogController extends Gems_Default_MailLogAction
+class MailLogController extends Gems_Default_MailLogActionOldStyle
{
}
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/languages/default-en.po 2011-09-20 15:42:08 UTC (rev 51)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: Pulse EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-19 18:18+0100\n"
+"POT-Creation-Date: 2011-09-20 17:39+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -1069,7 +1069,6 @@
msgstr "Username"
#: classes/Gems/Default/IndexAction.php:105
-#: classes/Gems/Default/MailServerAction.php:88
msgid "Password"
msgstr "Password"
@@ -1225,7 +1224,8 @@
msgstr "Log maintenance"
#: classes/Gems/Default/MailAction.php:61
-#: classes/Gems/Default/MailLogAction.php:71
+#: classes/Gems/Default/MailLogAction.php:95
+#: classes/Gems/Default/MailLogActionOldStyle.php:118
msgid "Subject"
msgstr "Subject"
@@ -1243,22 +1243,47 @@
msgid "Email templates"
msgstr "Email templates"
-#: classes/Gems/Default/MailLogAction.php:69
-msgid "To"
-msgstr "To"
-
-#: classes/Gems/Default/MailLogAction.php:70
-msgid "From"
-msgstr "From"
-
-#: classes/Gems/Default/MailLogAction.php:72
+#: classes/Gems/Default/MailLogAction.php:89
+#: classes/Gems/Default/MailLogActionOldStyle.php:112
msgid "Date sent"
msgstr "Date sent"
-#: classes/Gems/Default/MailLogAction.php:80
+#: classes/Gems/Default/MailLogAction.php:90
+#: classes/Gems/Default/MailLogActionOldStyle.php:113
+msgid "Receiver"
+msgstr "Receiver"
+
+#: classes/Gems/Default/MailLogAction.php:91
+#: classes/Gems/Default/MailLogActionOldStyle.php:114
+msgid "To address"
+msgstr "To address"
+
+#: classes/Gems/Default/MailLogAction.php:92
+#: classes/Gems/Default/MailLogActionOldStyle.php:115
+msgid "Sender"
+msgstr "Sender"
+
+#: classes/Gems/Default/MailLogAction.php:93
+#: classes/Gems/Default/MailLogActionOldStyle.php:116
+msgid "From address"
+msgstr "From address"
+
+#: classes/Gems/Default/MailLogAction.php:98
+#: classes/Gems/Default/MailLogActionOldStyle.php:121
+msgid "Template"
+msgstr "Template"
+
+#: classes/Gems/Default/MailLogAction.php:108
+#: classes/Gems/Default/MailLogActionOldStyle.php:148
msgid "Mail Activity Log"
msgstr "Mail Activity Log"
+#: classes/Gems/Default/MailLogActionOldStyle.php:137
+msgid "Activity Log"
+msgid_plural "Activity Logs"
+msgstr[0] "Activity Log"
+msgstr[1] "Activity Logs"
+
#: classes/Gems/Default/MailServerAction.php:68
msgid "From address [part]"
msgstr "From address [part]"
@@ -1300,10 +1325,16 @@
msgstr "User ID"
#: classes/Gems/Default/MailServerAction.php:90
+#: classes/Gems/Default/OptionAction.php:107
+#: classes/Gems/Default/OptionAction.php:112
+#: classes/Gems/Default/SourceAction.php:95
+#: classes/Gems/Default/StaffAction.php:114
msgid "Repeat password"
msgstr "Repeat password"
#: classes/Gems/Default/MailServerAction.php:91
+#: classes/Gems/Default/SourceAction.php:74
+#: classes/Gems/Default/StaffAction.php:99
msgid "Enter only when changing"
msgstr "Enter only when changing the password"
@@ -1319,7 +1350,7 @@
#: classes/Gems/Default/OptionAction.php:73
#: classes/Gems/Default/OrganizationAction.php:128
-#: classes/Gems/Default/RespondentAction.php:164
+#: classes/Gems/Default/RespondentAction.php:173
#: classes/Gems/Default/StaffAction.php:192
msgid "Language"
msgstr "Language"
@@ -1436,7 +1467,7 @@
#: classes/Gems/Default/OverviewPlanAction.php:115
#: classes/Gems/Default/ProjectSurveysAction.php:88
#: classes/Gems/Default/SurveyAction.php:203
-#: classes/Gems/Default/SurveyMaintenanceAction.php:424
+#: classes/Gems/Default/SurveyMaintenanceAction.php:425
msgid "survey"
msgid_plural "surveys"
msgstr[0] "survey"
@@ -1553,10 +1584,15 @@
msgid "By"
msgstr "By"
+#: classes/Gems/Default/ProjectSurveysAction.php:69
+#: classes/Gems/Default/ProjectTracksAction.php:67
+#: classes/Gems/Default/SurveyAction.php:193
+msgid "From"
+msgstr "From"
+
#: classes/Gems/Default/ProjectSurveysAction.php:70
#: classes/Gems/Default/ProjectTracksAction.php:68
#: classes/Gems/Default/SurveyAction.php:195
-#: classes/Gems/Default/TrackAction.php:331
msgid "Until"
msgstr "Until"
@@ -1565,12 +1601,10 @@
msgstr "Active surveys"
#: classes/Gems/Default/ProjectTracksAction.php:65
-#: classes/Gems/Default/TrackAction.php:328
msgid "Survey #"
msgstr "Survey #"
#: classes/Gems/Default/ProjectTracksAction.php:85
-#: classes/Gems/Default/TrackAction.php:451
msgid "track"
msgid_plural "tracks"
msgstr[0] "track"
@@ -1666,114 +1700,106 @@
msgstr[0] "reception code"
msgstr[1] "reception codes"
-#: classes/Gems/Default/RespondentAction.php:113
+#: classes/Gems/Default/RespondentAction.php:122
msgid "Enter a 9-digit BSN number."
msgstr "Enter a 9-digit BSN number."
-#: classes/Gems/Default/RespondentAction.php:122
+#: classes/Gems/Default/RespondentAction.php:131
msgid "Identification"
msgstr "Identification"
-#: classes/Gems/Default/RespondentAction.php:123
+#: classes/Gems/Default/RespondentAction.php:132
msgid "BSN"
msgstr "BSN"
-#: classes/Gems/Default/RespondentAction.php:127
+#: classes/Gems/Default/RespondentAction.php:136
msgid "Patient number"
msgstr "Patient number"
-#: classes/Gems/Default/RespondentAction.php:136
+#: classes/Gems/Default/RespondentAction.php:145
msgid "Medical data"
msgstr "Medical data"
-#: classes/Gems/Default/RespondentAction.php:143
+#: classes/Gems/Default/RespondentAction.php:152
msgid "DBC's, etc..."
msgstr "DBC's, etc..."
-#: classes/Gems/Default/RespondentAction.php:146
+#: classes/Gems/Default/RespondentAction.php:155
msgid "Contact information"
msgstr "Contact information"
-#: classes/Gems/Default/RespondentAction.php:151
+#: classes/Gems/Default/RespondentAction.php:160
msgid "Respondent has no e-mail"
msgstr "Patient has no e-mail"
-#: classes/Gems/Default/RespondentAction.php:152
+#: classes/Gems/Default/RespondentAction.php:161
msgid "With housenumber"
msgstr "With housenumber"
-#: classes/Gems/Default/RespondentAction.php:159
+#: classes/Gems/Default/RespondentAction.php:168
msgid "Country"
msgstr "Country"
-#: classes/Gems/Default/RespondentAction.php:163
+#: classes/Gems/Default/RespondentAction.php:172
msgid "Settings"
msgstr "Settings"
-#: classes/Gems/Default/RespondentAction.php:165
+#: classes/Gems/Default/RespondentAction.php:174
msgid "Has the respondent signed the informed consent letter?"
msgstr "Has the patient signed the informed consent letter?"
-#: classes/Gems/Default/RespondentAction.php:190
+#: classes/Gems/Default/RespondentAction.php:199
msgid "Comments"
msgstr "Comments"
-#: classes/Gems/Default/RespondentAction.php:191
+#: classes/Gems/Default/RespondentAction.php:200
msgid "Physician"
msgstr "Physician"
-#: classes/Gems/Default/RespondentAction.php:192
+#: classes/Gems/Default/RespondentAction.php:201
msgid "Treatment"
msgstr "Treatment"
-#: classes/Gems/Default/RespondentAction.php:221
-#: classes/Gems/Default/TrackAction.php:131
-#: classes/Gems/Default/TrackAction.php:475
+#: classes/Gems/Default/RespondentAction.php:230
msgid "Rejection code"
msgstr "Rejection code"
-#: classes/Gems/Default/RespondentAction.php:228
+#: classes/Gems/Default/RespondentAction.php:237
msgid "Delete respondent"
msgstr "Delete patient"
-#: classes/Gems/Default/RespondentAction.php:279
+#: classes/Gems/Default/RespondentAction.php:288
msgid "Respondent deleted."
msgstr "Patient deleted"
-#: classes/Gems/Default/RespondentAction.php:282
-#: classes/Gems/Default/TrackAction.php:404
+#: classes/Gems/Default/RespondentAction.php:291
msgid "Choose a reception code to delete."
msgstr "Choose a reception code to delete."
-#: classes/Gems/Default/RespondentAction.php:346
+#: classes/Gems/Default/RespondentAction.php:355
msgid "respondent"
msgid_plural "respondents"
msgstr[0] "patient"
msgstr[1] "patients"
-#: classes/Gems/Default/RespondentAction.php:386
+#: classes/Gems/Default/RespondentAction.php:395
msgid "Please settle the informed consent form for this respondent."
msgstr "Please settle the informed consent form for this patient."
#: classes/Gems/Default/RespondentPlanAction.php:67
#: classes/Gems/Default/SurveyAction.php:171
-#: classes/Gems/Default/TrackAction.php:296
msgid "Show respondent"
msgstr "Show patient"
#: classes/Gems/Default/RespondentPlanAction.php:73
-#: classes/Gems/Default/TrackAction.php:265
-#: classes/Gems/Default/TrackAction.php:284
msgid "Show track"
msgstr "Show track"
#: classes/Gems/Default/RespondentPlanAction.php:136
-#: classes/Gems/Default/TrackAction.php:316
msgid " of "
msgstr " of "
#: classes/Gems/Default/RespondentPlanAction.php:137
-#: classes/Gems/Default/TrackAction.php:317
msgid "Progress"
msgstr "Progress"
@@ -1965,95 +1991,95 @@
msgid "Assigned surveys"
msgstr "Assigned surveys"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:129
+#: classes/Gems/Default/SurveyMaintenanceAction.php:130
msgid "If empty, survey will never show up!"
msgstr "If empty, survey will never show up!"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:130
+#: classes/Gems/Default/SurveyMaintenanceAction.php:131
msgid "Result field"
msgstr "Result field"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:131
+#: classes/Gems/Default/SurveyMaintenanceAction.php:132
msgid "Before answering"
msgstr "Before answering"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:132
+#: classes/Gems/Default/SurveyMaintenanceAction.php:133
msgid "After completion"
msgstr "After completion"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:135
+#: classes/Gems/Default/SurveyMaintenanceAction.php:136
msgid "Upload new PDF"
msgstr "Upload new PDF"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:142
+#: classes/Gems/Default/SurveyMaintenanceAction.php:143
msgid "Usage"
msgstr "Usage"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:157
+#: classes/Gems/Default/SurveyMaintenanceAction.php:158
msgid "Single Survey Assignment"
msgstr "Single Survey Assignment"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:202
+#: classes/Gems/Default/SurveyMaintenanceAction.php:203
msgid "Assignable since"
msgstr "Assignable since"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:203
+#: classes/Gems/Default/SurveyMaintenanceAction.php:204
msgid "Assignable until"
msgstr "Assignable until"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:209
+#: classes/Gems/Default/SurveyMaintenanceAction.php:210
msgid "Create Single Survey"
msgstr "Create Single Survey"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:213
+#: classes/Gems/Default/SurveyMaintenanceAction.php:214
msgid "At the moment this survey can only be assigned to respondents as part of an existing track."
msgstr "At the moment this survey can only be assigned to paitents as part of an existing track."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:266
+#: classes/Gems/Default/SurveyMaintenanceAction.php:267
msgid "Survey should be assigned to a group before making it active."
msgstr "Survey should be assigned to a group before making it active."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:279
+#: classes/Gems/Default/SurveyMaintenanceAction.php:280
#, php-format
msgid "Checking survey results for the %s survey."
msgstr "Checking survey results for the %s survey."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:354
+#: classes/Gems/Default/SurveyMaintenanceAction.php:355
msgid "Source"
msgstr "Source"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:355
+#: classes/Gems/Default/SurveyMaintenanceAction.php:356
msgid "Status in source"
msgstr "Status in source"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:359
+#: classes/Gems/Default/SurveyMaintenanceAction.php:360
msgid "Active in source"
msgstr "Active in source"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:360
+#: classes/Gems/Default/SurveyMaintenanceAction.php:361
#, php-format
msgid "Active in %s"
msgstr "Active in %s"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:367
+#: classes/Gems/Default/SurveyMaintenanceAction.php:368
msgid "Single"
msgstr "Single"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:409
+#: classes/Gems/Default/SurveyMaintenanceAction.php:410
#, php-format
msgid "%d times in track."
msgstr "%d times in track."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:411
+#: classes/Gems/Default/SurveyMaintenanceAction.php:412
#, php-format
msgid "%d times in %d track(s)."
msgstr "%d times in %d track(s)."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:415
+#: classes/Gems/Default/SurveyMaintenanceAction.php:416
msgid "Not used in track."
msgstr "Not used in track."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:417
+#: classes/Gems/Default/SurveyMaintenanceAction.php:418
msgid "Not used in tracks."
msgstr "Not used in tracks."
@@ -2153,7 +2179,6 @@
msgstr "+"
#: classes/Gems/Default/TokenPlanAction.php:478
-#: classes/Gems/Default/TrackAction.php:449
msgid "token"
msgid_plural "tokens"
msgstr[0] "token"
@@ -2380,10 +2405,6 @@
msgid "Preview text"
msgstr "Preview text"
-#: classes/Gems/Email/EmailFormAbstract.php:306
-msgid "Template"
-msgstr "Template"
-
#: classes/Gems/Email/EmailFormAbstract.php:330
msgid "Send"
msgstr "Send"
@@ -2445,6 +2466,11 @@
msgid "Method"
msgstr "Method"
+#: classes/Gems/Email/MultiMailForm.php:105
+#: classes/Gems/Email/OneMailForm.php:87
+msgid "To"
+msgstr "To"
+
#: classes/Gems/Email/MultiMailForm.php:126
msgid "Survey has been taken."
msgstr "Survey has been taken."
@@ -2470,12 +2496,12 @@
msgid "The sending of emails was blocked for this installation."
msgstr "The sending of emails was blocked for this installation."
-#: classes/Gems/Email/OneMailForm.php:139
+#: classes/Gems/Email/OneMailForm.php:140
#: classes/Gems/Email/TemplateMailer.php:244
msgid "Mail failed to send."
msgstr "Mail failed to send."
-#: classes/Gems/Email/OneMailForm.php:143
+#: classes/Gems/Email/OneMailForm.php:144
#, php-format
msgid "Sent email to %s."
msgstr "Sent email to %s."
@@ -3416,12 +3442,10 @@
msgstr "Recalculate track"
#: snippets/RespondentDetailsSnippet.php:59
-#: snippets/RespondentDetailsWithAssignmentsSnippet.php:74
msgid "Respondent information"
msgstr "Patient information"
#: snippets/RespondentDetailsSnippet.php:71
-#: snippets/RespondentDetailsWithAssignmentsSnippet.php:97
msgid "Respondent nr: "
msgstr "Patient nr:"
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/languages/default-nl.po 2011-09-20 15:42:08 UTC (rev 51)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: Pulse NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-19 18:16+0100\n"
+"POT-Creation-Date: 2011-09-20 17:37+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -1069,7 +1069,6 @@
msgstr "Gebruikersnaam"
#: classes/Gems/Default/IndexAction.php:105
-#: classes/Gems/Default/MailServerAction.php:88
msgid "Password"
msgstr "Wachtwoord"
@@ -1225,7 +1224,8 @@
msgstr "Logboek onderhoud"
#: classes/Gems/Default/MailAction.php:61
-#: classes/Gems/Default/MailLogAction.php:71
+#: classes/Gems/Default/MailLogAction.php:95
+#: classes/Gems/Default/MailLogActionOldStyle.php:118
msgid "Subject"
msgstr "Onderwerp"
@@ -1243,22 +1243,47 @@
msgid "Email templates"
msgstr "Email sjabloon"
-#: classes/Gems/Default/MailLogAction.php:69
-msgid "To"
-msgstr "Aan"
+#: classes/Gems/Default/MailLogAction.php:89
+#: classes/Gems/Default/MailLogActionOldStyle.php:112
+msgid "Date sent"
+msgstr "Verzend datum"
-#: classes/Gems/Default/MailLogAction.php:70
-msgid "From"
-msgstr "Van"
+#: classes/Gems/Default/MailLogAction.php:90
+#: classes/Gems/Default/MailLogActionOldStyle.php:113
+msgid "Receiver"
+msgstr "Ontvanger"
-#: classes/Gems/Default/MailLogAction.php:72
-msgid "Date sent"
-msgstr "Datum verstuurd"
+#: classes/Gems/Default/MailLogAction.php:91
+#: classes/Gems/Default/MailLogActionOldStyle.php:114
+msgid "To address"
+msgstr "Adres aan"
-#: classes/Gems/Default/MailLogAction.php:80
+#: classes/Gems/Default/MailLogAction.php:92
+#: classes/Gems/Default/MailLogActionOldStyle.php:115
+msgid "Sender"
+msgstr "Verzender"
+
+#: classes/Gems/Default/MailLogAction.php:93
+#: classes/Gems/Default/MailLogActionOldStyle.php:116
+msgid "From address"
+msgstr "Adres van"
+
+#: classes/Gems/Default/MailLogAction.php:98
+#: classes/Gems/Default/MailLogActionOldStyle.php:121
+msgid "Template"
+msgstr "Sjabloon"
+
+#: classes/Gems/Default/MailLogAction.php:108
+#: classes/Gems/Default/MailLogActionOldStyle.php:148
msgid "Mail Activity Log"
msgstr "Logboek Mail Activiteit"
+#: classes/Gems/Default/MailLogActionOldStyle.php:137
+msgid "Activity Log"
+msgid_plural "Activity Logs"
+msgstr[0] "Mail Activiteit Log"
+msgstr[1] "Mail Activiteiten Logs"
+
#: classes/Gems/Default/MailServerAction.php:68
msgid "From address [part]"
msgstr "Vanaf adres [gedeelte]"
@@ -1300,10 +1325,16 @@
msgstr "Gebruikers ID"
#: classes/Gems/Default/MailServerAction.php:90
+#: classes/Gems/Default/OptionAction.php:107
+#: classes/Gems/Default/OptionAction.php:112
+#: classes/Gems/Default/SourceAction.php:95
+#: classes/Gems/Default/StaffAction.php:114
msgid "Repeat password"
msgstr "Herhaal wachtwoord"
#: classes/Gems/Default/MailServerAction.php:91
+#: classes/Gems/Default/SourceAction.php:74
+#: classes/Gems/Default/StaffAction.php:99
msgid "Enter only when changing"
msgstr "Alleen invoeren om het wachtwoord te wijzigen"
@@ -1319,7 +1350,7 @@
#: classes/Gems/Default/OptionAction.php:73
#: classes/Gems/Default/OrganizationAction.php:128
-#: classes/Gems/Default/RespondentAction.php:164
+#: classes/Gems/Default/RespondentAction.php:173
#: classes/Gems/Default/StaffAction.php:192
msgid "Language"
msgstr "Taal"
@@ -1436,7 +1467,7 @@
#: classes/Gems/Default/OverviewPlanAction.php:115
#: classes/Gems/Default/ProjectSurveysAction.php:88
#: classes/Gems/Default/SurveyAction.php:203
-#: classes/Gems/Default/SurveyMaintenanceAction.php:424
+#: classes/Gems/Default/SurveyMaintenanceAction.php:425
msgid "survey"
msgid_plural "surveys"
msgstr[0] "vragenlijst"
@@ -1553,10 +1584,15 @@
msgid "By"
msgstr "Door"
+#: classes/Gems/Default/ProjectSurveysAction.php:69
+#: classes/Gems/Default/ProjectTracksAction.php:67
+#: classes/Gems/Default/SurveyAction.php:193
+msgid "From"
+msgstr "Van"
+
#: classes/Gems/Default/ProjectSurveysAction.php:70
#: classes/Gems/Default/ProjectTracksAction.php:68
#: classes/Gems/Default/SurveyAction.php:195
-#: classes/Gems/Default/TrackAction.php:331
msgid "Until"
msgstr "Tot"
@@ -1565,12 +1601,10 @@
msgstr "Beschikbare vragenlijsten"
#: classes/Gems/Default/ProjectTracksAction.php:65
-#: classes/Gems/Default/TrackAction.php:328
msgid "Survey #"
msgstr "Vragenlijsten"
#: classes/Gems/Default/ProjectTracksAction.php:85
-#: classes/Gems/Default/TrackAction.php:451
msgid "track"
msgid_plural "tracks"
msgstr[0] "traject"
@@ -1666,114 +1700,106 @@
msgstr[0] "Ontvangst code"
msgstr[1] "Ontvangst code"
-#: classes/Gems/Default/RespondentAction.php:113
+#: classes/Gems/Default/RespondentAction.php:122
msgid "Enter a 9-digit BSN number."
msgstr "Voer een BSN nummer van 9 cijfers in."
-#: classes/Gems/Default/RespondentAction.php:122
+#: classes/Gems/Default/RespondentAction.php:131
msgid "Identification"
msgstr "Identificatie"
-#: classes/Gems/Default/RespondentAction.php:123
+#: classes/Gems/Default/RespondentAction.php:132
msgid "BSN"
msgstr "BSN"
-#: classes/Gems/Default/RespondentAction.php:127
+#: classes/Gems/Default/RespondentAction.php:136
msgid "Patient number"
msgstr "Patiënt nummer"
-#: classes/Gems/Default/RespondentAction.php:136
+#: classes/Gems/Default/RespondentAction.php:145
msgid "Medical data"
msgstr "Medische gegevens"
-#: classes/Gems/Default/RespondentAction.php:143
+#: classes/Gems/Default/RespondentAction.php:152
msgid "DBC's, etc..."
msgstr "DBC's, etc..."
-#: classes/Gems/Default/RespondentAction.php:146
+#: classes/Gems/Default/RespondentAction.php:155
msgid "Contact information"
msgstr "Contact informatie"
-#: classes/Gems/Default/RespondentAction.php:151
+#: classes/Gems/Default/RespondentAction.php:160
msgid "Respondent has no e-mail"
msgstr "Patiënt zonder e-mail"
-#: classes/Gems/Default/RespondentAction.php:152
+#: classes/Gems/Default/RespondentAction.php:161
msgid "With housenumber"
msgstr "Met huisnummer"
-#: classes/Gems/Default/RespondentAction.php:159
+#: classes/Gems/Default/RespondentAction.php:168
msgid "Country"
msgstr "Land"
-#: classes/Gems/Default/RespondentAction.php:163
+#: classes/Gems/Default/RespondentAction.php:172
msgid "Settings"
msgstr "Instellingen"
-#: classes/Gems/Default/RespondentAction.php:165
+#: classes/Gems/Default/RespondentAction.php:174
msgid "Has the respondent signed the informed consent letter?"
msgstr "Heeft de patiënt het \"informed consent\" formulier ondertekend?"
-#: classes/Gems/Default/RespondentAction.php:190
+#: classes/Gems/Default/RespondentAction.php:199
msgid "Comments"
msgstr "Opmerkingen"
-#: classes/Gems/Default/RespondentAction.php:191
+#: classes/Gems/Default/RespondentAction.php:200
msgid "Physician"
msgstr "Dokter"
-#: classes/Gems/Default/RespondentAction.php:192
+#: classes/Gems/Default/RespondentAction.php:201
msgid "Treatment"
msgstr "Behandeling"
-#: classes/Gems/Default/RespondentAction.php:221
-#: classes/Gems/Default/TrackAction.php:131
-#: classes/Gems/Default/TrackAction.php:475
+#: classes/Gems/Default/RespondentAction.php:230
msgid "Rejection code"
msgstr "Afkeuringscode"
-#: classes/Gems/Default/RespondentAction.php:228
+#: classes/Gems/Default/RespondentAction.php:237
msgid "Delete respondent"
msgstr "Verwijder patiënt"
-#: classes/Gems/Default/RespondentAction.php:279
+#: classes/Gems/Default/RespondentAction.php:288
msgid "Respondent deleted."
msgstr "Patiënt verwijderd"
-#: classes/Gems/Default/RespondentAction.php:282
-#: classes/Gems/Default/TrackAction.php:404
+#: classes/Gems/Default/RespondentAction.php:291
msgid "Choose a reception code to delete."
msgstr "Kies een ontvangst code om te verwijderen."
-#: classes/Gems/Default/RespondentAction.php:346
+#: classes/Gems/Default/RespondentAction.php:355
msgid "respondent"
msgid_plural "respondents"
msgstr[0] "patiënt"
msgstr[1] "patiënten"
-#: classes/Gems/Default/RespondentAction.php:386
+#: classes/Gems/Default/RespondentAction.php:395
msgid "Please settle the informed consent form for this respondent."
msgstr "A.u.b. het informed consent formulier doornemen met deze patiënt"
#: classes/Gems/Default/RespondentPlanAction.php:67
#: classes/Gems/Default/SurveyAction.php:171
-#: classes/Gems/Default/TrackAction.php:296
msgid "Show respondent"
msgstr "Toon patiënt"
#: classes/Gems/Default/RespondentPlanAction.php:73
-#: classes/Gems/Default/TrackAction.php:265
-#: classes/Gems/Default/TrackAction.php:284
msgid "Show track"
msgstr "Toon traject"
#: classes/Gems/Default/RespondentPlanAction.php:136
-#: classes/Gems/Default/TrackAction.php:316
msgid " of "
msgstr " van "
#: classes/Gems/Default/RespondentPlanAction.php:137
-#: classes/Gems/Default/TrackAction.php:317
msgid "Progress"
msgstr "Voortgang"
@@ -1965,95 +1991,95 @@
msgid "Assigned surveys"
msgstr "Toegewezen vragenlijsten"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:129
+#: classes/Gems/Default/SurveyMaintenanceAction.php:130
msgid "If empty, survey will never show up!"
msgstr "Indien leeg zal de vragenlijst niet tevoorschijn komen!"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:130
+#: classes/Gems/Default/SurveyMaintenanceAction.php:131
msgid "Result field"
msgstr "Resultaat veld"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:131
+#: classes/Gems/Default/SurveyMaintenanceAction.php:132
msgid "Before answering"
msgstr "Voor beantwoording"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:132
+#: classes/Gems/Default/SurveyMaintenanceAction.php:133
msgid "After completion"
msgstr "Na afronding"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:135
+#: classes/Gems/Default/SurveyMaintenanceAction.php:136
msgid "Upload new PDF"
msgstr "Upload nieuwe PDF"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:142
+#: classes/Gems/Default/SurveyMaintenanceAction.php:143
msgid "Usage"
msgstr "Gebruik"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:157
+#: classes/Gems/Default/SurveyMaintenanceAction.php:158
msgid "Single Survey Assignment"
msgstr "Losse vragenlijst toewijzing"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:202
+#: classes/Gems/Default/SurveyMaintenanceAction.php:203
msgid "Assignable since"
msgstr "Toewijsbaar sinds"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:203
+#: classes/Gems/Default/SurveyMaintenanceAction.php:204
msgid "Assignable until"
msgstr "Toewijsbaar tot"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:209
+#: classes/Gems/Default/SurveyMaintenanceAction.php:210
msgid "Create Single Survey"
msgstr "Maak losse vragenlijst"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:213
+#: classes/Gems/Default/SurveyMaintenanceAction.php:214
msgid "At the moment this survey can only be assigned to respondents as part of an existing track."
msgstr "Op dit moment kan deze vragenlijst alleen aan patiënten toegewezen als onderdeel van een traject."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:266
+#: classes/Gems/Default/SurveyMaintenanceAction.php:267
msgid "Survey should be assigned to a group before making it active."
msgstr "Vragenlijst moet aan een groep toegewezen worden voordat deze actief kan worden gemaakt."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:279
+#: classes/Gems/Default/SurveyMaintenanceAction.php:280
#, php-format
msgid "Checking survey results for the %s survey."
msgstr "Controle op vragenlijstresultaten voor de vragenlijst '%s'."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:354
+#: classes/Gems/Default/SurveyMaintenanceAction.php:355
msgid "Source"
msgstr "Bron"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:355
+#: classes/Gems/Default/SurveyMaintenanceAction.php:356
msgid "Status in source"
msgstr "Status in bron"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:359
+#: classes/Gems/Default/SurveyMaintenanceAction.php:360
msgid "Active in source"
msgstr "Actief in bron"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:360
+#: classes/Gems/Default/SurveyMaintenanceAction.php:361
#, php-format
msgid "Active in %s"
msgstr "Actief in %s"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:367
+#: classes/Gems/Default/SurveyMaintenanceAction.php:368
msgid "Single"
msgstr "Los"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:409
+#: classes/Gems/Default/SurveyMaintenanceAction.php:410
#, php-format
msgid "%d times in track."
msgstr "%d keer in traject."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:411
+#: classes/Gems/Default/SurveyMaintenanceAction.php:412
#, php-format
msgid "%d times in %d track(s)."
msgstr "%d keer in %d traject(en)."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:415
+#: classes/Gems/Default/SurveyMaintenanceAction.php:416
msgid "Not used in track."
msgstr "Niet in traject gebruikt."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:417
+#: classes/Gems/Default/SurveyMaintenanceAction.php:418
msgid "Not used in tracks."
msgstr "Niet in trajecten gebruikt."
@@ -2153,7 +2179,6 @@
msgstr "+"
#: classes/Gems/Default/TokenPlanAction.php:478
-#: classes/Gems/Default/TrackAction.php:449
msgid "token"
msgid_plural "tokens"
msgstr[0] "kenmerk"
@@ -2380,10 +2405,6 @@
msgid "Preview text"
msgstr "Tekstvoorbeeld"
-#: classes/Gems/Email/EmailFormAbstract.php:306
-msgid "Template"
-msgstr "Sjabloon"
-
#: classes/Gems/Email/EmailFormAbstract.php:330
msgid "Send"
msgstr "Verstuur"
@@ -2445,6 +2466,11 @@
msgid "Method"
msgstr "Methode"
+#: classes/Gems/Email/MultiMailForm.php:105
+#: classes/Gems/Email/OneMailForm.php:87
+msgid "To"
+msgstr "Aan"
+
#: classes/Gems/Email/MultiMailForm.php:126
msgid "Survey has been taken."
msgstr "Vragenlijsten is al afgenomen"
@@ -2470,12 +2496,12 @@
msgid "The sending of emails was blocked for this installation."
msgstr "Het versturen van emails is geblokkeerd in deze installatie."
-#: classes/Gems/Email/OneMailForm.php:139
+#: classes/Gems/Email/OneMailForm.php:140
#: classes/Gems/Email/TemplateMailer.php:244
msgid "Mail failed to send."
msgstr "Mail sturen mislukt."
-#: classes/Gems/Email/OneMailForm.php:143
+#: classes/Gems/Email/OneMailForm.php:144
#, php-format
msgid "Sent email to %s."
msgstr "Email naar %s verzonden."
@@ -3416,12 +3442,10 @@
msgstr "Berekening traject opnieuw"
#: snippets/RespondentDetailsSnippet.php:59
-#: snippets/RespondentDetailsWithAssignmentsSnippet.php:74
msgid "Respondent information"
msgstr "Patiënt informatie"
#: snippets/RespondentDetailsSnippet.php:71
-#: snippets/RespondentDetailsWithAssignmentsSnippet.php:97
msgid "Respondent nr: "
msgstr "Patiënt nr:"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
