Menu
▾
▴
[Gemstracker-svn] SF.net SVN: gemstracker:[1121] trunk/library
|
From: <gem...@li...> - 2013-01-24 17:23:45
|
Revision: 1121
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1121&view=rev
Author: matijsdejong
Date: 2013-01-24 17:23:36 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
Fixed wrong translation
Show code in survey overview
Date selection now can include overlapping codes
Fixed organization selection list in new overviews
Modified Paths:
--------------
trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php
trunk/library/classes/Gems/Default/TokenPlanAction.php
trunk/library/classes/Gems/Events.php
trunk/library/classes/Gems/Snippets/AutosearchFormSnippet.php
trunk/library/classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php
trunk/library/classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php
trunk/library/classes/Gems/Tracker/Survey.php
trunk/library/classes/Gems/Util/TrackData.php
trunk/library/languages/default-en.mo
trunk/library/languages/default-en.po
trunk/library/languages/default-nl.mo
trunk/library/languages/default-nl.po
Modified: trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php
===================================================================
--- trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php 2013-01-22 18:30:24 UTC (rev 1120)
+++ trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php 2013-01-24 17:23:36 UTC (rev 1121)
@@ -461,9 +461,9 @@
$model->set('gsu_result_field', 'label', $this->_('Result field'));
$model->set('gsu_duration', 'label', $this->_('Duration description'), 'description', $this->_('Text to inform the respondent, e.g. "20 seconds" or "1 minute".'));
-
- $model->setIfExists('gsu_code', 'label', $this->_('Code name'), 'size', 10, 'description', $this->_('Only for programmers.'));
-
+ }
+ $model->setIfExists('gsu_code', 'label', $this->_('Code name'), 'size', 10, 'description', $this->_('Only for programmers.'));
+ if ($detailed) {
$model->set('gsu_beforeanswering_event', 'label', $this->_('Before answering'), 'multiOptions', $events->listSurveyBeforeAnsweringEvents());
$model->set('gsu_completed_event', 'label', $this->_('After completion'), 'multiOptions', $events->listSurveyCompletionEvents());
$model->set('gsu_display_event', 'label', $this->_('Answer display'), 'multiOptions', $events->listSurveyDisplayEvents());
Modified: trunk/library/classes/Gems/Default/TokenPlanAction.php
===================================================================
--- trunk/library/classes/Gems/Default/TokenPlanAction.php 2013-01-22 18:30:24 UTC (rev 1120)
+++ trunk/library/classes/Gems/Default/TokenPlanAction.php 2013-01-24 17:23:36 UTC (rev 1121)
@@ -62,7 +62,7 @@
// Row with dates and patient data
$bridge->gtr_track_type; // Data needed for buttons
-
+
$bridge->tr()->appendAttrib('class', $bridge->row_class);
$bridge->setDefaultRowClass(MUtil_Html_TableElement::createAlternateRowClass('even', 'even', 'odd', 'odd'));
@@ -220,6 +220,10 @@
}
$dates = array(
+ '<gto_valid_from gto_valid_until'
+ => $this->_('Is valid during'),
+ '>gto_valid_from gto_valid_until'
+ => $this->_('Is valid within'),
'gto_valid_from' => $this->_('Valid from'),
'gto_valid_until' => $this->_('Valid until'),
'gto_mail_sent_date' => $this->_('E-Mailed on'),
@@ -336,6 +340,7 @@
//Add default filter
$filter = array();
if ($where = Gems_Snippets_AutosearchFormSnippet::getPeriodFilter($data, $this->db)) {
+ // MUtil_Echo::track($where);
$filter[] = $where;
}
$filter['gto_id_organization'] = isset($data['gto_id_organization']) ? $data['gto_id_organization'] : $this->escort->getCurrentOrganization(); // Is overruled when set in param
@@ -441,7 +446,8 @@
return array(
'datefrom' => $now->toString($inFormat),
- 'dateused' => 'gto_valid_from',
+ 'dateused' => '<gto_valid_from gto_valid_until',
+ 'dateuntil' => $now->toString($inFormat),
'gto_id_organization' => $this->escort->getCurrentOrganization(),
'main_filter' => 'all',
);
Modified: trunk/library/classes/Gems/Events.php
===================================================================
--- trunk/library/classes/Gems/Events.php 2013-01-22 18:30:24 UTC (rev 1120)
+++ trunk/library/classes/Gems/Events.php 2013-01-24 17:23:36 UTC (rev 1121)
@@ -106,7 +106,7 @@
$paths[$prefix] = $dir . DIRECTORY_SEPARATOR . $eventType;
}
$paths[''] = APPLICATION_PATH . '/events/' . strtolower($eventType);
- MUtil_Echo::track($paths);
+ // MUtil_Echo::track($paths);
return $paths;
}
Modified: trunk/library/classes/Gems/Snippets/AutosearchFormSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/AutosearchFormSnippet.php 2013-01-22 18:30:24 UTC (rev 1120)
+++ trunk/library/classes/Gems/Snippets/AutosearchFormSnippet.php 2013-01-24 17:23:36 UTC (rev 1121)
@@ -346,35 +346,111 @@
*/
public static function getPeriodFilter(array $data, Zend_Db_Adapter_Abstract $db)
{
- if (isset($data['dateused'])) {
- $options = array();
- MUtil_Model_FormBridge::applyFixedOptions('date', $options);
+ $isUsed = isset($data['dateused']) && $data['dateused'];
+ if (! $isUsed) {
+ return;
+ }
- $outFormat = 'yyyy-MM-dd';
- $inFormat = isset($options['dateFormat']) ? $options['dateFormat'] : null;
+ $options = array();
+ MUtil_Model_FormBridge::applyFixedOptions('date', $options);
+ $outFormat = 'yyyy-MM-dd';
+ $inFormat = isset($options['dateFormat']) ? $options['dateFormat'] : null;
- if (isset($data['datefrom']) && $data['datefrom']) {
- if (isset($data['dateuntil']) && $data['dateuntil']) {
+ $isFrom = isset($data['datefrom']) && $data['datefrom'] && MUtil_Date::isDate($data['datefrom'], $inFormat);
+ $isUntil = isset($data['dateuntil']) && $data['dateuntil'] && MUtil_Date::isDate($data['dateuntil'], $inFormat);
+ if (! ($isFrom || $isUntil)) {
+ return;
+ }
+
+
+ switch ($data['dateused'][0]) {
+ case '<':
+ // overlaps
+ $periods = explode(' ', substr($data['dateused'], 1));
+
+ if ($isFrom && $isUntil) {
return sprintf(
+ '(%1$s <= %4$s OR (%1$s IS NULL AND %2$s IS NOT NULL)) AND
+ (%2$s >= %3$s OR %2$s IS NULL)',
+ $db->quoteIdentifier($periods[0]),
+ $db->quoteIdentifier($periods[1]),
+ $db->quote(MUtil_Date::format($data['datefrom'], $outFormat, $inFormat)),
+ $db->quote(MUtil_Date::format($data['dateuntil'], $outFormat, $inFormat))
+ );
+ }
+ if ($isFrom) {
+ return sprintf(
+ '%2$s >= %3$s OR (%2$s IS NULL AND %1$s IS NOT NULL)',
+ $db->quoteIdentifier($periods[0]),
+ $db->quoteIdentifier($periods[1]),
+ $db->quote(MUtil_Date::format($data['datefrom'], $outFormat, $inFormat))
+ );
+ }
+ if ($isUntil) {
+ return sprintf(
+ '%1$s <= %3$s OR (%1$s IS NULL AND %2$s IS NOT NULL)',
+ $db->quoteIdentifier($periods[0]),
+ $db->quoteIdentifier($periods[1]),
+ $db->quote(MUtil_Date::format($data['dateuntil'], $outFormat, $inFormat))
+ );
+ }
+ return;
+
+ case '>':
+ // within
+ $periods = explode(' ', substr($data['dateused'], 1));
+
+ if ($isFrom && $isUntil) {
+ return sprintf(
+ '%1$s >= %3$s AND %2$s <= %4$s',
+ $db->quoteIdentifier($periods[0]),
+ $db->quoteIdentifier($periods[1]),
+ $db->quote(MUtil_Date::format($data['datefrom'], $outFormat, $inFormat)),
+ $db->quote(MUtil_Date::format($data['dateuntil'], $outFormat, $inFormat))
+ );
+ }
+ if ($isFrom) {
+ return sprintf(
+ '%1$s >= %3$s AND (%2$s IS NULL OR %2$s >= %3$s)',
+ $db->quoteIdentifier($periods[0]),
+ $db->quoteIdentifier($periods[1]),
+ $db->quote(MUtil_Date::format($data['datefrom'], $outFormat, $inFormat))
+ );
+ }
+ if ($isUntil) {
+ return sprintf(
+ '%2$s <= %3$s AND (%1$s IS NULL OR %1$s <= %3$s)',
+ $db->quoteIdentifier($periods[0]),
+ $db->quoteIdentifier($periods[1]),
+ $db->quote(MUtil_Date::format($data['dateuntil'], $outFormat, $inFormat))
+ );
+ }
+ return;
+
+ default:
+ if ($isFrom && $isUntil) {
+ return sprintf(
'%s BETWEEN %s AND %s',
$db->quoteIdentifier($data['dateused']),
$db->quote(MUtil_Date::format($data['datefrom'], $outFormat, $inFormat)),
$db->quote(MUtil_Date::format($data['dateuntil'], $outFormat, $inFormat))
);
}
- return sprintf(
- '%s >= %s',
- $db->quoteIdentifier($data['dateused']),
- $db->quote(MUtil_Date::format($data['datefrom'], $outFormat, $inFormat))
- );
- }
- if (isset($data['dateuntil']) && $data['dateuntil']) {
- return sprintf(
- '%s <= %s',
- $db->quoteIdentifier($data['dateused']),
- $db->quote(MUtil_Date::format($data['dateuntil'], $outFormat, $inFormat))
- );
- }
+ if ($isFrom) {
+ return sprintf(
+ '%s >= %s',
+ $db->quoteIdentifier($data['dateused']),
+ $db->quote(MUtil_Date::format($data['datefrom'], $outFormat, $inFormat))
+ );
+ }
+ if ($isUntil) {
+ return sprintf(
+ '%s <= %s',
+ $db->quoteIdentifier($data['dateused']),
+ $db->quote(MUtil_Date::format($data['dateuntil'], $outFormat, $inFormat))
+ );
+ }
+ return;
}
}
Modified: trunk/library/classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php 2013-01-22 18:30:24 UTC (rev 1120)
+++ trunk/library/classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php 2013-01-24 17:23:36 UTC (rev 1121)
@@ -47,6 +47,12 @@
class Gems_Snippets_Tracker_Compliance_ComplianceSearchFormSnippet extends Gems_Snippets_AutosearchFormSnippet
{
/**
+ *
+ * @var Gems_Loader
+ */
+ protected $loader;
+
+ /**
* Returns a text element for autosearch. Can be overruled.
*
* The form / html elements to search on. Elements can be grouped by inserting null's between them.
@@ -57,13 +63,17 @@
*/
protected function getAutoSearchElements(array $data)
{
- $elements[] = $this->_createSelectElement('gr2t_id_track',
+ $elements[] = $this->_createSelectElement(
+ 'gr2t_id_track',
$this->util->getTrackData()->getSteppedTracks(),
- $this->_('(select a track)'));
+ $this->_('(select a track)')
+ );
- $elements[] = $this->_createSelectElement('gr2t_id_organization',
- $this->util->getDbLookup()->getOrganizationsWithRespondents(),
- $this->_('(all organizations)'));
+ $elements[] = $this->_createSelectElement(
+ 'gr2t_id_organization',
+ $this->loader->getCurrentUser()->getRespondentOrganizations(),
+ $this->_('(all organizations)')
+ );
$elements[] = null;
Modified: trunk/library/classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php 2013-01-22 18:30:24 UTC (rev 1120)
+++ trunk/library/classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php 2013-01-24 17:23:36 UTC (rev 1121)
@@ -47,6 +47,12 @@
class Gems_Snippets_Tracker_Summary_SummarySearchFormSnippet extends Gems_Snippets_AutosearchFormSnippet
{
/**
+ *
+ * @var Gems_Loader
+ */
+ protected $loader;
+
+ /**
* Returns a text element for autosearch. Can be overruled.
*
* The form / html elements to search on. Elements can be grouped by inserting null's between them.
@@ -57,13 +63,17 @@
*/
protected function getAutoSearchElements(array $data)
{
- $elements[] = $this->_createSelectElement('gto_id_track',
+ $elements[] = $this->_createSelectElement(
+ 'gto_id_track',
$this->util->getTrackData()->getSteppedTracks(),
- $this->_('(select a track)'));
+ $this->_('(select a track)')
+ );
- $elements[] = $this->_createSelectElement('gto_id_organization',
- $this->util->getDbLookup()->getOrganizationsWithRespondents(),
- $this->_('(all organizations)'));
+ $elements[] = $this->_createSelectElement(
+ 'gto_id_organization',
+ $this->loader->getCurrentUser()->getRespondentOrganizations(),
+ $this->_('(all organizations)')
+ );
$elements[] = null;
Modified: trunk/library/classes/Gems/Tracker/Survey.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Survey.php 2013-01-22 18:30:24 UTC (rev 1120)
+++ trunk/library/classes/Gems/Tracker/Survey.php 2013-01-24 17:23:36 UTC (rev 1121)
@@ -36,7 +36,7 @@
*/
/**
- * Object representing a specific Survey
+ * Object representing a specific Survey
*
* @package Gems
* @subpackage Tracker
@@ -425,7 +425,7 @@
*/
public function getSource()
{
- if (! $this->_source && isset($this->_gemsSurvey['gsu_id_source'])) {
+ if (! $this->_source && isset($this->_gemsSurvey['gsu_id_source']) && $this->_gemsSurvey['gsu_id_source']) {
$this->_source = $this->tracker->getSource($this->_gemsSurvey['gsu_id_source']);
if (! $this->_source) {
Modified: trunk/library/classes/Gems/Util/TrackData.php
===================================================================
--- trunk/library/classes/Gems/Util/TrackData.php 2013-01-22 18:30:24 UTC (rev 1120)
+++ trunk/library/classes/Gems/Util/TrackData.php 2013-01-24 17:23:36 UTC (rev 1121)
@@ -204,6 +204,30 @@
}
/**
+ *
+ * @param string $code
+ * @return array survey id => survey name
+ */
+ public function getSurveysByCode($code)
+ {
+ $cacheId = __CLASS__ . '_' . __FUNCTION__ . '_' . $code;
+
+ if ($results = $this->cache->load($cacheId)) {
+ return $results;
+ }
+
+ $select = $this->db->select();
+ $select->from('gems__surveys', array('gsu_id_survey', 'gsu_survey_name'))
+ ->where("gsu_code = ?", $code)
+ ->where("gsu_active = 1")
+ ->order('gsu_survey_name');
+
+ $results = $this->db->fetchPairs($select);
+ $this->cache->save($results, $cacheId, array('surveys'));
+ return $results;
+ }
+
+ /**
* Returns array (id => name) of all 'T' tracks, sorted alphabetically
* @return array
*/
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2013-01-22 18:30:24 UTC (rev 1120)
+++ trunk/library/languages/default-en.po 2013-01-24 17:23:36 UTC (rev 1121)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-21 16:58+0100\n"
+"POT-Creation-Date: 2013-01-24 18:21+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -1273,7 +1273,7 @@
#: classes/Gems/Default/SurveyMaintenanceAction.php:503
#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:737
#: classes/Gems/Tracker/Model/TrackModel.php:102
-#: classes/Gems/Util/TrackData.php:147
+#: classes/Gems/Util/TrackData.php:153
msgid "Active"
msgstr "Active"
@@ -1434,13 +1434,13 @@
msgstr "Invalid language setting."
#: classes/Gems/Default/LogAction.php:78
-#: classes/Gems/Default/TokenPlanAction.php:234
+#: classes/Gems/Default/TokenPlanAction.php:238
#: classes/Gems/Snippets/AutosearchFormSnippet.php:125
msgid "from"
msgstr "from"
#: classes/Gems/Default/LogAction.php:83
-#: classes/Gems/Default/TokenPlanAction.php:238
+#: classes/Gems/Default/TokenPlanAction.php:242
#: classes/Gems/Snippets/AutosearchFormSnippet.php:141
msgid "until"
msgstr "until"
@@ -1759,8 +1759,8 @@
#: classes/Gems/Default/RespondentAction.php:386
#: classes/Gems/Default/StaffAction.php:335
#: classes/Gems/Default/StaffAction.php:405
-#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:66
-#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:66
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:75
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:75
msgid "(all organizations)"
msgstr "(all organizations)"
@@ -2620,14 +2620,14 @@
msgstr "Round"
#: classes/Gems/Default/SummaryAction.php:111
-#: classes/Gems/Default/TokenPlanAction.php:292
+#: classes/Gems/Default/TokenPlanAction.php:296
#: classes/Gems/Selector/TokenByGroupDateSelector.php:139
#: classes/Gems/Util/TokenData.php:67
msgid "Answered"
msgstr "Answered"
#: classes/Gems/Default/SummaryAction.php:112
-#: classes/Gems/Default/TokenPlanAction.php:293
+#: classes/Gems/Default/TokenPlanAction.php:297
#: classes/Gems/Selector/TokenByGroupDateSelector.php:129
#: classes/Gems/Tracker/Token.php:1038
#: snippets/RespondentTokenTabsSnippet.php:68
@@ -2635,7 +2635,7 @@
msgstr "Missed"
#: classes/Gems/Default/SummaryAction.php:113
-#: classes/Gems/Default/TokenPlanAction.php:287
+#: classes/Gems/Default/TokenPlanAction.php:291
#: classes/Gems/Tracker/Token.php:1044
msgid "Open"
msgstr "Open"
@@ -2653,7 +2653,7 @@
msgstr "Summary"
#: classes/Gems/Default/SummaryAction.php:228
-#: classes/Gems/Default/TokenPlanAction.php:463
+#: classes/Gems/Default/TokenPlanAction.php:469
#: classes/Gems/Default/TrackAction.php:450
#: classes/Gems/Tracker/Snippets/EditTokenSnippetAbstract.php:141
msgid "token"
@@ -2891,17 +2891,17 @@
msgstr "Round / Details"
#: classes/Gems/Default/TokenPlanAction.php:113
-#: classes/Gems/Default/TokenPlanAction.php:223
+#: classes/Gems/Default/TokenPlanAction.php:227
#: classes/Gems/Snippets/TokenPlanTableSnippet.php:57
-#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:73
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:83
#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:385
msgid "Valid from"
msgstr "Valid from"
#: classes/Gems/Default/TokenPlanAction.php:114
-#: classes/Gems/Default/TokenPlanAction.php:224
+#: classes/Gems/Default/TokenPlanAction.php:228
#: classes/Gems/Snippets/TokenPlanTableSnippet.php:58
-#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:74
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:84
#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:386
#: classes/Gems/Tracker/Model/StandardTokenModel.php:198
msgid "Valid until"
@@ -2921,70 +2921,78 @@
msgid "No tokens found."
msgstr "No tokens found."
-#: classes/Gems/Default/TokenPlanAction.php:225
+#: classes/Gems/Default/TokenPlanAction.php:224
+msgid "Is valid during"
+msgstr "Is valid during"
+
+#: classes/Gems/Default/TokenPlanAction.php:226
+msgid "Is valid within"
+msgstr "Is valid within"
+
+#: classes/Gems/Default/TokenPlanAction.php:229
msgid "E-Mailed on"
msgstr "E-Mailed on"
-#: classes/Gems/Default/TokenPlanAction.php:226
+#: classes/Gems/Default/TokenPlanAction.php:230
msgid "Completion date"
msgstr "Completion date"
-#: classes/Gems/Default/TokenPlanAction.php:230
+#: classes/Gems/Default/TokenPlanAction.php:234
#: classes/Gems/Snippets/AutosearchFormSnippet.php:116
msgid "For date"
msgstr "For date"
-#: classes/Gems/Default/TokenPlanAction.php:252
+#: classes/Gems/Default/TokenPlanAction.php:256
msgid "Select:"
msgstr "Select:"
-#: classes/Gems/Default/TokenPlanAction.php:258
+#: classes/Gems/Default/TokenPlanAction.php:262
msgid "(all tracks)"
msgstr "(all tracks)"
-#: classes/Gems/Default/TokenPlanAction.php:269
+#: classes/Gems/Default/TokenPlanAction.php:273
msgid "(all rounds)"
msgstr "(all rounds)"
-#: classes/Gems/Default/TokenPlanAction.php:283
+#: classes/Gems/Default/TokenPlanAction.php:287
msgid "(all surveys)"
msgstr "(all surveys)"
-#: classes/Gems/Default/TokenPlanAction.php:286
+#: classes/Gems/Default/TokenPlanAction.php:290
msgid "(all actions)"
msgstr "(all actions)"
-#: classes/Gems/Default/TokenPlanAction.php:288
+#: classes/Gems/Default/TokenPlanAction.php:292
msgid "Not emailed"
msgstr "Not emailed"
-#: classes/Gems/Default/TokenPlanAction.php:289
+#: classes/Gems/Default/TokenPlanAction.php:293
msgid "To email"
msgstr "To email"
-#: classes/Gems/Default/TokenPlanAction.php:290
+#: classes/Gems/Default/TokenPlanAction.php:294
msgid "Needs reminder"
msgstr "Needs reminder"
-#: classes/Gems/Default/TokenPlanAction.php:291
+#: classes/Gems/Default/TokenPlanAction.php:295
msgid "Yet to Answer"
msgstr "Yet to Answer"
-#: classes/Gems/Default/TokenPlanAction.php:294
+#: classes/Gems/Default/TokenPlanAction.php:298
msgid "Removed"
msgstr "Removed"
-#: classes/Gems/Default/TokenPlanAction.php:308
-#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:88
-#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:90
+#: classes/Gems/Default/TokenPlanAction.php:312
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:98
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:100
msgid "(all fillers)"
msgstr "(all fillers)"
-#: classes/Gems/Default/TokenPlanAction.php:327
+#: classes/Gems/Default/TokenPlanAction.php:331
msgid "(all staff)"
msgstr "(all staff)"
-#: classes/Gems/Default/TokenPlanAction.php:454
+#: classes/Gems/Default/TokenPlanAction.php:460
#: classes/Gems/Snippets/TokenModelSnippetAbstract.php:59
#: classes/Gems/Snippets/TokenPlanTableSnippet.php:122
#: snippets/BrowseSingleSurveyTokenSnippet.php:144
@@ -2992,7 +3000,7 @@
msgid "+"
msgstr "+"
-#: classes/Gems/Default/TokenPlanAction.php:468
+#: classes/Gems/Default/TokenPlanAction.php:474
msgid "Token planning"
msgstr "Token planning"
@@ -3911,19 +3919,19 @@
msgid "Legend"
msgstr "Legend"
-#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:62
-#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:62
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:69
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:69
msgid "(select a track)"
msgstr "(select a track)"
-#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:71
-#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:71
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:81
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:81
#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:370
msgid "Track start"
msgstr "Track start"
-#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:72
-#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:72
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:82
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:82
#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:371
msgid "Track end"
msgstr "Track end"
@@ -4704,35 +4712,35 @@
msgid "Token does not exist"
msgstr "Token does not exist"
-#: classes/Gems/Util/TrackData.php:147
+#: classes/Gems/Util/TrackData.php:153
msgid "Inactive"
msgstr "Inactive"
-#: classes/Gems/Util/TrackData.php:179
+#: classes/Gems/Util/TrackData.php:185
msgid "Minutes"
msgstr "Minutes"
-#: classes/Gems/Util/TrackData.php:180
+#: classes/Gems/Util/TrackData.php:186
msgid "Hours"
msgstr "Hours"
-#: classes/Gems/Util/TrackData.php:181
+#: classes/Gems/Util/TrackData.php:187
msgid "Days"
msgstr "Days"
-#: classes/Gems/Util/TrackData.php:182
+#: classes/Gems/Util/TrackData.php:188
msgid "Weeks"
msgstr "Weeks"
-#: classes/Gems/Util/TrackData.php:183
+#: classes/Gems/Util/TrackData.php:189
msgid "Months"
msgstr "Months"
-#: classes/Gems/Util/TrackData.php:184
+#: classes/Gems/Util/TrackData.php:190
msgid "Quarters"
msgstr "Quarters"
-#: classes/Gems/Util/TrackData.php:185
+#: classes/Gems/Util/TrackData.php:191
msgid "Years"
msgstr "Years"
@@ -5318,9 +5326,6 @@
#~ "Only for unanswered tokens: updates the survey of a token when changed in "
#~ "the track."
-#~ msgid "Invalid organization."
-#~ msgstr "Invalid organization."
-
#~ msgid "Check all is answersed"
#~ msgstr "Check all is answersed"
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2013-01-22 18:30:24 UTC (rev 1120)
+++ trunk/library/languages/default-nl.po 2013-01-24 17:23:36 UTC (rev 1121)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-21 16:58+0100\n"
+"POT-Creation-Date: 2013-01-24 18:21+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -1278,7 +1278,7 @@
#: classes/Gems/Default/SurveyMaintenanceAction.php:503
#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:737
#: classes/Gems/Tracker/Model/TrackModel.php:102
-#: classes/Gems/Util/TrackData.php:147
+#: classes/Gems/Util/TrackData.php:153
msgid "Active"
msgstr "Actief"
@@ -1442,13 +1442,13 @@
msgstr "Ongeldige taal instelling."
#: classes/Gems/Default/LogAction.php:78
-#: classes/Gems/Default/TokenPlanAction.php:234
+#: classes/Gems/Default/TokenPlanAction.php:238
#: classes/Gems/Snippets/AutosearchFormSnippet.php:125
msgid "from"
msgstr "vanaf"
#: classes/Gems/Default/LogAction.php:83
-#: classes/Gems/Default/TokenPlanAction.php:238
+#: classes/Gems/Default/TokenPlanAction.php:242
#: classes/Gems/Snippets/AutosearchFormSnippet.php:141
msgid "until"
msgstr "tot"
@@ -1768,8 +1768,8 @@
#: classes/Gems/Default/RespondentAction.php:386
#: classes/Gems/Default/StaffAction.php:335
#: classes/Gems/Default/StaffAction.php:405
-#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:66
-#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:66
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:75
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:75
msgid "(all organizations)"
msgstr "(alle organisaties)"
@@ -2636,14 +2636,14 @@
msgstr "Ronde"
#: classes/Gems/Default/SummaryAction.php:111
-#: classes/Gems/Default/TokenPlanAction.php:292
+#: classes/Gems/Default/TokenPlanAction.php:296
#: classes/Gems/Selector/TokenByGroupDateSelector.php:139
#: classes/Gems/Util/TokenData.php:67
msgid "Answered"
msgstr "Beantwoord"
#: classes/Gems/Default/SummaryAction.php:112
-#: classes/Gems/Default/TokenPlanAction.php:293
+#: classes/Gems/Default/TokenPlanAction.php:297
#: classes/Gems/Selector/TokenByGroupDateSelector.php:129
#: classes/Gems/Tracker/Token.php:1038
#: snippets/RespondentTokenTabsSnippet.php:68
@@ -2651,7 +2651,7 @@
msgstr "Gemist"
#: classes/Gems/Default/SummaryAction.php:113
-#: classes/Gems/Default/TokenPlanAction.php:287
+#: classes/Gems/Default/TokenPlanAction.php:291
#: classes/Gems/Tracker/Token.php:1044
msgid "Open"
msgstr "Open"
@@ -2669,7 +2669,7 @@
msgstr "Samenvatting"
#: classes/Gems/Default/SummaryAction.php:228
-#: classes/Gems/Default/TokenPlanAction.php:463
+#: classes/Gems/Default/TokenPlanAction.php:469
#: classes/Gems/Default/TrackAction.php:450
#: classes/Gems/Tracker/Snippets/EditTokenSnippetAbstract.php:141
msgid "token"
@@ -2910,17 +2910,17 @@
msgstr "Ronde / Details"
#: classes/Gems/Default/TokenPlanAction.php:113
-#: classes/Gems/Default/TokenPlanAction.php:223
+#: classes/Gems/Default/TokenPlanAction.php:227
#: classes/Gems/Snippets/TokenPlanTableSnippet.php:57
-#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:73
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:83
#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:385
msgid "Valid from"
msgstr "Geldig vanaf"
#: classes/Gems/Default/TokenPlanAction.php:114
-#: classes/Gems/Default/TokenPlanAction.php:224
+#: classes/Gems/Default/TokenPlanAction.php:228
#: classes/Gems/Snippets/TokenPlanTableSnippet.php:58
-#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:74
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:84
#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:386
#: classes/Gems/Tracker/Model/StandardTokenModel.php:198
msgid "Valid until"
@@ -2940,70 +2940,78 @@
msgid "No tokens found."
msgstr "Geen kenmerken gevonden."
-#: classes/Gems/Default/TokenPlanAction.php:225
+#: classes/Gems/Default/TokenPlanAction.php:224
+msgid "Is valid during"
+msgstr "Is geldig gedurende"
+
+#: classes/Gems/Default/TokenPlanAction.php:226
+msgid "Is valid within"
+msgstr "Is geldig tijdens"
+
+#: classes/Gems/Default/TokenPlanAction.php:229
msgid "E-Mailed on"
msgstr "Email verstuurd op"
-#: classes/Gems/Default/TokenPlanAction.php:226
+#: classes/Gems/Default/TokenPlanAction.php:230
msgid "Completion date"
msgstr "Datum ingevuld op"
-#: classes/Gems/Default/TokenPlanAction.php:230
+#: classes/Gems/Default/TokenPlanAction.php:234
#: classes/Gems/Snippets/AutosearchFormSnippet.php:116
msgid "For date"
msgstr "Met datum"
-#: classes/Gems/Default/TokenPlanAction.php:252
+#: classes/Gems/Default/TokenPlanAction.php:256
msgid "Select:"
msgstr "Selecteren:"
-#: classes/Gems/Default/TokenPlanAction.php:258
+#: classes/Gems/Default/TokenPlanAction.php:262
msgid "(all tracks)"
msgstr "(alle trajecten)"
-#: classes/Gems/Default/TokenPlanAction.php:269
+#: classes/Gems/Default/TokenPlanAction.php:273
msgid "(all rounds)"
msgstr "(alle rondes)"
-#: classes/Gems/Default/TokenPlanAction.php:283
+#: classes/Gems/Default/TokenPlanAction.php:287
msgid "(all surveys)"
msgstr "(alle vragenlijsten)"
-#: classes/Gems/Default/TokenPlanAction.php:286
+#: classes/Gems/Default/TokenPlanAction.php:290
msgid "(all actions)"
msgstr "(alle acties)"
-#: classes/Gems/Default/TokenPlanAction.php:288
+#: classes/Gems/Default/TokenPlanAction.php:292
msgid "Not emailed"
msgstr "Niet gemaild"
-#: classes/Gems/Default/TokenPlanAction.php:289
+#: classes/Gems/Default/TokenPlanAction.php:293
msgid "To email"
msgstr "Te mailen"
-#: classes/Gems/Default/TokenPlanAction.php:290
+#: classes/Gems/Default/TokenPlanAction.php:294
msgid "Needs reminder"
msgstr "Herinnering nodig"
-#: classes/Gems/Default/TokenPlanAction.php:291
+#: classes/Gems/Default/TokenPlanAction.php:295
msgid "Yet to Answer"
msgstr "Nog te beantwoorden"
-#: classes/Gems/Default/TokenPlanAction.php:294
+#: classes/Gems/Default/TokenPlanAction.php:298
msgid "Removed"
msgstr "Verwijderd"
-#: classes/Gems/Default/TokenPlanAction.php:308
-#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:88
-#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:90
+#: classes/Gems/Default/TokenPlanAction.php:312
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:98
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:100
msgid "(all fillers)"
msgstr "(alle invullers)"
-#: classes/Gems/Default/TokenPlanAction.php:327
+#: classes/Gems/Default/TokenPlanAction.php:331
msgid "(all staff)"
msgstr "(alle medewerkers)"
-#: classes/Gems/Default/TokenPlanAction.php:454
+#: classes/Gems/Default/TokenPlanAction.php:460
#: classes/Gems/Snippets/TokenModelSnippetAbstract.php:59
#: classes/Gems/Snippets/TokenPlanTableSnippet.php:122
#: snippets/BrowseSingleSurveyTokenSnippet.php:144
@@ -3011,7 +3019,7 @@
msgid "+"
msgstr "+"
-#: classes/Gems/Default/TokenPlanAction.php:468
+#: classes/Gems/Default/TokenPlanAction.php:474
msgid "Token planning"
msgstr "Per kenmerk plannen"
@@ -3079,7 +3087,7 @@
#: classes/Gems/Default/TrackAction.php:461
#, php-format
msgid "Tracks assigned to %s: %s"
-msgstr "Geen traject toegewezen aan patiënt nr: %s: %s"
+msgstr "Trajecten toegewezen aan patiënt nr: %s: %s"
#: classes/Gems/Default/TrackAction.php:489
#, php-format
@@ -3939,19 +3947,19 @@
msgid "Legend"
msgstr "Legenda"
-#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:62
-#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:62
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:69
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:69
msgid "(select a track)"
msgstr "(selecteer een traject)"
-#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:71
-#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:71
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:81
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:81
#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:370
msgid "Track start"
msgstr "Traject start"
-#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:72
-#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:72
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:82
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:82
#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:371
msgid "Track end"
msgstr "Traject einde"
@@ -4106,7 +4114,7 @@
#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:387
msgid "Start time"
-msgstr "Starten tijd"
+msgstr "Start tijd"
#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:388
msgid "Completion time"
@@ -4749,35 +4757,35 @@
msgid "Token does not exist"
msgstr "Kenmerk bestaat niet"
-#: classes/Gems/Util/TrackData.php:147
+#: classes/Gems/Util/TrackData.php:153
msgid "Inactive"
msgstr "Inactief"
-#: classes/Gems/Util/TrackData.php:179
+#: classes/Gems/Util/TrackData.php:185
msgid "Minutes"
msgstr "Minuten"
-#: classes/Gems/Util/TrackData.php:180
+#: classes/Gems/Util/TrackData.php:186
msgid "Hours"
msgstr "Uren"
-#: classes/Gems/Util/TrackData.php:181
+#: classes/Gems/Util/TrackData.php:187
msgid "Days"
msgstr "Dagen"
-#: classes/Gems/Util/TrackData.php:182
+#: classes/Gems/Util/TrackData.php:188
msgid "Weeks"
msgstr "Weken"
-#: classes/Gems/Util/TrackData.php:183
+#: classes/Gems/Util/TrackData.php:189
msgid "Months"
msgstr "Maanden"
-#: classes/Gems/Util/TrackData.php:184
+#: classes/Gems/Util/TrackData.php:190
msgid "Quarters"
msgstr "Kwartieren"
-#: classes/Gems/Util/TrackData.php:185
+#: classes/Gems/Util/TrackData.php:191
msgid "Years"
msgstr "Jaren"
@@ -5364,9 +5372,6 @@
#~ msgid "Some help for this export"
#~ msgstr "Uitleg over deze export mogelijkheid"
-#~ msgid "Invalid organization."
-#~ msgstr "Ongeldige organisatie."
-
#~ msgid "Check all is answersed"
#~ msgstr "Controleer alles is beantwoord"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
