Menu
▾
▴
[Gemstracker-svn] SF.net SVN: gemstracker:[753] tags/1.5.4-pulse-20120604
|
From: <gem...@li...> - 2012-06-12 09:00:02
|
Revision: 753
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=753&view=rev
Author: michieltcs
Date: 2012-06-12 08:59:56 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------
Merge revisions 738,745,748,748 and 751 from trunk
Modified Paths:
--------------
tags/1.5.4-pulse-20120604/library/changelog.txt
tags/1.5.4-pulse-20120604/library/classes/Gems/Default/RespondentExportAction.php
tags/1.5.4-pulse-20120604/library/classes/Gems/Upgrades.php
tags/1.5.4-pulse-20120604/library/classes/MUtil/Html/AElement.php
tags/1.5.4-pulse-20120604/library/classes/MUtil/Validate/Date/DateAfter.php
tags/1.5.4-pulse-20120604/library/languages/FakeTranslations.php
tags/1.5.4-pulse-20120604/library/languages/default-nl.mo
tags/1.5.4-pulse-20120604/library/languages/default-nl.po
Property Changed:
----------------
tags/1.5.4-pulse-20120604/
tags/1.5.4-pulse-20120604/library/
Property changes on: tags/1.5.4-pulse-20120604
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.5.0-pulse:306-430,467
/branches/1.5.x:426-455,458-472,475-481
/tags/1.5.0beta1:305
/tags/1.5.1:485,489,509-510
/tags/1.5.3-rc2:612,614,616,618
+ /branches/1.5.0-pulse:306-430,467
/branches/1.5.x:426-455,458-472,475-481
/tags/1.5.0beta1:305
/tags/1.5.1:485,489,509-510
/tags/1.5.3-rc2:612,614,616,618
/trunk:738,745,748-749,751
Property changes on: tags/1.5.4-pulse-20120604/library
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.5.0-pulse/library:306-344,346,467
/branches/1.5.x/library:426-455,458-472,475-481
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
/tags/1.5.1/library:485,489,509-510,534
/tags/1.5.3-rc2/library:612,614,616,618
+ /branches/1.5.0-pulse/library:306-344,346,467
/branches/1.5.x/library:426-455,458-472,475-481
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
/tags/1.5.1/library:485,489,509-510,534
/tags/1.5.3-rc2/library:612,614,616,618
/trunk/library:738,745,748-749,751
Modified: tags/1.5.4-pulse-20120604/library/changelog.txt
===================================================================
--- tags/1.5.4-pulse-20120604/library/changelog.txt 2012-06-11 12:55:54 UTC (rev 752)
+++ tags/1.5.4-pulse-20120604/library/changelog.txt 2012-06-12 08:59:56 UTC (rev 753)
@@ -1,3 +1,12 @@
+Important changes from 1.5.3 => 1.5.4
+============================================================
+New logLevel project.ini setting
+Added export of all patient data on a single page or PDF (if binary specified in project.ini)
+Fixed a lot of issues with staff not being able to login or not being created
+Fixed handling of token return on multi-url sites
+Added maximum number of reminders sent to tokens
+Fixed several date display and editing issues
+
Important changes from 1.5.2 => 1.5.3
============================================================
People can login using their e-mail address as user name. This can be activated by for respondents and staff seperately, by default this is off for both.
Modified: tags/1.5.4-pulse-20120604/library/classes/Gems/Default/RespondentExportAction.php
===================================================================
--- tags/1.5.4-pulse-20120604/library/classes/Gems/Default/RespondentExportAction.php 2012-06-11 12:55:54 UTC (rev 752)
+++ tags/1.5.4-pulse-20120604/library/classes/Gems/Default/RespondentExportAction.php 2012-06-12 08:59:56 UTC (rev 753)
@@ -138,6 +138,18 @@
return $pdfContents;
}
+
+ /**
+ * Determines if this particular token should be included
+ * in the report
+ *
+ * @param Gems_Tracker_Token $token
+ * @return boolean This dummy implementation always returns true
+ */
+ protected function _isTokenInFilter(Gems_Tracker_Token $token)
+ {
+ return true;
+ }
/**
* Exports all the tokens of a single track, grouped by round
@@ -160,6 +172,11 @@
$this->html->br();
while ($token) {
+ if (!$this->_isTokenInFilter($token)) {
+ $token = $token->getNextToken();
+ continue;
+ }
+
$status = $this->_('Open');
if ($token->isCompleted()) {
@@ -172,6 +189,8 @@
$status = $this->_('Missed');
} else if (!empty($validFrom) && $validFrom->isLater($today)) {
$status = $this->_('Future');
+ } else if (empty($validFrom) && empty($validUntil)) {
+ $status = $this->_('Future');
}
}
Modified: tags/1.5.4-pulse-20120604/library/classes/Gems/Upgrades.php
===================================================================
--- tags/1.5.4-pulse-20120604/library/classes/Gems/Upgrades.php 2012-06-11 12:55:54 UTC (rev 752)
+++ tags/1.5.4-pulse-20120604/library/classes/Gems/Upgrades.php 2012-06-12 08:59:56 UTC (rev 753)
@@ -1,4 +1,5 @@
<?php
+
/**
* Copyright (c) 2011, Erasmus MC
* All rights reserved.
@@ -59,6 +60,7 @@
$this->register(array($this, 'Upgrade150to151'), 'Upgrade from 1.5.0 to 1.5.1');
$this->register(array($this, 'Upgrade151to152'), 'Upgrade from 1.5.1 to 1.5.2');
$this->register(array($this, 'Upgrade152to153'), 'Upgrade from 1.5.2 to 1.5.3');
+ $this->register(array($this, 'Upgrade153to154'), 'Upgrade from 1.5.3 to 1.5.4');
}
@@ -116,4 +118,14 @@
return true;
}
+
+ /**
+ * To upgrade to 1.5.4 just execute patchlevel 47
+ */
+ public function Upgrade153to154()
+ {
+ $this->_batch->addTask('Db_ExecutePatch', 47);
+
+ return true;
+ }
}
\ No newline at end of file
Modified: tags/1.5.4-pulse-20120604/library/classes/MUtil/Html/AElement.php
===================================================================
--- tags/1.5.4-pulse-20120604/library/classes/MUtil/Html/AElement.php 2012-06-11 12:55:54 UTC (rev 752)
+++ tags/1.5.4-pulse-20120604/library/classes/MUtil/Html/AElement.php 2012-06-12 08:59:56 UTC (rev 753)
@@ -112,7 +112,9 @@
$href = $args['href'];
unset($args['href']);
} else {
- $args['title'] = $email;
+ if (! isset($args['title'])) {
+ $args['title'] = $email;
+ }
$href = array('mailto:', $email);
}
if (! isset($args['onclick'])) {
Modified: tags/1.5.4-pulse-20120604/library/classes/MUtil/Validate/Date/DateAfter.php
===================================================================
--- tags/1.5.4-pulse-20120604/library/classes/MUtil/Validate/Date/DateAfter.php 2012-06-11 12:55:54 UTC (rev 752)
+++ tags/1.5.4-pulse-20120604/library/classes/MUtil/Validate/Date/DateAfter.php 2012-06-12 08:59:56 UTC (rev 753)
@@ -49,12 +49,14 @@
* Error constants
*/
const NOT_AFTER = 'notAfter';
+ const NO_VALIDFROM = 'noValidFrom';
/**
* @var array Message templates
*/
protected $_messageTemplates = array(
self::NOT_AFTER => "Date should be '%dateAfter%' or later.",
+ self::NO_VALIDFROM => "Should be empty if valid from date is not set."
);
/**
@@ -93,6 +95,11 @@
if ($this->_afterDate instanceof Zend_Date) {
$after = $this->_afterDate;
} elseif (isset($context[$this->_afterDate])) {
+ if (empty($context[$this->_afterDate])) {
+ $this->_error(self::NO_VALIDFROM);
+ return false;
+ }
+
$after = new Zend_Date($context[$this->_afterDate], $this->getDateFormat());
} else {
$after = new Zend_Date($this->_afterDate);
Modified: tags/1.5.4-pulse-20120604/library/languages/FakeTranslations.php
===================================================================
--- tags/1.5.4-pulse-20120604/library/languages/FakeTranslations.php 2012-06-11 12:55:54 UTC (rev 752)
+++ tags/1.5.4-pulse-20120604/library/languages/FakeTranslations.php 2012-06-12 08:59:56 UTC (rev 753)
@@ -48,6 +48,7 @@
// MUtil_Validate_Date_DateAfter
_("Date should be '%dateAfter%' or later.");
+_("Should be empty if valid from date is not set.");
// MUtil_Validate_Date_DateBefore
_("Date should be '%dateBefore%' or earlier.");
Modified: tags/1.5.4-pulse-20120604/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: tags/1.5.4-pulse-20120604/library/languages/default-nl.po
===================================================================
--- tags/1.5.4-pulse-20120604/library/languages/default-nl.po 2012-06-11 12:55:54 UTC (rev 752)
+++ tags/1.5.4-pulse-20120604/library/languages/default-nl.po 2012-06-12 08:59:56 UTC (rev 753)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-01 14:45+0100\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"
@@ -4013,72 +4013,76 @@
msgid "Date should be '%dateAfter%' or later."
msgstr "Datum moet later vallen dan '%dateAfter%' of er gelijk aan zijn."
-#: languages/FakeTranslations.php:53
+#: languages/FakeTranslations.php:51
+msgid "Should be empty if valid from date is not set."
+msgstr "Moet leeg zijn als 'afname op' niet is ingevuld."
+
+#: languages/FakeTranslations.php:54
#, php-format
msgid "Date should be '%dateBefore%' or earlier."
msgstr "Datum moet vallen voor '%dateBefore%' of er gelijk aan zijn."
-#: languages/FakeTranslations.php:56
+#: languages/FakeTranslations.php:57
msgid "%value% is not a valid date."
msgstr "%value% is geen geldige datum."
-#: languages/FakeTranslations.php:59
+#: languages/FakeTranslations.php:60
msgid "No record matching %value% was found."
msgstr "Geen gegevens gevonden die overeenkomen met %value%."
-#: languages/FakeTranslations.php:60
+#: languages/FakeTranslations.php:61
msgid "A duplicate record matching '%value%' was found."
msgstr "De waarde '%value%' is al in gebruik."
-#: languages/FakeTranslations.php:63
+#: languages/FakeTranslations.php:64
msgid "This is not a valid %testDescription%."
msgstr "%testDescription% is niet geldig."
-#: languages/FakeTranslations.php:64
+#: languages/FakeTranslations.php:65
msgid "A %testDescription% cannot contain letters."
msgstr "Een %testDescription% mag geen letters bevatten."
-#: languages/FakeTranslations.php:65
+#: languages/FakeTranslations.php:66
msgid "%value% is too long for a %testDescription%. Should be %length% digits."
msgstr "%value% is te lang voor een %testDescription%. Die moet %length% cijfers lang zijn."
-#: languages/FakeTranslations.php:66
+#: languages/FakeTranslations.php:67
msgid "%value% is too short for a %testDescription%. Should be %length% digits."
msgstr "%value% is te kort voor een %testDescription%. Die moet %length% cijfers lang zijn."
-#: 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 geen telefoonnummer (zoals: +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 "Deze PDF heeft een versie (%value%) die niet ondersteund wordt, slechts versies 1.0-1.4 worden ondersteund."
-#: languages/FakeTranslations.php:78
+#: languages/FakeTranslations.php:79
msgid "To set '%description%' you have to set '%fieldDescription%'."
msgstr " '%fieldDescription%' moet ingevoerd worden om '%description%' te kunnen kiezen."
-#: languages/FakeTranslations.php:82
+#: languages/FakeTranslations.php:83
msgid "'%value%' is not an email address (e.g. na...@so...)."
msgstr "'%value%' is niet een email address (zoals na...@er...)."
-#: 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 niet een verzameling email adressen (zoals na...@er..., ni...@ne...)."
-#: languages/FakeTranslations.php:88
+#: languages/FakeTranslations.php:89
msgid "'%value%' must contain only digits"
msgstr "'%value%' mag alleen cijfers bevatten"
-#: languages/FakeTranslations.php:89
+#: languages/FakeTranslations.php:90
msgid "'%value%' is an empty string"
msgstr "'%value%' is leeg"
-#: languages/FakeTranslations.php:90
+#: languages/FakeTranslations.php:91
msgid "Invalid type given. String, integer or float expected"
msgstr "Ongeldige invoer, geef een tekst of een nummer op"
-#: languages/FakeTranslations.php:93
+#: languages/FakeTranslations.php:94
msgid "One or more IPs are illegal."
msgstr "Een of meer IP adressen zijn incorrect."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
