Menu
▾
▴
gemstracker-svn — Receive updates on svn commits
You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(84) |
Oct
(70) |
Nov
(164) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(52) |
Feb
(77) |
Mar
(70) |
Apr
(58) |
May
(81) |
Jun
(74) |
Jul
(87) |
Aug
(30) |
Sep
(45) |
Oct
(37) |
Nov
(51) |
Dec
(31) |
| 2013 |
Jan
(47) |
Feb
(29) |
Mar
(40) |
Apr
(33) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <gem...@li...> - 2012-10-12 13:02:15
|
Revision: 982
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=982&view=rev
Author: matijsdejong
Date: 2012-10-12 13:02:04 +0000 (Fri, 12 Oct 2012)
Log Message:
-----------
Temporary fix for org-switch/setParam() problem
Modified Paths:
--------------
trunk/library/classes/Gems/Controller/BrowseEditAction.php
trunk/library/classes/Gems/Default/OrganizationAction.php
Modified: trunk/library/classes/Gems/Controller/BrowseEditAction.php
===================================================================
--- trunk/library/classes/Gems/Controller/BrowseEditAction.php 2012-10-11 16:30:59 UTC (rev 981)
+++ trunk/library/classes/Gems/Controller/BrowseEditAction.php 2012-10-12 13:02:04 UTC (rev 982)
@@ -439,7 +439,7 @@
$this->_applySearchParameters($model, true);
$this->addExcelColumns($model); // Hook to modify the model
-
+
// Use $this->formatExcelData to switch between formatted and unformatted data
$excelData = new Gems_FormattedData($this->getExcelData($model->load(), $model), $model, $this->formatExcelData);
@@ -636,7 +636,7 @@
foreach ($data as $key => $value) {
if ((is_array($value) && empty($value)) || (is_string($value) && 0 === strlen($value))) {
unset($data[$key]);
- }
+ }
}
}
Modified: trunk/library/classes/Gems/Default/OrganizationAction.php
===================================================================
--- trunk/library/classes/Gems/Default/OrganizationAction.php 2012-10-11 16:30:59 UTC (rev 981)
+++ trunk/library/classes/Gems/Default/OrganizationAction.php 2012-10-12 13:02:04 UTC (rev 982)
@@ -82,13 +82,16 @@
$user->setCurrentOrganization($orgId);
if ($origUrl) {
- foreach ($user->possibleOrgIds as $key) {
- $finds[] = '/' . $key. '/' . $oldOrg;
- $replaces[] = '/' . $key. '/' . $orgId;
+ if (strpos($origUrl, '/index/') === false) {
+ $correctUrl = $origUrl;
+ } else {
+ foreach ($user->possibleOrgIds as $key) {
+ $finds[] = '/' . $key. '/' . $oldOrg;
+ $replaces[] = '/' . $key. '/' . $orgId;
+ }
+ $correctUrl = str_replace($finds, $replaces, $origUrl);
}
- $correctUrl = str_replace($finds, $replaces, $origUrl);
// MUtil_Echo::track($origUrl, $correctUrl);
-
$this->getResponse()->setRedirect($correctUrl);
} else {
$user->gotoStartPage($this->menu, $request);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-10-11 16:31:09
|
Revision: 981
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=981&view=rev
Author: matijsdejong
Date: 2012-10-11 16:30:59 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
Fix for Pulse bug #550: Show respondent name in track overview screen (and on many other places) - translations updated!
Modified Paths:
--------------
trunk/library/languages/default-en.mo
trunk/library/languages/default-en.po
trunk/library/languages/default-nl.mo
trunk/library/languages/default-nl.po
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2012-10-11 16:07:14 UTC (rev 980)
+++ trunk/library/languages/default-en.po 2012-10-11 16:30:59 UTC (rev 981)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-11 14:52+0100\n"
+"POT-Creation-Date: 2012-10-11 18:28+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -290,7 +290,7 @@
#: classes/Gems/Tracker/Model/StandardTokenModel.php:195
#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:188
#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:197
-#: snippets/BrowseSingleSurveyTokenSnippet.php:167
+#: snippets/BrowseSingleSurveyTokenSnippet.php:164
#: snippets/TrackTokenOverviewSnippet.php:132
#: snippets/Organization/OrganizationEditSnippet.php:89
#: snippets/Track/Token/ShowAllOpenSnippet.php:88
@@ -305,7 +305,7 @@
#: classes/Gems/Menu.php:310 classes/Gems/Default/MailJobAction.php:99
#: classes/Gems/Default/ProjectTracksAction.php:64
#: classes/Gems/Default/TrackAction.php:328
-#: classes/Gems/Default/TrackActionAbstract.php:203
+#: classes/Gems/Default/TrackActionAbstract.php:219
#: classes/Gems/Default/TrackFieldsAction.php:96
#: classes/Gems/Email/OneMailForm.php:54
#: classes/Gems/Export/RespondentExport.php:224
@@ -652,7 +652,7 @@
#: classes/Gems/Default/RespondentAction.php:246
#: classes/Gems/Default/RespondentAction.php:478
#: classes/Gems/Default/RespondentAction.php:516
-#: classes/Gems/Default/TrackAction.php:548
+#: classes/Gems/Default/TrackAction.php:554
#, php-format
msgid "Unknown %s requested"
msgstr "Unknown %s requested"
@@ -814,7 +814,7 @@
#: classes/Gems/Default/RoleAction.php:232
#: classes/Gems/Default/SurveyMaintenanceAction.php:200
#: classes/Gems/Default/SurveyMaintenanceAction.php:414
-#: classes/Gems/Default/TrackActionAbstract.php:204
+#: classes/Gems/Default/TrackActionAbstract.php:220
#: classes/Gems/Default/TrackFieldsAction.php:101
#: classes/Gems/Default/UpgradeAction.php:176
#: classes/Gems/Export/RespondentExport.php:225
@@ -1198,7 +1198,7 @@
#: classes/Gems/Default/ExportAction.php:154
#: classes/Gems/Default/MailJobAction.php:100
#: classes/Gems/Default/ProjectSurveysAction.php:67
-#: classes/Gems/Default/SurveyAction.php:191
+#: classes/Gems/Default/SurveyAction.php:193
#: classes/Gems/Email/OneMailForm.php:57
#: classes/Gems/Export/RespondentExport.php:145
#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:755
@@ -1896,7 +1896,7 @@
#: classes/Gems/Default/OverviewPlanAction.php:115
#: classes/Gems/Default/ProjectSurveysAction.php:88
-#: classes/Gems/Default/SurveyAction.php:207
+#: classes/Gems/Default/SurveyAction.php:209
#: classes/Gems/Default/SurveyMaintenanceAction.php:559
#: classes/Gems/Tracker/Snippets/EditSingleSurveyTokenSnippetAbstract.php:157
msgid "survey"
@@ -2022,14 +2022,14 @@
msgstr "Session"
#: classes/Gems/Default/ProjectSurveysAction.php:68
-#: classes/Gems/Default/SurveyAction.php:192
+#: classes/Gems/Default/SurveyAction.php:194
#: snippets/TrackSurveyOverviewSnippet.php:113
msgid "By"
msgstr "By"
#: classes/Gems/Default/ProjectSurveysAction.php:69
#: classes/Gems/Default/ProjectTracksAction.php:67
-#: classes/Gems/Default/SurveyAction.php:193
+#: classes/Gems/Default/SurveyAction.php:195
#: classes/Gems/Default/TrackAction.php:330
#: classes/Gems/Email/EmailFormAbstract.php:193
#: classes/Gems/Email/EmailFormAbstract.php:251
@@ -2040,7 +2040,7 @@
#: classes/Gems/Default/ProjectSurveysAction.php:70
#: classes/Gems/Default/ProjectTracksAction.php:68
-#: classes/Gems/Default/SurveyAction.php:197
+#: classes/Gems/Default/SurveyAction.php:199
#: classes/Gems/Default/TrackAction.php:332
msgid "Until"
msgstr "Until"
@@ -2084,7 +2084,7 @@
msgstr "Survey not specified."
#: classes/Gems/Default/ProjectTracksAction.php:132
-#: classes/Gems/Default/TrackActionAbstract.php:496
+#: classes/Gems/Default/TrackActionAbstract.php:545
#, php-format
msgid "Track %s does not exist."
msgstr "Track %s does not exist."
@@ -2219,7 +2219,7 @@
#: classes/Gems/Default/RespondentAction.php:257
#: classes/Gems/Default/TrackAction.php:132
-#: classes/Gems/Default/TrackAction.php:479
+#: classes/Gems/Default/TrackAction.php:482
#: classes/Gems/Tracker/Model/StandardTokenModel.php:212
#: snippets/DeleteInSourceTrackSnippet.php:112
#: snippets/EditTrackSnippet.php:95
@@ -2264,7 +2264,7 @@
msgstr "Separate multiple respondents with a comma (,)"
#: classes/Gems/Default/RespondentPlanAction.php:67
-#: classes/Gems/Default/SurveyAction.php:171
+#: classes/Gems/Default/SurveyAction.php:173
#: classes/Gems/Default/TrackAction.php:297
#: snippets/DeleteInSourceTrackSnippet.php:132
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:174
@@ -2604,8 +2604,8 @@
#: classes/Gems/Default/SurveyAction.php:79
#, php-format
-msgid "Overview of %s survey for respondent %s"
-msgstr "Overview of %s survey for patient %s"
+msgid "Overview of %s survey for respondent %s: %s"
+msgstr "Overview of %s survey for respondent %s: %s"
#: classes/Gems/Default/SurveyAction.php:82
msgid "This survey has not been assigned to this respondent."
@@ -2613,10 +2613,10 @@
#: classes/Gems/Default/SurveyAction.php:144
#, php-format
-msgid "Assignments of this survey to %s"
-msgstr "Assignments of this survey to %s"
+msgid "Assignments of this survey to %s: %s"
+msgstr "Assignments of this survey to %s: %s"
-#: classes/Gems/Default/SurveyAction.php:165
+#: classes/Gems/Default/SurveyAction.php:167
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:173
#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:144
#: snippets/EditSingleSurveyTokenSnippet.php:133
@@ -2624,10 +2624,10 @@
msgid "Show surveys"
msgstr "Show surveys"
-#: classes/Gems/Default/SurveyAction.php:212
-#: snippets/RespondentDetailsWithAssignmentsSnippet.php:77
-msgid "Assigned surveys"
-msgstr "Assigned surveys"
+#: classes/Gems/Default/SurveyAction.php:214
+#, php-format
+msgid "Surveys assigned to %s: %s"
+msgstr "Surveys assigned to %s: %s"
#: classes/Gems/Default/SurveyMaintenanceAction.php:123
msgid "If empty, survey will never show up!"
@@ -2908,7 +2908,7 @@
#: classes/Gems/Default/TokenPlanAction.php:471
#: classes/Gems/Snippets/TokenModelSnippetAbstract.php:59
#: classes/Gems/Snippets/TokenPlanTableSnippet.php:122
-#: snippets/BrowseSingleSurveyTokenSnippet.php:147
+#: snippets/BrowseSingleSurveyTokenSnippet.php:144
#: snippets/TrackTokenOverviewSnippet.php:98
msgid "+"
msgstr "+"
@@ -2934,8 +2934,8 @@
#: classes/Gems/Default/TrackAction.php:172
#: snippets/ShowTrackUsageSnippet.php:114
#, php-format
-msgid "Assignments of this track to %s"
-msgstr "Assignments of this track to %s"
+msgid "Assignments of this track to %s: %s"
+msgstr "Assignments of this track to %s: %s"
#: classes/Gems/Default/TrackAction.php:269
#: classes/Gems/Default/TrackAction.php:282
@@ -2987,50 +2987,50 @@
msgstr "Delete track"
#: classes/Gems/Default/TrackAction.php:461
-#: snippets/RespondentDetailsWithAssignmentsSnippet.php:86
-msgid "Assigned tracks"
-msgstr "Assigned tracks"
+#, php-format
+msgid "Tracks assigned to %s: %s"
+msgstr "Tracks assigned to %s: %s"
-#: classes/Gems/Default/TrackAction.php:486
+#: classes/Gems/Default/TrackAction.php:489
#, php-format
-msgid "%s track for respondent nr %s"
-msgstr "%s track for patient nr %s"
+msgid "%s track for respondent nr %s: %s"
+msgstr "%s track for respondent nr %s: %s"
-#: classes/Gems/Default/TrackAction.php:543
+#: classes/Gems/Default/TrackAction.php:549
#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:184
#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:234
msgid "Add track"
msgstr "Add track"
-#: classes/Gems/Default/TrackAction.php:544
+#: classes/Gems/Default/TrackAction.php:550
msgid "This respondent does not yet have an active track. Add one here."
msgstr "This paitent does not yet have an active track. Add one here."
-#: classes/Gems/Default/TrackActionAbstract.php:106
+#: classes/Gems/Default/TrackActionAbstract.php:119
msgid "No tracks found"
msgstr "No tracks found"
-#: classes/Gems/Default/TrackActionAbstract.php:126
+#: classes/Gems/Default/TrackActionAbstract.php:139
msgid "Available tracks"
msgstr "Available tracks"
-#: classes/Gems/Default/TrackActionAbstract.php:167
+#: classes/Gems/Default/TrackActionAbstract.php:180
#, php-format
msgid "Token answers: %s"
msgstr "Token answers: %s"
-#: classes/Gems/Default/TrackActionAbstract.php:193
+#: classes/Gems/Default/TrackActionAbstract.php:206
#, php-format
-msgid "Adding the %s track to respondent %s"
-msgstr "Adding the %s track to patient %s"
+msgid "Adding the %s track to respondent %s: %s"
+msgstr "Adding the %s track to respondent %s: %s"
-#: classes/Gems/Default/TrackActionAbstract.php:205
+#: classes/Gems/Default/TrackActionAbstract.php:221
#: classes/Gems/Export/RespondentExport.php:226
#: classes/Gems/Tracker/Snippets/ShowTrackUsageAbstract.php:148
msgid "Enter the particulars concerning the assignment to this respondent."
msgstr "Enter the particulars concerning the assignment to this patient."
-#: classes/Gems/Default/TrackActionAbstract.php:206
+#: classes/Gems/Default/TrackActionAbstract.php:222
#: classes/Gems/Export/RespondentExport.php:227
#: classes/Gems/Tracker/Model/StandardTokenModel.php:207
#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:151
@@ -3039,19 +3039,19 @@
msgid "Assigned by"
msgstr "Assigned by"
-#: classes/Gems/Default/TrackActionAbstract.php:207
+#: classes/Gems/Default/TrackActionAbstract.php:223
#: classes/Gems/Export/RespondentExport.php:228
#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:152
#: classes/Gems/Tracker/Snippets/ShowTrackUsageAbstract.php:150
msgid "Start"
msgstr "Start"
-#: classes/Gems/Default/TrackActionAbstract.php:211
+#: classes/Gems/Default/TrackActionAbstract.php:227
#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:156
msgid "Ending on"
msgstr "Ending on"
-#: classes/Gems/Default/TrackActionAbstract.php:215
+#: classes/Gems/Default/TrackActionAbstract.php:231
#: classes/Gems/Export/RespondentExport.php:232
#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:161
#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:278
@@ -3059,23 +3059,23 @@
msgid "Comment"
msgstr "Comment"
-#: classes/Gems/Default/TrackActionAbstract.php:302
+#: classes/Gems/Default/TrackActionAbstract.php:318
#, php-format
msgid "Email %s %s"
msgstr "Email %s %s"
-#: classes/Gems/Default/TrackActionAbstract.php:308
+#: classes/Gems/Default/TrackActionAbstract.php:324
#, php-format
msgid "%s %s not found."
msgstr "%s %s not found."
-#: classes/Gems/Default/TrackActionAbstract.php:485
+#: classes/Gems/Default/TrackActionAbstract.php:534
#, php-format
-msgid "Overview of %s track for respondent %s"
-msgstr "Overview of %s track for patient %s"
+msgid "Overview of %s track for respondent %s: %s"
+msgstr "Overview of %s track for respondent %s: %s"
-#: classes/Gems/Default/TrackActionAbstract.php:489
-#: snippets/BrowseSingleSurveyTokenSnippet.php:98
+#: classes/Gems/Default/TrackActionAbstract.php:538
+#: snippets/BrowseSingleSurveyTokenSnippet.php:104
msgid "This track is currently not assigned to this respondent."
msgstr "This track is currently not assigned to this patient."
@@ -4060,7 +4060,7 @@
msgstr "Duration in seconds"
#: classes/Gems/Tracker/Model/StandardTokenModel.php:202
-#: snippets/BrowseSingleSurveyTokenSnippet.php:141
+#: snippets/BrowseSingleSurveyTokenSnippet.php:138
#: snippets/RespondentTokenSnippet.php:135
#: snippets/TrackTokenOverviewSnippet.php:115
msgid "Score"
@@ -4961,6 +4961,14 @@
msgid "Address"
msgstr "Address"
+#: snippets/RespondentDetailsWithAssignmentsSnippet.php:77
+msgid "Assigned surveys"
+msgstr "Assigned surveys"
+
+#: snippets/RespondentDetailsWithAssignmentsSnippet.php:86
+msgid "Assigned tracks"
+msgstr "Assigned tracks"
+
#: snippets/RespondentDetailsWithAssignmentsSnippet.php:110
msgid "No surveys"
msgstr "No surveys"
@@ -5000,8 +5008,8 @@
#: snippets/ShowTrackUsageSnippet.php:112
#, php-format
-msgid "Other assignments of this track to %s"
-msgstr "Other assignments of this track to %s"
+msgid "Other assignments of this track to %s: %s"
+msgstr "Other assignments of this track to %s: %s"
#: snippets/SurveyQuestionsSnippet.php:129
msgid "Answer options"
@@ -5630,9 +5638,6 @@
#~ msgid "In progress"
#~ msgstr "In progress"
-#~ msgid "No tracks assigned to respondent nr: %s"
-#~ msgstr "No tracks assigned to patient nr: %s"
-
#~ msgid "Hand dom."
#~ msgstr "Hand dom."
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2012-10-11 16:07:14 UTC (rev 980)
+++ trunk/library/languages/default-nl.po 2012-10-11 16:30:59 UTC (rev 981)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-11 14:55+0100\n"
+"POT-Creation-Date: 2012-10-11 18:29+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -290,7 +290,7 @@
#: classes/Gems/Tracker/Model/StandardTokenModel.php:195
#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:188
#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:197
-#: snippets/BrowseSingleSurveyTokenSnippet.php:167
+#: snippets/BrowseSingleSurveyTokenSnippet.php:164
#: snippets/TrackTokenOverviewSnippet.php:132
#: snippets/Organization/OrganizationEditSnippet.php:89
#: snippets/Track/Token/ShowAllOpenSnippet.php:88
@@ -305,7 +305,7 @@
#: classes/Gems/Menu.php:310 classes/Gems/Default/MailJobAction.php:99
#: classes/Gems/Default/ProjectTracksAction.php:64
#: classes/Gems/Default/TrackAction.php:328
-#: classes/Gems/Default/TrackActionAbstract.php:203
+#: classes/Gems/Default/TrackActionAbstract.php:219
#: classes/Gems/Default/TrackFieldsAction.php:96
#: classes/Gems/Email/OneMailForm.php:54
#: classes/Gems/Export/RespondentExport.php:224
@@ -652,7 +652,7 @@
#: classes/Gems/Default/RespondentAction.php:246
#: classes/Gems/Default/RespondentAction.php:478
#: classes/Gems/Default/RespondentAction.php:516
-#: classes/Gems/Default/TrackAction.php:548
+#: classes/Gems/Default/TrackAction.php:554
#, php-format
msgid "Unknown %s requested"
msgstr "Onjuist %s verzoek"
@@ -816,7 +816,7 @@
#: classes/Gems/Default/RoleAction.php:232
#: classes/Gems/Default/SurveyMaintenanceAction.php:200
#: classes/Gems/Default/SurveyMaintenanceAction.php:414
-#: classes/Gems/Default/TrackActionAbstract.php:204
+#: classes/Gems/Default/TrackActionAbstract.php:220
#: classes/Gems/Default/TrackFieldsAction.php:101
#: classes/Gems/Default/UpgradeAction.php:176
#: classes/Gems/Export/RespondentExport.php:225
@@ -1203,7 +1203,7 @@
#: classes/Gems/Default/ExportAction.php:154
#: classes/Gems/Default/MailJobAction.php:100
#: classes/Gems/Default/ProjectSurveysAction.php:67
-#: classes/Gems/Default/SurveyAction.php:191
+#: classes/Gems/Default/SurveyAction.php:193
#: classes/Gems/Email/OneMailForm.php:57
#: classes/Gems/Export/RespondentExport.php:145
#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:755
@@ -1907,7 +1907,7 @@
#: classes/Gems/Default/OverviewPlanAction.php:115
#: classes/Gems/Default/ProjectSurveysAction.php:88
-#: classes/Gems/Default/SurveyAction.php:207
+#: classes/Gems/Default/SurveyAction.php:209
#: classes/Gems/Default/SurveyMaintenanceAction.php:559
#: classes/Gems/Tracker/Snippets/EditSingleSurveyTokenSnippetAbstract.php:157
msgid "survey"
@@ -2033,14 +2033,14 @@
msgstr "Sessie"
#: classes/Gems/Default/ProjectSurveysAction.php:68
-#: classes/Gems/Default/SurveyAction.php:192
+#: classes/Gems/Default/SurveyAction.php:194
#: snippets/TrackSurveyOverviewSnippet.php:113
msgid "By"
msgstr "Door"
#: classes/Gems/Default/ProjectSurveysAction.php:69
#: classes/Gems/Default/ProjectTracksAction.php:67
-#: classes/Gems/Default/SurveyAction.php:193
+#: classes/Gems/Default/SurveyAction.php:195
#: classes/Gems/Default/TrackAction.php:330
#: classes/Gems/Email/EmailFormAbstract.php:193
#: classes/Gems/Email/EmailFormAbstract.php:251
@@ -2051,7 +2051,7 @@
#: classes/Gems/Default/ProjectSurveysAction.php:70
#: classes/Gems/Default/ProjectTracksAction.php:68
-#: classes/Gems/Default/SurveyAction.php:197
+#: classes/Gems/Default/SurveyAction.php:199
#: classes/Gems/Default/TrackAction.php:332
msgid "Until"
msgstr "Tot"
@@ -2095,7 +2095,7 @@
msgstr "Vragenlijst niet opgegeven."
#: classes/Gems/Default/ProjectTracksAction.php:132
-#: classes/Gems/Default/TrackActionAbstract.php:496
+#: classes/Gems/Default/TrackActionAbstract.php:545
#, php-format
msgid "Track %s does not exist."
msgstr "Trajectnummer %s bestaat niet."
@@ -2230,7 +2230,7 @@
#: classes/Gems/Default/RespondentAction.php:257
#: classes/Gems/Default/TrackAction.php:132
-#: classes/Gems/Default/TrackAction.php:479
+#: classes/Gems/Default/TrackAction.php:482
#: classes/Gems/Tracker/Model/StandardTokenModel.php:212
#: snippets/DeleteInSourceTrackSnippet.php:112
#: snippets/EditTrackSnippet.php:95
@@ -2275,7 +2275,7 @@
msgstr "Scheid meerdere patienten met een comma (,)"
#: classes/Gems/Default/RespondentPlanAction.php:67
-#: classes/Gems/Default/SurveyAction.php:171
+#: classes/Gems/Default/SurveyAction.php:173
#: classes/Gems/Default/TrackAction.php:297
#: snippets/DeleteInSourceTrackSnippet.php:132
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:174
@@ -2620,8 +2620,8 @@
#: classes/Gems/Default/SurveyAction.php:79
#, php-format
-msgid "Overview of %s survey for respondent %s"
-msgstr "Overzicht van vragenlijst %s voor patiënt %s "
+msgid "Overview of %s survey for respondent %s: %s"
+msgstr "Overzicht van vragenlijst %s voor patiënt %s: %s"
#: classes/Gems/Default/SurveyAction.php:82
msgid "This survey has not been assigned to this respondent."
@@ -2629,10 +2629,10 @@
#: classes/Gems/Default/SurveyAction.php:144
#, php-format
-msgid "Assignments of this survey to %s"
-msgstr "Toewijzingen van deze vragenlijst aan %s"
+msgid "Assignments of this survey to %s: %s"
+msgstr "Toewijzingen van deze vragenlijst aan %s: %s"
-#: classes/Gems/Default/SurveyAction.php:165
+#: classes/Gems/Default/SurveyAction.php:167
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:173
#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:144
#: snippets/EditSingleSurveyTokenSnippet.php:133
@@ -2640,10 +2640,10 @@
msgid "Show surveys"
msgstr "Toon vragenlijsten"
-#: classes/Gems/Default/SurveyAction.php:212
-#: snippets/RespondentDetailsWithAssignmentsSnippet.php:77
-msgid "Assigned surveys"
-msgstr "Toegewezen vragenlijsten"
+#: classes/Gems/Default/SurveyAction.php:214
+#, php-format
+msgid "Surveys assigned to %s: %s"
+msgstr "Vragenlijsten in traject %s: %s"
#: classes/Gems/Default/SurveyMaintenanceAction.php:123
msgid "If empty, survey will never show up!"
@@ -2927,7 +2927,7 @@
#: classes/Gems/Default/TokenPlanAction.php:471
#: classes/Gems/Snippets/TokenModelSnippetAbstract.php:59
#: classes/Gems/Snippets/TokenPlanTableSnippet.php:122
-#: snippets/BrowseSingleSurveyTokenSnippet.php:147
+#: snippets/BrowseSingleSurveyTokenSnippet.php:144
#: snippets/TrackTokenOverviewSnippet.php:98
msgid "+"
msgstr "+"
@@ -2953,8 +2953,8 @@
#: classes/Gems/Default/TrackAction.php:172
#: snippets/ShowTrackUsageSnippet.php:114
#, php-format
-msgid "Assignments of this track to %s"
-msgstr "Toewijzingen van dit traject aan %s"
+msgid "Assignments of this track to %s: %s"
+msgstr "Toewijzingen van dit traject aan %s: %s"
#: classes/Gems/Default/TrackAction.php:269
#: classes/Gems/Default/TrackAction.php:282
@@ -3006,50 +3006,50 @@
msgstr "Verwijder traject"
#: classes/Gems/Default/TrackAction.php:461
-#: snippets/RespondentDetailsWithAssignmentsSnippet.php:86
-msgid "Assigned tracks"
-msgstr "Toegewezen trajecten"
+#, php-format
+msgid "Tracks assigned to %s: %s"
+msgstr "Geen traject toegewezen aan patiënt nr: %s: %s"
-#: classes/Gems/Default/TrackAction.php:486
+#: classes/Gems/Default/TrackAction.php:489
#, php-format
-msgid "%s track for respondent nr %s"
-msgstr "%s traject voor patiënt nr %s "
+msgid "%s track for respondent nr %s: %s"
+msgstr "%s traject voor patiënt nr %s: %s "
-#: classes/Gems/Default/TrackAction.php:543
+#: classes/Gems/Default/TrackAction.php:549
#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:184
#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:234
msgid "Add track"
msgstr "Voeg traject toe"
-#: classes/Gems/Default/TrackAction.php:544
+#: classes/Gems/Default/TrackAction.php:550
msgid "This respondent does not yet have an active track. Add one here."
msgstr "Patiënt heeft geen actief traject. Voeg er één toe."
-#: classes/Gems/Default/TrackActionAbstract.php:106
+#: classes/Gems/Default/TrackActionAbstract.php:119
msgid "No tracks found"
msgstr "Geen trajecten gevonden"
-#: classes/Gems/Default/TrackActionAbstract.php:126
+#: classes/Gems/Default/TrackActionAbstract.php:139
msgid "Available tracks"
msgstr "Beschikbare trajecten"
-#: classes/Gems/Default/TrackActionAbstract.php:167
+#: classes/Gems/Default/TrackActionAbstract.php:180
#, php-format
msgid "Token answers: %s"
msgstr "Kenmerk antwoorden: %s"
-#: classes/Gems/Default/TrackActionAbstract.php:193
+#: classes/Gems/Default/TrackActionAbstract.php:206
#, php-format
-msgid "Adding the %s track to respondent %s"
-msgstr "Traject %s toewijzen aan patiënt %s."
+msgid "Adding the %s track to respondent %s: %s"
+msgstr "Traject %s toewijzen aan patiënt %s: %s"
-#: classes/Gems/Default/TrackActionAbstract.php:205
+#: classes/Gems/Default/TrackActionAbstract.php:221
#: classes/Gems/Export/RespondentExport.php:226
#: classes/Gems/Tracker/Snippets/ShowTrackUsageAbstract.php:148
msgid "Enter the particulars concerning the assignment to this respondent."
msgstr "Beschrijf de redenen om dit aan deze patiënt toe te wijzen."
-#: classes/Gems/Default/TrackActionAbstract.php:206
+#: classes/Gems/Default/TrackActionAbstract.php:222
#: classes/Gems/Export/RespondentExport.php:227
#: classes/Gems/Tracker/Model/StandardTokenModel.php:207
#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:151
@@ -3058,19 +3058,19 @@
msgid "Assigned by"
msgstr "Toewijzer"
-#: classes/Gems/Default/TrackActionAbstract.php:207
+#: classes/Gems/Default/TrackActionAbstract.php:223
#: classes/Gems/Export/RespondentExport.php:228
#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:152
#: classes/Gems/Tracker/Snippets/ShowTrackUsageAbstract.php:150
msgid "Start"
msgstr "Aanvang"
-#: classes/Gems/Default/TrackActionAbstract.php:211
+#: classes/Gems/Default/TrackActionAbstract.php:227
#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:156
msgid "Ending on"
msgstr "Afgelopen op"
-#: classes/Gems/Default/TrackActionAbstract.php:215
+#: classes/Gems/Default/TrackActionAbstract.php:231
#: classes/Gems/Export/RespondentExport.php:232
#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:161
#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:278
@@ -3078,23 +3078,23 @@
msgid "Comment"
msgstr "Opmerkingen"
-#: classes/Gems/Default/TrackActionAbstract.php:302
+#: classes/Gems/Default/TrackActionAbstract.php:318
#, php-format
msgid "Email %s %s"
msgstr "Email %s %s"
-#: classes/Gems/Default/TrackActionAbstract.php:308
+#: classes/Gems/Default/TrackActionAbstract.php:324
#, php-format
msgid "%s %s not found."
msgstr "%s %s niet gevonden."
-#: classes/Gems/Default/TrackActionAbstract.php:485
+#: classes/Gems/Default/TrackActionAbstract.php:534
#, php-format
-msgid "Overview of %s track for respondent %s"
-msgstr "Overzicht van het %s traject voor patiënt %s "
+msgid "Overview of %s track for respondent %s: %s"
+msgstr "Overzicht van het %s traject voor patiënt %s : %s"
-#: classes/Gems/Default/TrackActionAbstract.php:489
-#: snippets/BrowseSingleSurveyTokenSnippet.php:98
+#: classes/Gems/Default/TrackActionAbstract.php:538
+#: snippets/BrowseSingleSurveyTokenSnippet.php:104
msgid "This track is currently not assigned to this respondent."
msgstr "Dit traject is nog niet aan deze patiënt toegewezen."
@@ -4091,7 +4091,7 @@
msgstr "Antwoordtijd (in sec.)"
#: classes/Gems/Tracker/Model/StandardTokenModel.php:202
-#: snippets/BrowseSingleSurveyTokenSnippet.php:141
+#: snippets/BrowseSingleSurveyTokenSnippet.php:138
#: snippets/RespondentTokenSnippet.php:135
#: snippets/TrackTokenOverviewSnippet.php:115
msgid "Score"
@@ -5014,6 +5014,14 @@
msgid "Address"
msgstr "Adres"
+#: snippets/RespondentDetailsWithAssignmentsSnippet.php:77
+msgid "Assigned surveys"
+msgstr "Toegewezen vragenlijsten"
+
+#: snippets/RespondentDetailsWithAssignmentsSnippet.php:86
+msgid "Assigned tracks"
+msgstr "Toegewezen trajecten"
+
#: snippets/RespondentDetailsWithAssignmentsSnippet.php:110
msgid "No surveys"
msgstr "Geen vragenlijsten"
@@ -5053,8 +5061,8 @@
#: snippets/ShowTrackUsageSnippet.php:112
#, php-format
-msgid "Other assignments of this track to %s"
-msgstr "Overige toewijzingen van dit traject aan %s"
+msgid "Other assignments of this track to %s: %s"
+msgstr "Overige toewijzingen van dit traject aan %s: %s"
#: snippets/SurveyQuestionsSnippet.php:129
msgid "Answer options"
@@ -5672,9 +5680,6 @@
#~ msgid "In progress"
#~ msgstr "Invoer begonnen"
-#~ msgid "No tracks assigned to respondent nr: %s"
-#~ msgstr "Geen traject toegewezen aan patiënt nr: %s ."
-
#~ msgid "Hand dom."
#~ msgstr "Hand dom."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-10-11 16:07:23
|
Revision: 980
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=980&view=rev
Author: matijsdejong
Date: 2012-10-11 16:07:14 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
Fix for Pulse bug #560: project level validators are loaded again
Fix for Pulse bug #550: Show respondent name in track overview screen (and on many other places)
Modified Paths:
--------------
trunk/library/classes/Gems/Default/SurveyAction.php
trunk/library/classes/Gems/Default/TrackAction.php
trunk/library/classes/Gems/Default/TrackActionAbstract.php
trunk/library/classes/Gems/Form.php
trunk/library/classes/Gems/Tracker/RespondentTrack.php
trunk/library/classes/Gems/Tracker/Snippets/ShowTrackUsageAbstract.php
trunk/library/snippets/BrowseSingleSurveyTokenSnippet.php
trunk/library/snippets/ShowTrackUsageSnippet.php
Modified: trunk/library/classes/Gems/Default/SurveyAction.php
===================================================================
--- trunk/library/classes/Gems/Default/SurveyAction.php 2012-10-11 14:17:37 UTC (rev 979)
+++ trunk/library/classes/Gems/Default/SurveyAction.php 2012-10-11 16:07:14 UTC (rev 980)
@@ -75,8 +75,8 @@
case 'No tracks found':
return $this->translate->_('No surveys found', $locale);
- case 'Overview of %s track for respondent %s':
- return $this->translate->_('Overview of %s survey for respondent %s', $locale);
+ case 'Overview of %s track for respondent %s: %s':
+ return $this->translate->_('Overview of %s survey for respondent %s: %s', $locale);
case 'This track is currently not assigned to this respondent.':
return $this->translate->_('This survey has not been assigned to this respondent.', $locale);
@@ -141,11 +141,13 @@
$result = $this->db->fetchOne('SELECT gto_id_token FROM gems__tokens WHERE gto_id_respondent = ? AND gto_id_survey = ?', $data);
if ($result) {
- $this->html->h3(sprintf($this->_('Assignments of this survey to %s'), $respId));
+ $this->html->h3(sprintf($this->_('Assignments of this survey to %s: %s'), $respId, $this->getRespondentName()));
+ MUtil_Echo::track($result);
+
// Make sure request cache object is loaded.
$this->getCachedRequestData();
- $this->addSnippet('BrowseSingleSurveyTokenSnippet', 'baseUrl', $baseUrl);
+ $this->addSnippet('BrowseSingleSurveyTokenSnippet', 'baseUrl', $baseUrl, 'filter', $data);
}
return (boolean) $result;
@@ -209,6 +211,9 @@
public function getTopicTitle()
{
- return $this->_('Assigned surveys');
+ return sprintf($this->_('Surveys assigned to %s: %s'),
+ $this->_getParam(MUtil_Model::REQUEST_ID1),
+ $this->getRespondentName()
+ );
}
}
Modified: trunk/library/classes/Gems/Default/TrackAction.php
===================================================================
--- trunk/library/classes/Gems/Default/TrackAction.php 2012-10-11 14:17:37 UTC (rev 979)
+++ trunk/library/classes/Gems/Default/TrackAction.php 2012-10-11 16:07:14 UTC (rev 980)
@@ -169,7 +169,7 @@
$bridge->addItemLink($menuItem->toActionLinkLower($this->getRequest(), $bridge));
}
- $this->html->h3(sprintf($this->_('Assignments of this track to %s'), $respId));
+ $this->html->h3(sprintf($this->_('Assignments of this track to %s: %s'), $respId, $this->getRespondentName()));
$this->html[] = $bridge->getTable();
return true;
@@ -458,7 +458,10 @@
if ($this->getModel() instanceof Gems_Tracker_Model_StandardTokenModel) {
return $this->_('Token');
} else {
- return $this->_('Assigned tracks');
+ return sprintf($this->_('Tracks assigned to %s: %s'),
+ $this->_getParam(MUtil_Model::REQUEST_ID1),
+ $this->getRespondentName()
+ );
}
}
@@ -474,7 +477,7 @@
if ($data = $model->applyRequest($request)->loadFirst()) {
$this->setMenuParameters($data);
-
+ MUtil_Echo::track($data);
if ($data['grc_description']) {
$model->set('grc_description', 'label', $this->_('Rejection code'), 'formatFunction', array($this->translate, '_'));
}
@@ -483,7 +486,10 @@
$this->_setParam(Gems_Model::RESPONDENT_TRACK, $data['gr2t_id_respondent_track']);
- $this->html->h2(sprintf($this->_('%s track for respondent nr %s'), $data['gtr_track_name'], $this->_getParam(MUtil_Model::REQUEST_ID1)));
+ $this->html->h2(sprintf($this->_('%s track for respondent nr %s: %s'),
+ $data['gtr_track_name'],
+ $this->_getParam(MUtil_Model::REQUEST_ID1),
+ $this->getRespondentName($data)));
if (! $this->escort instanceof Gems_Project_Tracks_SingleTrackInterface) {
$table = parent::getShowTable();
Modified: trunk/library/classes/Gems/Default/TrackActionAbstract.php
===================================================================
--- trunk/library/classes/Gems/Default/TrackActionAbstract.php 2012-10-11 14:17:37 UTC (rev 979)
+++ trunk/library/classes/Gems/Default/TrackActionAbstract.php 2012-10-11 16:07:14 UTC (rev 980)
@@ -56,15 +56,28 @@
/**
*
+ * @var Zend_Db_Adaptor_Abstract
+ */
+ public $db;
+
+ /**
+ *
* @var Gems_Menu
*/
public $menu;
+ /**
+ * Storage for respondents name
+ *
+ * @var string
+ */
+ protected $respondentName;
+
+ public $summarizedActions = array('index', 'autofilter', 'create');
+
// Set when this controller should only showe results from a single tracktype.
public $trackType = null;
- public $summarizedActions = array('index', 'autofilter', 'create');
-
protected function _createTable()
{
$result[] = parent::_createTable();
@@ -190,7 +203,10 @@
$source->setPatient($patientId, $orgId);
$engine->applyToMenuSource($source);
- $this->html->h2(sprintf($this->_('Adding the %s track to respondent %s'), $engine->getTrackName(), $patientId));
+ $this->html->h2(sprintf($this->_('Adding the %s track to respondent %s: %s'),
+ $engine->getTrackName(),
+ $patientId,
+ $this->getRespondentName()));
$this->addSnippets($engine->getTrackCreateSnippetNames(),
'trackEngine', $engine, 'patientId', $patientId, 'organizationId', $orgId);
}
@@ -345,6 +361,39 @@
return $elements;
}
+ /**
+ * Get a display version of the patient name
+ *
+ * @param array $data Already loaded data. If the correct data is not supplied, then the function will retrieve it
+ * @return string
+ */
+ protected function getRespondentName(array $data = array())
+ {
+ if ($this->respondentName) {
+ return $this->respondentName;
+ }
+
+ if (! ($data && isset($data['grs_first_name'], $data['grs_surname_prefix'], $data['grs_last_name']))) {
+ list($patientId, $orgId) = $this->_getPatientAndOrganisationParam();
+
+ $select = $this->db->select();
+ $select->from('gems__respondents')
+ ->joinInner('gems__respondent2org', 'grs_id_user = gr2o_id_user', array())
+ ->where('gr2o_patient_nr = ?', $patientId)
+ ->where('gr2o_id_organization = ?', $orgId);
+
+ $data = $this->db->fetchRow($select);
+
+ if (! $data) {
+ return '';
+ }
+ }
+
+ $this->respondentName = trim($data['grs_first_name'] . ' ' . $data['grs_surname_prefix']) . ' ' . $data['grs_last_name'];
+
+ return $this->respondentName;
+ }
+
public function indexAction()
{
$this->initFilter();
@@ -482,7 +531,7 @@
$engine->applyToMenuSource($source);
if ($trackData = $this->db->fetchRow('SELECT * FROM gems__tracks WHERE gtr_id_track = ? ', $trackId)) {
- $this->html->h2(sprintf($this->_('Overview of %s track for respondent %s'), $trackData['gtr_track_name'], $patientId));
+ $this->html->h2(sprintf($this->_('Overview of %s track for respondent %s: %s'), $trackData['gtr_track_name'], $patientId, $this->getRespondentName($trackData)));
$this->addSnippet('TrackUsageTextDetailsSnippet', 'trackData', $trackData);
if (! $this->addTrackUsage($patientId, $orgId, $trackId, array())) {
Modified: trunk/library/classes/Gems/Form.php
===================================================================
--- trunk/library/classes/Gems/Form.php 2012-10-11 14:17:37 UTC (rev 979)
+++ trunk/library/classes/Gems/Form.php 2012-10-11 16:07:14 UTC (rev 980)
@@ -75,12 +75,14 @@
*/
public function __construct($options = null)
{
+ parent::__construct($options);
+
// $this->addPrefixPath(GEMS_PROJECT_NAME_UC . '_Form_Decorator', GEMS_PROJECT_NAME_UC . '/Form/Decorator/', Zend_Form::DECORATOR);
// $this->addPrefixPath(GEMS_PROJECT_NAME_UC . '_Form_Element', GEMS_PROJECT_NAME_UC . '/Form/Element/', Zend_Form::ELEMENT);
- parent::__construct($options);
+ $this->addPrefixPath('Gems_Form_Decorator', 'Gems/Form/Decorator/', Zend_Form::DECORATOR);
+ $this->addPrefixPath('Gems_Form_Element', 'Gems/Form/Element/', Zend_Form::ELEMENT);
- $this->addPrefixPath('Gems_Form_Decorator', 'Gems/Form/Decorator', Zend_Form::DECORATOR);
-
+ $this->addElementPrefixPath(GEMS_PROJECT_NAME_UC . '_Validate', GEMS_PROJECT_NAME_UC . '/Validate/', Zend_Form_Element::VALIDATE);
$this->addElementPrefixPath('Gems_Form_Decorator', 'Gems/Form/Decorator/', Zend_Form_Element::DECORATOR);
$this->addElementPrefixPath('Gems_Filter', 'Gems/Filter/', Zend_Form_Element::FILTER);
$this->addElementPrefixPath('Gems_Validate', 'Gems/Validate/', Zend_Form_Element::VALIDATE);
@@ -142,7 +144,7 @@
*/
public function afterRegistry()
{ }
-
+
public function getScripts() {
return $this->_scripts;
}
Modified: trunk/library/classes/Gems/Tracker/RespondentTrack.php
===================================================================
--- trunk/library/classes/Gems/Tracker/RespondentTrack.php 2012-10-11 14:17:37 UTC (rev 979)
+++ trunk/library/classes/Gems/Tracker/RespondentTrack.php 2012-10-11 16:07:14 UTC (rev 980)
@@ -511,7 +511,21 @@
}
/**
+ * Return the name of the respondent
*
+ * @return string The respondents name
+ */
+ public function getRespondentName()
+ {
+ if (! isset($this->_respTrackData['grs_first_name'], $this->_respTrackData['grs_surname_prefix'], $this->_respTrackData['grs_last_name'])) {
+ $this->_ensureRespondentData();
+ }
+
+ return trim($this->_respTrackData['grs_first_name'] . ' ' . $this->_respTrackData['grs_surname_prefix']) . ' ' . $this->_respTrackData['grs_last_name'];
+ }
+
+ /**
+ *
* @return int The respondent2track id
*/
public function getRespondentTrackId()
Modified: trunk/library/classes/Gems/Tracker/Snippets/ShowTrackUsageAbstract.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Snippets/ShowTrackUsageAbstract.php 2012-10-11 14:17:37 UTC (rev 979)
+++ trunk/library/classes/Gems/Tracker/Snippets/ShowTrackUsageAbstract.php 2012-10-11 16:07:14 UTC (rev 980)
@@ -178,6 +178,32 @@
return $seq;
}
+ /**
+ * Get a display version of the patient name
+ *
+ * @return string
+ */
+ protected function getRespondentName()
+ {
+ if ($this->respondentTrack instanceof Gems_Tracker_RespondentTrack) {
+ return $this->respondentTrack->getRespondentName();
+ } else {
+ $select = $this->db->select();
+ $select->from('gems__respondents')
+ ->joinInner('gems__respondent2org', 'grs_id_user = gr2o_id_user', array())
+ ->where('gr2o_patient_nr = ?', $this->patientId)
+ ->where('gr2o_id_organization = ?', $this->organizationId);
+
+ $data = $this->db->fetchRow($select);
+
+ if ($data) {
+ return trim($data['grs_first_name'] . ' ' . $data['grs_surname_prefix']) . ' ' . $data['grs_last_name'];
+ }
+ }
+
+ return '';
+ }
+
abstract protected function getTitle();
/**
Modified: trunk/library/snippets/BrowseSingleSurveyTokenSnippet.php
===================================================================
--- trunk/library/snippets/BrowseSingleSurveyTokenSnippet.php 2012-10-11 14:17:37 UTC (rev 979)
+++ trunk/library/snippets/BrowseSingleSurveyTokenSnippet.php 2012-10-11 16:07:14 UTC (rev 980)
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- *
+ *
* @package Gems
* @subpackage Snippets
* @author Matijs de Jong <mj...@ma...>
@@ -65,6 +65,12 @@
/**
*
+ * @var array Token filter
+ */
+ protected $filter = array();
+
+ /**
+ *
* @var array
*/
public $_fixedSort = array(
@@ -122,16 +128,7 @@
$bridge->addSortable('calc_used_date', null, $HTML->if($bridge->is_completed, 'disabled date', 'enabled date'));
// */
- if ($menuItem = $this->findMenuItem('track', 'show-track')) {
- $href = $menuItem->toHRefAttribute($this->request, $bridge);
- $track1 = $HTML->if($bridge->calc_track_name, $HTML->a($href, $bridge->calc_track_name));
- } else {
- $track1 = $bridge->calc_track_name;
- }
- $track[] = array($track1, $HTML->if($bridge->calc_track_info, $HTML->small(' [', $bridge->calc_track_info, ']')));
- $track[] = array($bridge->createSortLink('calc_track_name'), $HTML->small(' [', $bridge->createSortLink('calc_track_info'), ']'));
-
- $bridge->addMultiSort($track);
+ $bridge->addMultiSort('gtr_track_name');
$bridge->addMultiSort('calc_round_description');
$bridge->addSortable('ggp_name');
$bridge->addSortable('calc_used_date', null, $HTML->if($bridge->is_completed, 'disabled date', 'enabled date'));
@@ -179,16 +176,19 @@
*/
protected function processFilterAndSort(MUtil_Model_ModelAbstract $model)
{
- $respId = $this->request->getParam(MUtil_Model::REQUEST_ID);
- $orgId = $model->getCurrentOrganization();
- $trackId = $this->request->getParam(Gems_Model::TRACK_ID);
+ if (true || ! $this->filter) {
+ $patientId = $this->request->getParam(MUtil_Model::REQUEST_ID1);
+ $orgId = $this->request->getParam(MUtil_Model::REQUEST_ID2);
+ $trackId = $this->request->getParam(Gems_Model::TRACK_ID);
- $data['grs_id_user'] = $this->db->fetchOne('SELECT gr2o_id_user FROM gems__respondent2org WHERE gr2o_patient_nr = ? AND gr2o_id_organization = ?', array($respId, $orgId));
- $data['gsu_id_survey'] = $this->db->fetchOne('SELECT gro_id_survey FROM gems__rounds WHERE gro_id_track = ?', $trackId);
- // $data['gr2o_patient_nr'] = $this->request->getParam(MUtil_Model::REQUEST_ID);
- // $data['gro_id_track'] = $this->request->getParam(Gems_Model::TRACK_ID);
- $model->addFilter($data);
+ $this->filter['gr2o_patient_nr'] = $patientId;
+ $this->filter['gr2o_id_organization'] = $orgId;
+ $this->filter['gro_id_track'] = $trackId;
+ // MUtil_Echo::track($this->filter);
+ }
+ $model->addFilter($this->filter);
+
$this->processSortOnly($model);
}
}
Modified: trunk/library/snippets/ShowTrackUsageSnippet.php
===================================================================
--- trunk/library/snippets/ShowTrackUsageSnippet.php 2012-10-11 14:17:37 UTC (rev 979)
+++ trunk/library/snippets/ShowTrackUsageSnippet.php 2012-10-11 16:07:14 UTC (rev 980)
@@ -4,7 +4,7 @@
/**
* Copyright (c) 2011, Erasmus MC
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
@@ -15,7 +15,7 @@
* * Neither the name of Erasmus MC nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -65,23 +65,23 @@
$bridge->gr2t_id_respondent_track;
$bridge->gr2o_patient_nr;
$bridge->can_edit;
-
+
$controller = $this->request->getControllerName();
-
+
$menuList = $this->menu->getMenuList();
-
+
$menuList->addByController($controller, 'show-track')
->addByController($controller, 'edit-track')
->addParameterSources($bridge)
->setLowerCase()->showDisabled();
-
+
$bridge->setOnEmpty($this->_('No other assignments of this track.'));
-
+
// If we have a track Id and is not excluded: mark it!
if ($this->respondentTrackId && (! $this->excludeCurrent)) {
$bridge->tr()->appendAttrib('class', MUtil_Lazy::iff(MUtil_Lazy::comp($bridge->gr2t_id_respondent_track, '==', $this->respondentTrackId), 'currentRow', null));
}
-
+
// Add show-track button if allowed, otherwise show, again if allowed
$bridge->addItemLink($menuList->getActionLink($controller, 'show-track'));
@@ -90,7 +90,7 @@
// Add edit-track button if allowed (and not current
$bridge->addItemLink($menuList->getActionLink($controller, 'edit-track'));
}
-
+
/**
* Creates the model
*
@@ -99,19 +99,19 @@
protected function createModel()
{
$model = parent::createModel();
-
+
$model->addColumn('CONCAT(gr2t_completed, \'' . $this->_(' of ') . '\', gr2t_count)', 'progress');
$model->set('progress', 'label', $this->_('Progress'), 'tdClass', 'rightAlign', 'thClass', 'rightAlign');
-
+
return $model;
- }
-
+ }
+
protected function getTitle()
{
if ($this->excludeCurrent) {
- return sprintf($this->_('Other assignments of this track to %s'), $this->patientId);
+ return sprintf($this->_('Other assignments of this track to %s: %s'), $this->patientId, $this->getRespondentName());
} else {
- return sprintf($this->_('Assignments of this track to %s'), $this->patientId);
+ return sprintf($this->_('Assignments of this track to %s: %s'), $this->patientId, $this->getRespondentName());
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-10-11 14:17:51
|
Revision: 979
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=979&view=rev
Author: matijsdejong
Date: 2012-10-11 14:17:37 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
Fix for staff menu display. Return type of function had changed
Modified Paths:
--------------
trunk/library/classes/Gems/Menu/MenuAbstract.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/Menu/MenuAbstract.php
===================================================================
--- trunk/library/classes/Gems/Menu/MenuAbstract.php 2012-10-11 12:14:57 UTC (rev 978)
+++ trunk/library/classes/Gems/Menu/MenuAbstract.php 2012-10-11 14:17:37 UTC (rev 979)
@@ -413,7 +413,7 @@
if (! $this->escort->hasPrivilege('pr.staff.edit.all')) {
$filter = array_keys($this->escort->loader->getCurrentUser()->getAllowedOrganizations());
foreach ($pages as $sub_page) {
- $sub_page->setParameterFilter('gsf_id_organization', $filter, 'accessible_role', 1);
+ $sub_page->setParameterFilter('gsf_id_organization', $filter, 'accessible_role', true);
}
}
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2012-10-11 12:14:57 UTC (rev 978)
+++ trunk/library/languages/default-en.po 2012-10-11 14:17:37 UTC (rev 979)
@@ -2,18 +2,19 @@
msgstr ""
"Project-Id-Version: GemsTracker EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-10 17:58+0100\n"
+"POT-Creation-Date: 2012-10-11 14:52+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
+"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Poedit-SourceCharset: iso-8859-1\n"
"X-Poedit-Basepath: ../\n"
"X-Poedit-KeywordsList: plural:1,2\n"
+"X-Generator: Poedit 1.5.4\n"
"X-Poedit-SearchPath-0: .\n"
#: classes/GemsEscort.php:219
@@ -30,8 +31,7 @@
msgid "You are logged in as %s"
msgstr "You are logged in as %s"
-#: classes/GemsEscort.php:803
-#: classes/Gems/Menu.php:263
+#: classes/GemsEscort.php:803 classes/Gems/Menu.php:263
msgid "Logoff"
msgstr "Logoff"
@@ -49,15 +49,18 @@
msgstr "version"
#: classes/GemsEscort.php:1465
-msgid "Take note: your session has expired, your inputs were not saved. Please check the input data and try again"
-msgstr "Take note: your session has expired, your inputs were not saved. Please check the input data and try again"
+msgid ""
+"Take note: your session has expired, your inputs were not saved. Please "
+"check the input data and try again"
+msgstr ""
+"Take note: your session has expired, your inputs were not saved. Please "
+"check the input data and try again"
#: classes/GemsEscort.php:1594
msgid "Please check back later."
msgstr "Please check back later."
-#: classes/GemsEscort.php:1596
-#: classes/GemsEscort.php:1600
+#: classes/GemsEscort.php:1596 classes/GemsEscort.php:1600
#: classes/GemsEscort.php:1601
msgid "System is in maintenance mode"
msgstr "System is in maintenance mode"
@@ -66,22 +69,22 @@
msgid "No access to site."
msgstr "No access to site."
-#: classes/GemsEscort.php:1613
-#: classes/GemsEscort.php:1656
+#: classes/GemsEscort.php:1613 classes/GemsEscort.php:1656
msgid "You have no access to this site."
msgstr "You have no access to this site."
-#: classes/GemsEscort.php:1629
+#: classes/GemsEscort.php:1629 classes/Gems/Default/StaffAction.php:317
msgid "No access to page"
msgstr "No access to page"
-#: classes/GemsEscort.php:1631
+#: classes/GemsEscort.php:1631 classes/Gems/Default/OrganizationAction.php:102
+#: classes/Gems/Default/StaffAction.php:318
+#: classes/Gems/Model/HiddenOrganizationModel.php:115
#, php-format
msgid "Access to this page is not allowed for current role: %s."
msgstr "Access to this page is not allowed for current role: %s."
-#: classes/GemsEscort.php:1641
-#: classes/GemsEscort.php:1654
+#: classes/GemsEscort.php:1641 classes/GemsEscort.php:1654
msgid "You are no longer logged in."
msgstr "You are no longer logged in."
@@ -89,8 +92,7 @@
msgid "You must login to access this page."
msgstr "You must login to access this page."
-#: classes/GemsEscort.php:1783
-#: classes/GemsEscort.php:1785
+#: classes/GemsEscort.php:1783 classes/GemsEscort.php:1785
#, php-format
msgid "%d survey"
msgid_plural "%d surveys"
@@ -146,7 +148,7 @@
msgid "Project setup"
msgstr "Project setup"
-#: classes/Gems/Menu.php:170
+#: classes/Gems/Menu.php:170 classes/Gems/Default/SourceAction.php:203
msgid "Database"
msgstr "Database"
@@ -154,11 +156,11 @@
msgid "Content"
msgstr "Content"
-#: classes/Gems/Menu.php:177
+#: classes/Gems/Menu.php:177 classes/Gems/Default/DatabaseAction.php:313
msgid "Execute"
msgstr "Execute"
-#: classes/Gems/Menu.php:182
+#: classes/Gems/Menu.php:182 classes/Gems/Default/DatabaseAction.php:289
msgid "Patches"
msgstr "Patches"
@@ -174,7 +176,7 @@
msgid "Run SQL"
msgstr "Run SQL"
-#: classes/Gems/Menu.php:190
+#: classes/Gems/Menu.php:190 classes/Gems/Default/ReceptionAction.php:131
msgid "Reception codes"
msgstr "Reception codes"
@@ -182,16 +184,16 @@
msgid "Consents"
msgstr "Consents"
-#: classes/Gems/Menu.php:196
+#: classes/Gems/Menu.php:196 classes/Gems/Default/RoleAction.php:309
msgid "Roles"
msgstr "Roles"
-#: classes/Gems/Menu.php:197
-#: classes/Gems/Menu.php:391
+#: classes/Gems/Menu.php:197 classes/Gems/Menu.php:391
msgid "Assigned"
msgstr "Assigned"
-#: classes/Gems/Menu.php:198
+#: classes/Gems/Menu.php:198 classes/Gems/Default/RoleAction.php:238
+#: classes/Gems/Default/RoleAction.php:324
msgid "Privileges"
msgstr "Privileges"
@@ -200,14 +202,20 @@
msgstr "Groups"
#: classes/Gems/Menu.php:204
+#: classes/Gems/Default/SurveyMaintenanceAction.php:204
+#: classes/Gems/Default/TrackMaintenanceAction.php:131
+#: classes/Gems/Email/MailTemplateForm.php:101
+#: classes/Gems/Tracker/Snippets/EditTrackEngineSnippetGeneric.php:140
msgid "Organizations"
msgstr "Organizations"
-#: classes/Gems/Menu.php:207
+#: classes/Gems/Menu.php:207 classes/Gems/Default/GroupAction.php:121
+#: classes/Gems/Default/LogAction.php:193
+#: classes/Gems/Default/StaffAction.php:470
msgid "Staff"
msgstr "Staff"
-#: classes/Gems/Menu.php:210
+#: classes/Gems/Menu.php:210 classes/Gems/Default/LogAction.php:213
msgid "Logging"
msgstr "Logging"
@@ -219,14 +227,15 @@
msgid "Upgrade"
msgstr "Upgrade"
-#: classes/Gems/Menu.php:220
-#: classes/Gems/Menu.php:221
+#: classes/Gems/Menu.php:220 classes/Gems/Menu.php:221
+#: classes/Gems/Default/ProjectInformationAction.php:113
+#: classes/Gems/Default/ProjectInformationAction.php:118
#, php-format
msgid "Changelog %s"
msgstr "Changelog %s"
-#: classes/Gems/Menu.php:222
-#: classes/Gems/Menu.php:355
+#: classes/Gems/Menu.php:222 classes/Gems/Menu.php:355
+#: classes/Gems/Menu/SubMenuItem.php:551
msgid "Show"
msgstr "Show"
@@ -255,7 +264,7 @@
msgid "Logon"
msgstr "Logon"
-#: classes/Gems/Menu.php:258
+#: classes/Gems/Menu.php:258 classes/Gems/User/Form/LoginForm.php:112
msgid "Lost password"
msgstr "Lost password"
@@ -263,40 +272,72 @@
msgid "Your account"
msgstr "Your account"
-#: classes/Gems/Menu.php:260
+#: classes/Gems/Menu.php:260 classes/Gems/Default/OptionAction.php:153
msgid "Activity overview"
msgstr "Activity overview"
-#: classes/Gems/Menu.php:261
+#: classes/Gems/Menu.php:261 classes/Gems/Default/OptionAction.php:78
msgid "Change password"
msgstr "Change password"
-#: classes/Gems/Menu.php:262
-#: classes/Gems/Menu.php:315
-#: classes/Gems/Menu.php:361
+#: classes/Gems/Menu.php:262 classes/Gems/Menu.php:315
+#: classes/Gems/Menu.php:361 classes/Gems/Default/MailLogAction.php:114
+#: classes/Gems/Default/TrackAction.php:459
+#: classes/Gems/Export/RespondentExport.php:147
+#: classes/Gems/Snippets/TokenModelSnippetAbstract.php:70
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:482
+#: classes/Gems/Tracker/Form/AskTokenForm.php:77
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:195
+#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:188
+#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:197
+#: snippets/BrowseSingleSurveyTokenSnippet.php:167
+#: snippets/TrackTokenOverviewSnippet.php:132
+#: snippets/Organization/OrganizationEditSnippet.php:89
+#: snippets/Track/Token/ShowAllOpenSnippet.php:88
+#: snippets/Track/Token/ShowFirstOpenSnippet.php:110
msgid "Token"
msgstr "Token"
-#: classes/Gems/Menu.php:303
+#: classes/Gems/Menu.php:303 classes/Gems/Export/RespondentExport.php:318
msgid "Export"
msgstr "Export"
-#: classes/Gems/Menu.php:310
+#: classes/Gems/Menu.php:310 classes/Gems/Default/MailJobAction.php:99
+#: classes/Gems/Default/ProjectTracksAction.php:64
+#: classes/Gems/Default/TrackAction.php:328
+#: classes/Gems/Default/TrackActionAbstract.php:203
+#: classes/Gems/Default/TrackFieldsAction.php:96
+#: classes/Gems/Email/OneMailForm.php:54
+#: classes/Gems/Export/RespondentExport.php:224
+#: classes/Gems/Export/RespondentExport.php:236
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:484
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:752
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:216
+#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:149
+#: classes/Gems/Tracker/Snippets/ShowTrackUsageAbstract.php:146
+#: snippets/Track/Token/ShowAllOpenSnippet.php:148
msgid "Track"
msgstr "Track"
-#: classes/Gems/Menu.php:318
-#: classes/Gems/Menu.php:343
+#: classes/Gems/Menu.php:318 classes/Gems/Menu.php:343
#: classes/Gems/Menu.php:385
+#: classes/Gems/Default/TrackMaintenanceAction.php:367
+#: snippets/AddTracksSnippet.php:242
msgid "Add"
msgstr "Add"
-#: classes/Gems/Menu.php:324
-#: classes/Gems/Menu.php:424
+#: classes/Gems/Menu.php:324 classes/Gems/Menu.php:424
+#: classes/Gems/Email/EmailFormAbstract.php:280
+#: classes/Gems/Email/EmailFormAbstract.php:291
+#: classes/Gems/Menu/MenuAbstract.php:367
+#: classes/Gems/Menu/MenuAbstract.php:380
msgid "Preview"
msgstr "Preview"
-#: classes/Gems/Menu.php:333
+#: classes/Gems/Menu.php:333 classes/Gems/Default/ExportAction.php:149
+#: classes/Gems/Default/TrackMaintenanceAction.php:314
+#: classes/Gems/Menu/MenuAbstract.php:376
+#: classes/Gems/Menu/MenuAbstract.php:458 snippets/AddTracksSnippet.php:239
msgid "Tracks"
msgstr "Tracks"
@@ -304,15 +345,19 @@
msgid "Assignments"
msgstr "Assignments"
-#: classes/Gems/Menu.php:365
+#: classes/Gems/Menu.php:365 classes/Gems/Menu/SubMenuItem.php:417
msgid "Edit"
msgstr "Edit"
-#: classes/Gems/Menu.php:371
+#: classes/Gems/Menu.php:371 classes/Gems/Menu/SubMenuItem.php:398
msgid "Delete"
msgstr "Delete"
#: classes/Gems/Menu.php:378
+#: classes/Gems/Default/SurveyMaintenanceAction.php:564
+#: classes/Gems/Menu/MenuAbstract.php:383
+#: classes/Gems/Menu/MenuAbstract.php:445
+#: classes/Gems/Tracker/Model/TrackModel.php:100
msgid "Surveys"
msgstr "Surveys"
@@ -329,10 +374,13 @@
msgstr "E-Mail now!"
#: classes/Gems/Menu.php:427
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:481
msgid "Answers"
msgstr "Answers"
-#: classes/Gems/Menu.php:579
+#: classes/Gems/Menu.php:579 classes/Gems/Default/GroupAction.php:122
+#: classes/Gems/Default/OrganizationAction.php:150
+#: classes/Gems/Default/RespondentAction.php:425
msgid "Respondents"
msgstr "Patients"
@@ -340,7 +388,7 @@
msgid "Overview"
msgstr "Overview"
-#: classes/Gems/Menu.php:594
+#: classes/Gems/Menu.php:594 classes/Gems/Menu/MenuAbstract.php:340
msgid "Project"
msgstr "Project"
@@ -356,11 +404,13 @@
msgid "Mail"
msgstr "Mail"
-#: classes/Gems/Menu.php:609
+#: classes/Gems/Menu.php:609 classes/Gems/Default/RespondentAction.php:533
+#: classes/Gems/Default/RespondentExportAction.php:60
msgid "Export respondent"
msgstr "Export respondent"
-#: classes/Gems/Menu.php:615
+#: classes/Gems/Menu.php:615 classes/Gems/Default/ContactAction.php:101
+#: snippets/Organization/OrganizationEditSnippet.php:82
msgid "Contact"
msgstr "Contact"
@@ -369,10 +419,19 @@
msgstr "Changelog"
#: classes/Gems/Model.php:206
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:213
msgid "Respondent nr"
msgstr "Patient nr"
-#: classes/Gems/Model.php:209
+#: classes/Gems/Model.php:209 classes/Gems/Default/ExportAction.php:172
+#: classes/Gems/Default/IndexAction.php:229
+#: classes/Gems/Default/LogAction.php:197
+#: classes/Gems/Default/MailJobAction.php:98
+#: classes/Gems/Default/StaffAction.php:340
+#: classes/Gems/Snippets/Export/ReportHeaderSnippet.php:63
+#: classes/Gems/User/Form/LayeredLoginForm.php:254
+#: classes/Gems/User/Form/OrganizationFormAbstract.php:166
+#: snippets/Organization/OrganizationEditSnippet.php:80
msgid "Organization"
msgstr "Organization"
@@ -384,27 +443,44 @@
msgid "Consent"
msgstr "Consent"
-#: classes/Gems/Model.php:214
+#: classes/Gems/Model.php:214 classes/Gems/Default/OptionAction.php:130
+#: classes/Gems/Default/StaffAction.php:330
msgid "E-Mail"
msgstr "E-Mail"
-#: classes/Gems/Model.php:219
+#: classes/Gems/Model.php:219 classes/Gems/Default/OptionAction.php:134
+#: classes/Gems/Default/StaffAction.php:343
msgid "Gender"
msgstr "Gender"
-#: classes/Gems/Model.php:220
+#: classes/Gems/Model.php:220 classes/Gems/Default/OptionAction.php:131
+#: classes/Gems/Default/StaffAction.php:185
msgid "First name"
msgstr "First name"
-#: classes/Gems/Model.php:221
+#: classes/Gems/Model.php:221 classes/Gems/Default/OptionAction.php:132
+#: classes/Gems/Default/StaffAction.php:187
msgid "Surname prefix"
msgstr "Surname prefix"
-#: classes/Gems/Model.php:222
+#: classes/Gems/Model.php:222 classes/Gems/Default/OptionAction.php:133
+#: classes/Gems/Default/StaffAction.php:188
msgid "Last name"
msgstr "Last name"
-#: classes/Gems/Model.php:224
+#: classes/Gems/Model.php:224 classes/Gems/Default/DatabaseAction.php:135
+#: classes/Gems/Default/DatabaseAction.php:335
+#: classes/Gems/Default/GroupAction.php:115
+#: classes/Gems/Default/OrganizationAction.php:122
+#: classes/Gems/Default/RoleAction.php:231
+#: classes/Gems/Default/SourceAction.php:195
+#: classes/Gems/Default/StaffAction.php:328
+#: classes/Gems/Default/SurveyMaintenanceAction.php:413
+#: classes/Gems/Default/TokenPlanAction.php:121
+#: classes/Gems/Default/TrackFieldsAction.php:98
+#: classes/Gems/Default/TrackMaintenanceAction.php:227
+#: classes/Gems/Snippets/TokenPlanTableSnippet.php:60
+#: classes/Gems/Tracker/Model/TrackModel.php:98
msgid "Name"
msgstr "Name"
@@ -417,6 +493,7 @@
msgstr "Zipcode"
#: classes/Gems/Model.php:229
+#: classes/Gems/Default/RespondentPlanAction.php:134
msgid "City"
msgstr "City"
@@ -425,6 +502,7 @@
msgstr "Phone"
#: classes/Gems/Model.php:233
+#: classes/Gems/Default/RespondentPlanAction.php:133
msgid "Birthday"
msgstr "Birthday"
@@ -471,61 +549,110 @@
msgstr "Trying upgrade for %s to level %s: %s"
#: classes/Gems/Controller/BrowseEditAction.php:357
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:239
+#: classes/Gems/Default/StaffAction.php:228
+#: classes/Gems/Snippets/ModelFormSnippetAbstract.php:186
#, php-format
msgid "New %s..."
msgstr "New %s..."
#: classes/Gems/Controller/BrowseEditAction.php:390
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:259
+#: classes/Gems/Default/TrackFieldsAction.php:130
+#: classes/Gems/Default/TrackRoundsAction.php:171
#, php-format
msgid "Delete %s"
msgstr "Delete %s"
#: classes/Gems/Controller/BrowseEditAction.php:394
+#: classes/Gems/Default/TrackFieldsAction.php:137
+#: classes/Gems/Default/TrackRoundsAction.php:186
+#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:134
+#: snippets/DeleteTrackTokenSnippet.php:152
#, php-format
msgid "%2$u %1$s deleted"
msgstr "%2$u %1$s deleted"
#: classes/Gems/Controller/BrowseEditAction.php:411
+#: classes/Gems/Default/OrganizationAction.php:208
#, php-format
msgid "Edit %s %s"
msgstr "Edit %s %s"
#: classes/Gems/Controller/BrowseEditAction.php:413
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:269
+#: classes/Gems/Snippets/ModelFormSnippetAbstract.php:188
#, php-format
msgid "Edit %s"
msgstr "Edit %s"
#: classes/Gems/Controller/BrowseEditAction.php:516
+#: classes/Gems/Snippets/AutosearchFormSnippet.php:166
msgid "Free search text"
msgstr "Free search text"
#: classes/Gems/Controller/BrowseEditAction.php:587
+#: classes/Gems/Snippets/AutosearchFormSnippet.php:241
msgid "Search"
msgstr "Search"
#: classes/Gems/Controller/BrowseEditAction.php:603
+#: classes/Gems/Default/TrackMaintenanceAction.php:361
#, php-format
msgid "No %s found"
msgstr "No %s found"
#: classes/Gems/Controller/BrowseEditAction.php:690
+#: classes/Gems/Default/ExportAction.php:245
#, php-format
msgid "No %s found."
msgstr "No %s found."
#: classes/Gems/Controller/BrowseEditAction.php:805
+#: classes/Gems/Default/TrackRoundsAction.php:244
+#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:94
msgid "Are you sure?"
msgstr "Are you sure?"
#: classes/Gems/Controller/BrowseEditAction.php:821
+#: classes/Gems/Default/DatabaseAction.php:187
+#: classes/Gems/Default/DatabaseAction.php:499
+#: classes/Gems/Default/StaffAction.php:276
+#: classes/Gems/Default/TrackAction.php:419
+#: classes/Gems/Default/TrackRoundsAction.php:265
+#: classes/Gems/Snippets/ModelItemYesNoDeleteSnippetAbstract.php:181
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:143
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:147
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:166
+#: classes/Gems/Util/Translated.php:263
+#: classes/MUtil/Snippets/ModelYesNoDeleteSnippetAbstract.php:192
+#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:124
msgid "Yes"
msgstr "Yes"
#: classes/Gems/Controller/BrowseEditAction.php:822
+#: classes/Gems/Default/DatabaseAction.php:188
+#: classes/Gems/Default/DatabaseAction.php:500
+#: classes/Gems/Default/StaffAction.php:277
+#: classes/Gems/Default/TrackAction.php:420
+#: classes/Gems/Default/TrackRoundsAction.php:266
+#: classes/Gems/Snippets/ModelItemYesNoDeleteSnippetAbstract.php:183
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:144
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:148
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:167
+#: classes/Gems/Util/ReceptionCodeLibrary.php:99
+#: classes/Gems/Util/ReceptionCodeLibrary.php:123
+#: classes/Gems/Util/Translated.php:263
+#: classes/MUtil/Snippets/ModelYesNoDeleteSnippetAbstract.php:194
+#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:125
msgid "No"
msgstr "No"
#: classes/Gems/Controller/BrowseEditAction.php:875
+#: classes/Gems/Default/RespondentAction.php:246
+#: classes/Gems/Default/RespondentAction.php:478
+#: classes/Gems/Default/RespondentAction.php:516
+#: classes/Gems/Default/TrackAction.php:548
#, php-format
msgid "Unknown %s requested"
msgstr "Unknown %s requested"
@@ -536,10 +663,15 @@
msgstr "New %1$s..."
#: classes/Gems/Controller/BrowseEditAction.php:906
+#: classes/Gems/Email/MailTemplateForm.php:108
+#: classes/Gems/User/Form/ChangePasswordForm.php:341
+#: classes/MUtil/Snippets/ModelFormSnippetAbstract.php:245
msgid "Save"
msgstr "Save"
#: classes/Gems/Controller/BrowseEditAction.php:942
+#: classes/Gems/Default/MailTemplateAction.php:116
+#: classes/MUtil/Snippets/ModelFormSnippetAbstract.php:209
#, php-format
msgid "%2$u %1$s saved"
msgstr "%2$u %1$s saved"
@@ -549,21 +681,31 @@
msgstr "No changes to save."
#: classes/Gems/Controller/BrowseEditAction.php:954
+#: classes/Gems/Default/RespondentAction.php:307
msgid "Input error! No changes saved!"
msgstr "Input error! No changes saved!"
#: classes/Gems/Controller/BrowseEditAction.php:982
+#: classes/Gems/Default/SurveyMaintenanceAction.php:593
#, php-format
msgid "Show %s"
msgstr "Show %s"
#: classes/Gems/Controller/BrowseEditAction.php:989
+#: classes/Gems/Default/SurveyMaintenanceAction.php:602
#, php-format
msgid "Unknown %s."
msgstr "Unknown %s."
#: classes/Gems/Controller/ModelActionAbstract.php:97
#: classes/Gems/Default/DatabaseAction.php:503
+#: classes/Gems/Default/SourceAction.php:292
+#: classes/Gems/Default/UpgradeAction.php:184
+#: classes/Gems/Snippets/ModelFormSnippetAbstract.php:171
+#: classes/Gems/Snippets/ModelItemTableSnippetAbstract.php:180
+#: classes/Gems/Tracker/Snippets/ShowRoundSnippetAbstract.php:193
+#: snippets/Generic/CurrentButtonRowSnippet.php:77
+#: snippets/Track/Token/ShowFirstOpenSnippet.php:133
msgid "Cancel"
msgstr "Cancel"
@@ -587,6 +729,8 @@
msgstr "Showing %s"
#: classes/Gems/Controller/ModelSnippetActionAbstract.php:390
+#: classes/Gems/Default/OptionAction.php:181
+#: classes/MUtil/Snippets/ModelFormSnippetAbstract.php:341
msgid "item"
msgid_plural "items"
msgstr[0] "item"
@@ -623,22 +767,36 @@
msgstr "After answering the survey you will be logged off automatically."
#: classes/Gems/Default/AskAction.php:100
-msgid "A token consists of two groups of four letters and numbers, separated by an optional hyphen. Tokens are case insensitive."
-msgstr "A token consists of two groups of four letters and numbers, separated by an optional hyphen. Tokens are case insensitive."
+msgid ""
+"A token consists of two groups of four letters and numbers, separated by an "
+"optional hyphen. Tokens are case insensitive."
+msgstr ""
+"A token consists of two groups of four letters and numbers, separated by an "
+"optional hyphen. Tokens are case insensitive."
#: classes/Gems/Default/AskAction.php:101
-msgid "The number zero and the letter O are treated as the same; the same goes for the number one and the letter L."
-msgstr "The number zero and the letter O are treated as the same; the same goes for the number one and the letter L."
+msgid ""
+"The number zero and the letter O are treated as the same; the same goes for "
+"the number one and the letter L."
+msgstr ""
+"The number zero and the letter O are treated as the same; the same goes for "
+"the number one and the letter L."
#: classes/Gems/Default/AskAction.php:136
#, php-format
-msgid "Thank you for answering. At the moment we have no further surveys for you to take."
-msgstr "Thank you for answering. At the moment we have no further surveys for you to take."
+msgid ""
+"Thank you for answering. At the moment we have no further surveys for you to "
+"take."
+msgstr ""
+"Thank you for answering. At the moment we have no further surveys for you to "
+"take."
#: classes/Gems/Default/AskAction.php:138
#, php-format
-msgid "The survey for token %s has been answered and no further surveys are open."
-msgstr "The survey for token %s has been answered and no further surveys are open."
+msgid ""
+"The survey for token %s has been answered and no further surveys are open."
+msgstr ""
+"The survey for token %s has been answered and no further surveys are open."
#: classes/Gems/Default/AskAction.php:145
#, php-format
@@ -652,11 +810,26 @@
#: classes/Gems/Default/ConsentAction.php:68
#: classes/Gems/Default/GroupAction.php:116
+#: classes/Gems/Default/ReceptionAction.php:81
+#: classes/Gems/Default/RoleAction.php:232
+#: classes/Gems/Default/SurveyMaintenanceAction.php:200
+#: classes/Gems/Default/SurveyMaintenanceAction.php:414
+#: classes/Gems/Default/TrackActionAbstract.php:204
+#: classes/Gems/Default/TrackFieldsAction.php:101
+#: classes/Gems/Default/UpgradeAction.php:176
+#: classes/Gems/Export/RespondentExport.php:225
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:758
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:214
+#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:150
+#: classes/Gems/Tracker/Snippets/ShowTrackUsageAbstract.php:147
+#: snippets/TrackSurveyOverviewSnippet.php:115
msgid "Description"
msgstr "Description"
#: classes/Gems/Default/ConsentAction.php:70
#: classes/Gems/Default/DatabaseAction.php:139
+#: classes/Gems/Default/TrackFieldsAction.php:97
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:757
msgid "Order"
msgstr "Order"
@@ -669,8 +842,12 @@
msgstr "Consent code"
#: classes/Gems/Default/ConsentAction.php:75
-msgid "Internal code, not visible to users, copied with the token information to the source."
-msgstr "Internal code, not visible to users, copied with the token information to the source."
+msgid ""
+"Internal code, not visible to users, copied with the token information to "
+"the source."
+msgstr ""
+"Internal code, not visible to users, copied with the token information to "
+"the source."
#: classes/Gems/Default/ConsentAction.php:92
msgid "respondent consent"
@@ -719,10 +896,14 @@
msgstr "No mails sent."
#: classes/Gems/Default/CronAction.php:195
+#: classes/Gems/Email/MultiMailForm.php:49
+#: classes/Gems/Email/OneMailForm.php:47
msgid "On this test system all mail will be delivered to the from address."
msgstr "On this test system all mail will be delivered to the from address."
#: classes/Gems/Default/DatabaseAction.php:75
+#: classes/Gems/Default/ProjectInformationAction.php:192
+#: classes/Gems/Task/CleanCache.php:58
msgid "Cache cleaned"
msgstr "Cache cleaned"
@@ -732,18 +913,25 @@
msgstr "No rows in %s."
#: classes/Gems/Default/DatabaseAction.php:134
+#: classes/Gems/Default/TrackFieldsAction.php:104
+#: classes/Gems/Default/TrackMaintenanceAction.php:229
msgid "Type"
msgstr "Type"
#: classes/Gems/Default/DatabaseAction.php:138
+#: classes/Gems/Default/SurveyMaintenanceAction.php:435
msgid "Group"
msgstr "Group"
#: classes/Gems/Default/DatabaseAction.php:140
+#: classes/Gems/Default/OrganizationAction.php:123
msgid "Location"
msgstr "Location"
#: classes/Gems/Default/DatabaseAction.php:143
+#: classes/Gems/Default/SourceAction.php:210
+#: classes/Gems/Export/RespondentExport.php:148
+#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:157
msgid "Status"
msgstr "Status"
@@ -754,6 +942,7 @@
#: classes/Gems/Default/DatabaseAction.php:148
#: classes/Gems/Default/DatabaseAction.php:293
#: classes/Gems/Default/DatabaseAction.php:340
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:204
msgid "Changed on"
msgstr "Changed on"
@@ -824,6 +1013,9 @@
#: classes/Gems/Default/DatabaseAction.php:287
#: classes/Gems/Default/DatabaseAction.php:333
+#: classes/Gems/Default/UpgradeAction.php:126
+#: classes/Gems/Default/UpgradeAction.php:153
+#: classes/Gems/Default/UpgradeAction.php:175
msgid "Level"
msgstr "Level"
@@ -856,6 +1048,7 @@
msgstr "%d new or changed patch(es)."
#: classes/Gems/Default/DatabaseAction.php:303
+#: classes/Gems/Default/ProjectInformationAction.php:137
msgid "Gems build"
msgstr "Gems build"
@@ -880,6 +1073,7 @@
msgstr "Show patches"
#: classes/Gems/Default/DatabaseAction.php:326
+#: classes/Gems/Task/Db/ExecutePatch.php:68
#, php-format
msgid "%d patch(es) executed."
msgstr "%d patch(es) executed."
@@ -923,6 +1117,7 @@
msgstr "Starting %d object creation scripts."
#: classes/Gems/Default/DatabaseAction.php:474
+#: classes/Gems/Task/Db/CreateNewTable.php:73
#, php-format
msgid "Finished %s creation script for object %d of %d"
msgstr "Finished %s creation script for object %d of %d"
@@ -957,6 +1152,7 @@
msgstr "Separate multiple commands with semicolons (;)."
#: classes/Gems/Default/DatabaseAction.php:522
+#: classes/Gems/Menu/MenuAbstract.php:275
msgid "Run"
msgstr "Run"
@@ -1000,6 +1196,14 @@
msgstr "Not patient nr, but respondent id as exported here."
#: classes/Gems/Default/ExportAction.php:154
+#: classes/Gems/Default/MailJobAction.php:100
+#: classes/Gems/Default/ProjectSurveysAction.php:67
+#: classes/Gems/Default/SurveyAction.php:191
+#: classes/Gems/Email/OneMailForm.php:57
+#: classes/Gems/Export/RespondentExport.php:145
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:755
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:215
+#: snippets/TrackSurveyOverviewSnippet.php:111
msgid "Survey"
msgstr "Survey"
@@ -1021,25 +1225,40 @@
msgstr "Export data"
#: classes/Gems/Default/GroupAction.php:71
+#: classes/Gems/Default/ReceptionAction.php:55
msgid "Can be assigned to"
msgstr "Can be assigned to"
#: classes/Gems/Default/GroupAction.php:117
#: classes/Gems/Default/LogAction.php:201
+#: classes/Gems/Default/RoleAction.php:298
msgid "Role"
msgstr "Role"
#: classes/Gems/Default/GroupAction.php:120
+#: classes/Gems/Default/MailJobAction.php:82
+#: classes/Gems/Default/OrganizationAction.php:147
+#: classes/Gems/Default/ReceptionAction.php:87
+#: classes/Gems/Default/SourceAction.php:101
+#: classes/Gems/Default/SurveyMaintenanceAction.php:426
+#: classes/Gems/Default/SurveyMaintenanceAction.php:481
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:761
+#: classes/Gems/Tracker/Model/TrackModel.php:102
+#: classes/Gems/Util/TrackData.php:147
msgid "Active"
msgstr "Active"
#: classes/Gems/Default/GroupAction.php:125
+#: classes/Gems/Default/OrganizationAction.php:171
msgid "Allowed IP Ranges"
msgstr "Allowed IP Ranges"
#: classes/Gems/Default/GroupAction.php:126
-msgid "Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)"
-msgstr "Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)"
+#: classes/Gems/Default/OrganizationAction.php:172
+msgid ""
+"Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)"
+msgstr ""
+"Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)"
#: classes/Gems/Default/GroupAction.php:136
msgid "group"
@@ -1064,8 +1283,12 @@
msgstr "Please enter your username or e-mail address. "
#: classes/Gems/Default/IndexAction.php:182
-msgid "We will then send you an e-mail with a link. The link will bring you to a page where you can set a new password of your choice."
-msgstr "We will then send you an e-mail with a link. The link will bring you to a page where you can set a new password of your choice."
+msgid ""
+"We will then send you an e-mail with a link. The link will bring you to a "
+"page where you can set a new password of your choice."
+msgstr ""
+"We will then send you an e-mail with a link. The link will bring you to a "
+"page where you can set a new password of your choice."
#: classes/Gems/Default/IndexAction.php:188
msgid "Execute password reset"
@@ -1089,6 +1312,7 @@
msgstr "Please enter your password of choice twice."
#: classes/Gems/Default/IndexAction.php:218
+#: classes/Gems/User/Form/LayeredLoginForm.php:258
msgid "Department"
msgstr "Department"
@@ -1107,18 +1331,26 @@
msgstr "Good bye: %s."
#: classes/Gems/Default/IndexAction.php:339
-msgid "Your password reset request is no longer valid, please request a new link."
-msgstr "Your password reset request is no longer valid, please request a new link."
+msgid ""
+"Your password reset request is no longer valid, please request a new link."
+msgstr ""
+"Your password reset request is no longer valid, please request a new link."
#: classes/Gems/Default/IndexAction.php:341
-msgid "Your password input request is no longer valid, please request a new link."
-msgstr "Your password input request is no longer valid, please request a new link."
+msgid ""
+"Your password input request is no longer valid, please request a new link."
+msgstr ""
+"Your password input request is no longer valid, please request a new link."
#: classes/Gems/Default/IndexAction.php:360
-msgid "We sent you an e-mail with a reset link. Click on the link in the e-mail."
-msgstr "We sent you an e-mail with a reset link. Click on the link in the e-mail."
+msgid ""
+"We sent you an e-mail with a reset link. Click on the link in the e-mail."
+msgstr ""
+"We sent you an e-mail with a reset link. Click on the link in the e-mail."
#: classes/Gems/Default/IndexAction.php:369
+#: classes/Gems/Default/OptionAction.php:94
+#: classes/Gems/Default/StaffAction.php:510
msgid "New password is active."
msgstr "New password is active."
@@ -1131,7 +1363,9 @@
"Dear {greeting},\n"
"\n"
"\n"
-"A new password was requested for your [b]{organization}[/b] account on the [b]{project}[/b] site, please click within {reset_in_hours} hours on [url={reset_url}]this link[/url] to enter the password of your choice.\n"
+"A new password was requested for your [b]{organization}[/b] account on the "
+"[b]{project}[/b] site, please click within {reset_in_hours} hours on [url="
+"{reset_url}]this link[/url] to enter the password of your choice.\n"
"\n"
"\n"
"{organization_signature}\n"
@@ -1141,7 +1375,9 @@
"Dear {greeting},\n"
"\n"
"\n"
-"A new password was requested for your [b]{organization}[/b] account on the [b]{project}[/b] site, please click within {reset_in_hours} hours on [url={reset_url}]this link[/url] to enter the password of your choice.\n"
+"A new password was requested for your [b]{organization}[/b] account on the "
+"[b]{project}[/b] site, please click within {reset_in_hours} hours on [url="
+"{reset_url}]this link[/url] to enter the password of your choice.\n"
"\n"
"\n"
"{organization_signature}\n"
@@ -1161,26 +1397,32 @@
msgstr "Invalid language setting."
#: classes/Gems/Default/LogAction.php:78
+#: classes/Gems/Default/TokenPlanAction.php:243
msgid "from"
msgstr "from"
#: classes/Gems/Default/LogAction.php:83
+#: classes/Gems/Default/TokenPlanAction.php:248
msgid "until"
msgstr "until"
#: classes/Gems/Default/LogAction.php:89
+#: classes/Gems/Default/TokenPlanAction.php:254
msgid "days"
msgstr "days"
#: classes/Gems/Default/LogAction.php:90
+#: classes/Gems/Default/TokenPlanAction.php:255
msgid "weeks"
msgstr "weeks"
#: classes/Gems/Default/LogAction.php:91
+#: classes/Gems/Default/TokenPlanAction.php:256
msgid "months"
msgstr "months"
#: classes/Gems/Default/LogAction.php:92
+#: classes/Gems/Default/TokenPlanAction.php:257
msgid "years"
msgstr "years"
@@ -1217,23 +1459,34 @@
msgstr "All actions"
#: classes/Gems/Default/LogAction.php:190
+#: classes/Gems/Default/TrackFieldsAction.php:92
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:472
msgid "Date"
msgstr "Date"
#: classes/Gems/Default/LogAction.php:191
#: classes/Gems/Default/LogMaintenanceAction.php:52
+#: classes/Gems/Default/UpgradeAction.php:177
msgid "Action"
msgstr "Action"
#: classes/Gems/Default/LogAction.php:192
+#: classes/Gems/Default/MailTemplateAction.php:66
+#: classes/Gems/Email/EmailFormAbstract.php:168
msgid "Message"
msgstr "Message"
#: classes/Gems/Default/LogAction.php:198
+#: classes/Gems/Default/TokenPlanAction.php:116
+#: classes/Gems/Snippets/TokenPlanTableSnippet.php:55
+#: snippets/RespondentDetailsSnippet.php:74
+#: snippets/RespondentDetailsWithAssignmentsSnippet.php:148
msgid "Respondent"
msgstr "Patient"
#: classes/Gems/Default/LogAction.php:202
+#: classes/Gems/Default/OptionAction.php:175
+#: classes/Gems/User/RadiusUserDefinition.php:163
msgid "IP address"
msgstr "IP address"
@@ -1247,6 +1500,7 @@
msgstr "Log:"
#: classes/Gems/Default/LogMaintenanceAction.php:72
+#: snippets/RespondentTokenTabsSnippet.php:69
msgid "All"
msgstr "All"
@@ -1260,6 +1514,7 @@
#: classes/Gems/Default/MailJobAction.php:78
#: classes/Gems/Default/MailLogAction.php:118
+#: classes/Gems/Email/EmailFormAbstract.php:308
msgid "Template"
msgstr "Template"
@@ -1326,6 +1581,10 @@
msgstr "Use the 'By staff member' address"
#: classes/Gems/Default/MailJobAction.php:133
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:290
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:338
+#: snippets/Organization/OrganizationEditSnippet.php:85
+#: snippets/Organization/OrganizationEditSnippet.php:131
msgid "Other"
msgstr "Other"
@@ -1349,8 +1608,12 @@
msgstr "Turn Automatic Mail Jobs ON"
#: classes/Gems/Default/MailJobAction.php:176
-msgid "With automatic mail jobs and a cron job on the server, mails can be sent without manual user action."
-msgstr "With automatic mail jobs and a cron job on the server, mails can be sent without manual user action."
+msgid ""
+"With automatic mail jobs and a cron job on the server, mails can be sent "
+"without manual user action."
+msgstr ""
+"With automatic mail jobs and a cron job on the server, mails can be sent "
+"without manual user action."
#: classes/Gems/Default/MailLogAction.php:109
msgid "Date sent"
@@ -1374,6 +1637,7 @@
#: classes/Gems/Default/MailLogAction.php:115
#: classes/Gems/Default/MailTemplateAction.php:62
+#: classes/Gems/Email/EmailFormAbstract.php:349
msgid "Subject"
msgstr "Subject"
@@ -1416,6 +1680,7 @@
msgstr "TLS"
#: classes/Gems/Default/MailServerAction.php:80
+#: classes/Gems/User/RadiusUserDefinition.php:164
msgid "Port"
msgstr "Port"
@@ -1428,16 +1693,20 @@
msgstr "User ID"
#: classes/Gems/Default/MailServerAction.php:88
+#: classes/Gems/User/Form/LoginForm.php:127
msgid "Password"
msgstr "Password"
#: classes/Gems/Default/MailServerAction.php:90
#: classes/Gems/Default/SourceAction.php:95
+#: classes/Gems/User/Form/ChangePasswordForm.php:241
+#: classes/Gems/User/Form/ChangePasswordForm.php:287
msgid "Repeat password"
msgstr "Repeat password"
#: classes/Gems/Default/MailServerAction.php:91
#: classes/Gems/Default/SourceAction.php:74
+#: classes/Gems/User/RadiusUserDefinition.php:169
msgid "Enter only when changing"
msgstr "Enter only when changing the password"
@@ -1453,6 +1722,8 @@
#: classes/Gems/Default/MailTemplateAction.php:76
#: classes/Gems/Default/RespondentAction.php:349
+#: classes/Gems/Default/StaffAction.php:335
+#: classes/Gems/Default/StaffAction.php:405
msgid "(all organizations)"
msgstr "(all organizations)"
@@ -1475,8 +1746,9 @@
msgstr "Login Name"
#: classes/Gems/Default/OptionAction.php:136
-#: classes/Gems/Default/OrganizationAction.php:135
+#: classes/Gems/Default/OrganizationAction.php:143
#: classes/Gems/Default/RespondentAction.php:195
+#: classes/Gems/Default/StaffAction.php:351
msgid "Language"
msgstr "Language"
@@ -1486,8 +1758,12 @@
msgstr "Options"
#: classes/Gems/Default/OptionAction.php:155
-msgid "This overview provides information about the last login activity on your account."
-msgstr "This overview provides information about the last login activity on your account."
+msgid ""
+"This overview provides information about the last login activity on your "
+"account."
+msgstr ""
+"This overview provides information about the last login activity on your "
+"account."
#: classes/Gems/Default/OptionAction.php:175
msgid "Date / time"
@@ -1497,113 +1773,122 @@
msgid "Item"
msgstr "Item"
-#: classes/Gems/Default/OrganizationAction.php:92
+#: classes/Gems/Default/OrganizationAction.php:100
+#: classes/Gems/Model/HiddenOrganizationModel.php:113
msgid "Inaccessible or unknown organization"
msgstr "Inaccessible or unknown organization"
-#: classes/Gems/Default/OrganizationAction.php:116
+#: classes/Gems/Default/OrganizationAction.php:124
msgid "Url"
msgstr "Url"
-#: classes/Gems/Default/OrganizationAction.php:117
+#: classes/Gems/Default/OrganizationAction.php:125
msgid "Task"
msgstr "Task"
-#: classes/Gems/Default/OrganizationAction.php:118
+#: classes/Gems/Default/OrganizationAction.php:126
msgid "Contact name"
msgstr "Contact name"
-#: classes/Gems/Default/OrganizationAction.php:119
+#: classes/Gems/Default/OrganizationAction.php:127
msgid "Contact email"
msgstr "Contact email"
-#: classes/Gems/Default/OrganizationAction.php:122
+#: classes/Gems/Default/OrganizationAction.php:130
msgid "Style"
msgstr "Style"
-#: classes/Gems/Default/OrganizationAction.php:127
+#: classes/Gems/Default/OrganizationAction.php:135
msgid "Default url's"
msgstr "Default url's"
-#: classes/Gems/Default/OrganizationAction.php:129
+#: classes/Gems/Default/OrganizationAction.php:137
#, php-format
-msgid "Always switch to this organization when %s is accessed from one of these space separated url's. The first is used for mails."
-msgstr "Always switch to this organization when %s is accessed from one of these space separated url's. The first is used for mails."
+msgid ""
+"Always switch to this organization when %s is accessed from one of these "
+"space separated url's. The first is used for mails."
+msgstr ""
+"Always switch to this organization when %s is accessed from one of these "
+"space separated url's. The first is used for mails."
-#: classes/Gems/Default/OrganizationAction.php:139
+#: classes/Gems/Default/OrganizationAction.php:147
msgid "Can the organization be used?"
msgstr "Can the organization be used?"
-#: classes/Gems/Default/OrganizationAction.php:140
+#: classes/Gems/Default/OrganizationAction.php:148
+#: classes/Gems/User/Form/LoginForm.php:151
msgid "Login"
msgstr "Login"
-#: classes/Gems/Default/OrganizationAction.php:140
+#: classes/Gems/Default/OrganizationAction.php:148
msgid "Can people login for this organization?"
msgstr "Can people login for this organization?"
-#: classes/Gems/Default/OrganizationAction.php:141
+#: classes/Gems/Default/OrganizationAction.php:149
msgid "Accepting"
msgstr "Accepting"
-#: classes/Gems/Default/OrganizationAction.php:141
+#: classes/Gems/Default/OrganizationAction.php:149
msgid "Can new respondents be added to the organization?"
msgstr "Can new patients be added to the organization?"
-#: classes/Gems/Default/OrganizationAction.php:142
+#: classes/Gems/Default/OrganizationAction.php:150
msgid "Does the organization have respondents?"
msgstr "Does the organization have patients?"
-#: classes/Gems/Default/OrganizationAction.php:143
+#: classes/Gems/Default/OrganizationAction.php:151
msgid "Respondent group"
msgstr "Patient group"
-#: classes/Gems/Default/OrganizationAction.php:143
+#: classes/Gems/Default/OrganizationAction.php:151
msgid "Allows respondents to login."
msgstr "Allow patients to login."
-#: classes/Gems/Default/OrganizationAction.php:147
+#: classes/Gems/Default/OrganizationAction.php:155
msgid "Greeting"
msgstr "Greeting"
-#: classes/Gems/Default/OrganizationAction.php:147
-#: classes/Gems/Default/OrganizationAction.php:148
+#: classes/Gems/Default/OrganizationAction.php:155
+#: classes/Gems/Default/OrganizationAction.php:156
msgid "For emails and token forward screen."
msgstr "For emails and token forward screen."
-#: classes/Gems/Default/OrganizationAction.php:148
+#: classes/Gems/Default/OrganizationAction.php:156
msgid "Signature"
msgstr "Signature"
-#: classes/Gems/Default/OrganizationAction.php:150
+#: classes/Gems/Default/OrganizationAction.php:158
msgid "Accessible by"
msgstr "Accessible by"
-#: classes/Gems/Default/OrganizationAction.php:150
+#: classes/Gems/Default/OrganizationAction.php:158
msgid "Checked organizations see this organizations respondents."
msgstr "Checked organizations see this organizations patients."
-#: classes/Gems/Default/OrganizationAction.php:160
+#: classes/Gems/Default/OrganizationAction.php:168
+#: classes/Gems/Default/SurveyMaintenanceAction.php:443
msgid "Code name"
msgstr "Code name"
-#: classes/Gems/Default/OrganizationAction.php:160
+#: classes/Gems/Default/OrganizationAction.php:168
+#: classes/Gems/Default/SurveyMaintenanceAction.php:443
msgid "Only for programmers."
msgstr "Only for programmers."
-#: classes/Gems/Default/OrganizationAction.php:178
+#: classes/Gems/Default/OrganizationAction.php:186
msgid "This can not be changed yet"
msgstr "This can not be changed yet"
-#: classes/Gems/Default/OrganizationAction.php:180
+#: classes/Gems/Default/OrganizationAction.php:188
+#: classes/Gems/Default/StaffAction.php:158
msgid "User Definition"
msgstr "User Definition"
-#: classes/Gems/Default/OrganizationAction.php:210
+#: classes/Gems/Default/OrganizationAction.php:218
msgid "Participating organizations"
msgstr "Participating organizations"
-#: classes/Gems/Default/OrganizationAction.php:221
+#: classes/Gems/Default/OrganizationAction.php:229
msgid "organization"
msgid_plural "organizations"
msgstr[0] "organization"
@@ -1611,6 +1896,9 @@
#: classes/Gems/Default/OverviewPlanAction.php:115
#: classes/Gems/Default/ProjectSurveysAction.php:88
+#: classes/Gems/Default/SurveyAction.php:207
+#: classes/Gems/Default/SurveyMaintenanceAction.php:559
+#: classes/Gems/Tracker/Snippets/EditSingleSurveyTokenSnippetAbstract.php:157
msgid "survey"
msgid_plural "surveys"
msgstr[0] "survey"
@@ -1729,20 +2017,31 @@
msgstr "Session content"
#: classes/Gems/Default/ProjectInformationAction.php:225
+#: classes/Gems/Menu/MenuAbstract.php:341
msgid "Session"
msgstr "Session"
#: classes/Gems/Default/ProjectSurveysAction.php:68
+#: classes/Gems/Default/SurveyAction.php:192
+#: snippets/TrackSurveyOverviewSnippet.php:113
msgid "By"
msgstr "By"
#: classes/Gems/Default/ProjectSurveysAction.php:69
#: classes/Gems/Default/ProjectTracksAction.php:67
+#: classes/Gems/Default/SurveyAction.php:193
+#: classes/Gems/Default/TrackAction.php:330
+#: classes/Gems/Email/EmailFormAbstract.php:193
+#: classes/Gems/Email/EmailFormAbstract.php:251
+#: classes/Gems/Email/MailTemplateForm.php:81
+#: classes/Gems/Tracker/Model/TrackModel.php:103
msgid "From"
msgstr "From"
#: classes/Gems/Default/ProjectSurveysAction.php:70
#: classes/Gems/Default/ProjectTracksAction.php:68
+#: classes/Gems/Default/SurveyAction.php:197
+#: classes/Gems/Default/TrackAction.php:332
msgid "Until"
msgstr "Until"
@@ -1751,10 +2050,15 @@
msgstr "Active surveys"
#: classes/Gems/Default/ProjectTracksAction.php:65
+#: classes/Gems/Default/TrackAction.php:329
msgid "Survey #"
msgstr "Survey #"
#: classes/Gems/Default/ProjectTracksAction.php:85
+#: classes/Gems/Default/TrackAction.php:452
+#: classes/Gems/Default/TrackMaintenanceAction.php:309
+#: classes/Gems/Tracker/Snippets/EditTrackEngineSnippetGeneric.php:191
+#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:174
msgid "track"
msgid_plural "tracks"
msgstr[0] "track"
@@ -1770,6 +2074,7 @@
msgstr "Questions in survey %s"
#: classes/Gems/Default/ProjectTracksAction.php:118
+#: classes/Gems/Default/SurveyAction.php:85
#, php-format
msgid "Survey %s does not exist."
msgstr "Survey %s does not exist."
@@ -1779,6 +2084,7 @@
msgstr "Survey not specified."
#: classes/Gems/Default/ProjectTracksAction.php:132
+#: classes/Gems/Default/TrackActionAbstract.php:496
#, php-format
msgid "Track %s does not exist."
msgstr "Track %s does not exist."
@@ -1903,6 +2209,7 @@
msgstr "Has the patient signed the informed consent letter?"
#: classes/Gems/Default/RespondentAction.php:228
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:203
msgid "Comments"
msgstr "Comments"
@@ -1911,6 +2218,11 @@
msgstr "Treatment"
#: classes/Gems/Default/RespondentAction.php:257
+#: classes/Gems/Default/TrackAction.php:132
+#: classes/Gems/Default/TrackAction.php:479
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:212
+#: snippets/DeleteInSourceTrackSnippet.php:112
+#: snippets/EditTrackSnippet.php:95
msgid "Rejection code"
msgstr "Rejection code"
@@ -1927,20 +2239,23 @@
msgstr "Patient tracks stopped."
#: classes/Gems/Default/RespondentAction.php:304
+#: classes/Gems/Default/TrackAction.php:405
msgid "Choose a reception code to delete."
msgstr "Choose a reception code to delete."
-#: classes/Gems/Default/RespondentAction.php:398
+#: classes/Gems/Default/RespondentAction.php:420
msgid "respondent"
msgid_plural "respondents"
msgstr[0] "patient"
msgstr[1] "patients"
-#: classes/Gems/Default/RespondentAction.php:473
+#: classes/Gems/Default/RespondentAction.php:495
msgid "Please settle the informed consent form for this respondent."
msgstr "Please settle the informed consent form for this patient."
#: classes/Gems/Default/RespondentExportAction.php:54
+#: classes/Gems/Default/TrackAction.php:121
+#: snippets/DeleteInSourceTrackSnippet.php:82 snippets/EditTrackSnippet.php:72
msgid "Respondent number"
msgstr "Patient number"
@@ -1949,18 +2264,37 @@
msgstr "Separate multiple respondents with a comma (,)"
#: classes/Gems/Default/RespondentPlanAction.php:67
+#: classes/Gems/Default/SurveyAction.php:171
+#: classes/Gems/Default/TrackAction.php:297
+#: snippets/DeleteInSourceTrackSnippet.php:132
+#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:174
+#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:145
+#: snippets/DeleteTrackTokenSnippet.php:195
+#: snippets/EditSingleSurveyTokenSnippet.php:134
+#: snippets/EditTrackSnippet.php:110 snippets/EditTrackTokenSnippet.php:144
+#: snippets/ShowSingleSurveyTokenSnippet.php:140
+#: snippets/ShowTrackTokenSnippet.php:146
msgid "Show respondent"
msgstr "Show patient"
#: classes/Gems/Default/RespondentPlanAction.php:73
+#: classes/Gems/Default/TrackAction.php:266
+#: classes/Gems/Default/TrackAction.php:285
+#: snippets/DeleteInSourceTrackSnippet.php:129
+#: snippets/EditTrackSnippet.php:108 snippets/EditTrackTokenSnippet.php:142
+#: snippets/ShowTrackTokenSnippet.php:145
msgid "Show track"
msgstr "Show track"
#: classes/Gems/Default/RespondentPlanAction.php:136
+#: classes/Gems/Default/TrackAction.php:317
+#: snippets/ShowTrackUsageSnippet.php:103
msgid " of "
msgstr " of "
#: classes/Gems/Default/RespondentPlanAction.php:137
+#: classes/Gems/Default/TrackAction.php:318
+#: snippets/ShowTrackUsageSnippet.php:104
msgid "Progress"
msgstr "Progress"
@@ -2059,20 +2393,40 @@
msgstr "Database Password"
#: classes/Gems/Default/SourceAction.php:115
-msgid "Check tokens for being answered or not, reruns survey and round event code on completed tokens and recalculates the start and end times of all tokens in tracks that have completed tokens."
-msgstr "Check tokens for being answered or not, reruns survey and round event code on completed tokens and recalculates the start and end times of all tokens in tracks that have completed tokens."
+msgid ""
+"Check tokens for being answered or not, reruns survey and round event code "
+"on completed tokens and recalculates the start and end times of all tokens "
+"in tracks that have completed tokens."
+msgstr ""
+"Check tokens for being answered or not, reruns survey and round event code "
+"on completed tokens and recalculates the start and end times of all tokens "
+"in tracks that have completed tokens."
#: classes/Gems/Default/SourceAction.php:116
-msgid "Run this code when survey result fields, survey or round events or the event code has changed or after bulk changes in a survey source."
-msgstr "Run this code when survey result fields, survey or round events or the event code has changed or after bulk changes in a survey source."
+msgid ""
+"Run this code when survey result fields, survey or round events or the event "
+"code has changed or after bulk changes in a survey source."
+msgstr ""
+"Run this code when survey result fields, survey or round events or the event "
+"code has changed or after bulk changes in a survey source."
#: classes/Gems/Default/SourceAction.php:126
-msgid "Check source for new surveys, changes in survey status and survey deletion. Can also perform maintenance on some sources, e.g. by changing the number of attributes."
-msgstr "Check source for new surveys, changes in survey status and survey deletion. Can also perform maintenance on some sources, e.g. by changing the number of attributes."
+msgid ""
+"Check source for new surveys, changes in survey status and survey deletion. "
+"Can also perform maintenance on some sources, e.g. by changing the number of "
+"attributes."
+msgstr ""
+"Check source for new surveys, changes in survey status and survey deletion. "
+"Can also perform maintenance on some sources, e.g. by changing the number of "
+"attributes."
#: classes/Gems/Default/SourceAction.php:127
-msgid "Run this code when the status of a survey in a source has changed or when the code has changed and the source must be adapted."
-msgstr "Run this code when the status of a survey in a source has changed or when the code has changed and the source must be adapted."
+msgid ""
+"Run this code when the status of a survey in a source has changed or when "
+"the code has changed and the source must be adapted."
+msgstr ""
+"Run this code when the status of a survey in a source has changed or when "
+"the code has changed and the source must be adapted."
#: classes/Gems/Default/SourceAction.php:140
#, php-format
@@ -2084,8 +2438,12 @@
msgstr "Refreshes the attributes for a token as stored in the source."
#: classes/Gems/Default/SourceAction.php:146
-msgid "Run this code when the number of attributes has changed or when you suspect the attributes have been corrupted somehow."
-msgstr "Run this code when the number of attributes has changed or when you suspect the attributes have been corrupted somehow."
+msgid ""
+"Run this code when the number of attributes has changed or when you suspect "
+"the attributes have been corrupted somehow."
+msgstr ""
+"Run this code when the number of attributes has changed or when you suspect "
+"the attributes have been corrupted somehow."
#: classes/Gems/Default/SourceAction.php:159
#, php-format
@@ -2139,6 +2497,7 @@
msgstr[1] "sources"
#: classes/Gems/Default/SourceAction.php:249
+#: classes/Gems/Menu/MenuAbstract.php:436
msgid "Survey Sources"
msgstr "Survey Sources"
@@ -2181,10 +2540,15 @@
#: classes/Gems/Default/StaffAction.php:268
#, php-format
-msgid "User with id %s already exists but is deleted, do you want to reactivate the account?"
-msgstr "User with id %s already exists but is deleted, do you want to reactivate the account?"
+msgid ""
+"User with id %s already exists but is deleted, do you want to reactivate the "
+"account?"
+msgstr ""
+"User with id %s already exists but is deleted, do you want to reactivate the "
+"account?"
-#: classes/Gems/Default/StaffAction.php:327
+#: classes/Gems/Default/StaffAction.php:327 classes/Gems/User/User.php:1208
+#: classes/Gems/User/Form/OrganizationFormAbstract.php:232
msgid "Username"
msgstr "Username"
@@ -2216,6 +2580,7 @@
msgstr "You are not allowed to change this password."
#: classes/Gems/Default/SurveyAction.php:64
+#: classes/Gems/Tracker/Snippets/EditSingleSurveyTokenSnippetAbstract.php:179
msgid "Add survey"
msgstr "Add survey"
@@ -2252,10 +2617,15 @@
msgstr "Assignments of this survey to %s"
#: classes/Gems/Default/SurveyAction.php:165
+#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:173
+#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:144
+#: snippets/EditSingleSurveyTokenSnippet.php:133
+#: snippets/ShowSingleSurveyTokenSnippet.php:139
msgid "Show surveys"
msgstr "Show surveys"
#: classes/Gems/Default/SurveyAction.php:212
+#: snippets/RespondentDetailsWithAssignmentsSnippet.php:77
msgid "Assigned surveys"
msgstr "Assigned surveys"
@@ -2292,8 +2662,12 @@
msgstr "Create Single Survey"
#: classes/Gems/Default/SurveyMaintenanceAction.php:212
-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."
+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:267
msgid "Survey should be assigned to a group before making it active."
@@ -2341,6 +2715,8 @@
msgstr "This task checks all tokens for all surveys."
#: classes/Gems/Default/SurveyMaintenanceAction.php:408
+#: classes/Gems/Tracker/Form/AskTokenForm.php:98
+#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:158
msgid "OK"
msgstr "OK"
@@ -2384,10 +2760,12 @@
msgstr "Before answering"
#: classes/Gems/Default/SurveyMaintenanceAction.php:446
+#: classes/Gems/Tracker/Model/TrackModel.php:108
msgid "After completion"
msgstr "After completion"
#: classes/Gems/Default/SurveyMaintenanceAction.php:447
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:760
msgid "Answer display"
msgstr "Answer display"
@@ -2426,20 +2804,27 @@
msgstr "Not used in tracks."
#: classes/Gems/Default/TokenPlanAction.php:117
+#: classes/Gems/Snippets/TokenPlanTableSnippet.php:56
msgid "Round / Details"
msgstr "Round / Details"
#: classes/Gems/Default/TokenPlanAction.php:118
#: classes/Gems/Default/TokenPlanAction.php:233
+#: classes/Gems/Snippets/TokenPlanTableSnippet.php:57
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:385
msgid "Valid from"
msgstr "Valid from"
#: classes/Gems/Default/TokenPlanAction.php:119
#: classes/Gems/Default/TokenPlanAction.php:234
+#: classes/Gems/Snippets/TokenPlanTableSnippet.php:58
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:386
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:198
msgid "Valid until"
msgstr "Valid until"
#: classes/Gems/Default/TokenPlanAction.php:120
+#: classes/Gems/Snippets/TokenPlanTableSnippet.php:59
msgid "Contact date"
msgstr "Contact date"
@@ -2501,10 +2886,14 @@
msgstr "Yet to Answer"
#: classes/Gems/Default/TokenPlanAction.php:326
+#: classes/Gems/Selector/TokenByGroupDateSelector.php:139
msgid "Answered"
msgstr "Answered"
#: classes/Gems/Default/TokenPlanAction.php:327
+#: classes/Gems/Selector/TokenByGroupDateSelector.php:129
+#: classes/Gems/Tracker/Token.php:994
+#: snippets/RespondentTokenTabsSnippet.php:68
msgid "Missed"
msgstr "Missed"
@@ -2517,11 +2906,16 @@
msgstr "(all staff)"
#: classes/Gems/Default/TokenPlanAction.php:471
+#: classes/Gems/Snippets/TokenModelSnippetAbstract.php:59
+#: classes/Gems/Snippets/TokenPlanTableSnippet.php:122
+#: snippets/BrowseSingleSurveyTokenSnippet.php:147
+#: snippets/TrackTokenOverviewSnippet.php:98
msgid "+"
msgstr "+"
#: classes/Gems/Default/TokenPlanAction.php:480
#: classes/Gems/Default/TrackAction.php:450
+#: classes/Gems/Tracker/Snippets/EditTokenSnippetAbstract.php:141
msgid "token"
msgid_plural "tokens"
msgstr[0] "token"
@@ -2532,20 +2926,31 @@
msgstr "Token planning"
#: classes/Gems/Default/TrackAction.php:122
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:208
+#: snippets/DeleteInSourceTrackSnippet.php:83 snippets/EditTrackSnippet.php:73
msgid "Respondent name"
msgstr "Patient name"
#: classes/Gems/Default/TrackAction.php:172
+#: snippets/ShowTrackUsageSnippet.php:114
#, php-format
msgid "Assignments of this track to %s"
msgstr "Assignments of this track to %s"
#: classes/Gems/Default/TrackAction.php:269
#: classes/Gems/Default/TrackAction.php:282
+#: snippets/DeleteInSourceTrackSnippet.php:131
+#: snippets/DeleteTrackTokenSnippet.php:194 snippets/EditTrackSnippet.php:109
+#: snippets/ShowTrackTokenSnippet.php:147
msgid "Show tracks"
msgstr "Show tracks"
#: classes/Gems/Default/TrackAction.php:274
+#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:171
+#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:142
+#: snippets/DeleteTrackTokenSnippet.php:192
+#: snippets/EditTrackTokenSnippet.php:141
+#: snippets/ShowTrackTokenSnippet.php:163
msgid "Show token"
msgstr "Show token"
@@ -2558,11 +2963,17 @@
msgstr "Track was already deleted."
#: classes/Gems/Default/TrackAction.php:395
+#: snippets/DeleteInSourceTrackSnippet.php:143
+#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:185
+#: snippets/DeleteTrackTokenSnippet.php:206
#, php-format
msgid "Delete %s!"
msgstr "Delete %s!"
#: classes/Gems/Default/TrackAction.php:399
+#: snippets/DeleteInSourceTrackSnippet.php:158
+#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:200
+#: snippets/DeleteTrackTokenSnippet.php:221
#, php-format
msgid "Watch out! You cannot undo a %s deletion!"
msgstr "Watch out! You cannot undo a %s deletion!"
@@ -2576,6 +2987,7 @@
msgstr "Delete track"
#: classes/Gems/Default/TrackAction.php:461
+#: snippets/RespondentDetailsWithAssignmentsSnippet.php:86
msgid "Assigned tracks"
msgstr "Assigned tracks"
@@ -2585,6 +2997,8 @@
msgstr "%s track for patient nr %s"
#: classes/Gems/Default/TrackAction.php:543
+#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:184
+#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:234
msgid "Add track"
msgstr "Add ...
[truncated message content] |
|
From: <gem...@li...> - 2012-10-11 12:15:07
|
Revision: 978
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=978&view=rev
Author: matijsdejong
Date: 2012-10-11 12:14:57 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
Switching organizations now switches organization search term in auto search from the old organization to the new organization.
Modified Paths:
--------------
trunk/library/classes/Gems/Default/OrganizationAction.php
trunk/library/classes/Gems/User/User.php
Modified: trunk/library/classes/Gems/Default/OrganizationAction.php
===================================================================
--- trunk/library/classes/Gems/Default/OrganizationAction.php 2012-10-10 18:00:13 UTC (rev 977)
+++ trunk/library/classes/Gems/Default/OrganizationAction.php 2012-10-11 12:14:57 UTC (rev 978)
@@ -74,14 +74,22 @@
$user = $this->loader->getCurrentUser();
$request = $this->getRequest();
$orgId = urldecode($request->getParam('org'));
- $url = base64_decode($request->getParam('current_uri'));
+ $oldOrg = $user->getCurrentOrganizationId();
+ $origUrl = base64_decode($request->getParam('current_uri'));
$allowedOrganizations = $user->getAllowedOrganizations();
if (isset($allowedOrganizations[$orgId])) {
$user->setCurrentOrganization($orgId);
- if ($url) {
- $this->getResponse()->setRedirect($url);
+ if ($origUrl) {
+ foreach ($user->possibleOrgIds as $key) {
+ $finds[] = '/' . $key. '/' . $oldOrg;
+ $replaces[] = '/' . $key. '/' . $orgId;
+ }
+ $correctUrl = str_replace($finds, $replaces, $origUrl);
+ // MUtil_Echo::track($origUrl, $correctUrl);
+
+ $this->getResponse()->setRedirect($correctUrl);
} else {
$user->gotoStartPage($this->menu, $request);
}
Modified: trunk/library/classes/Gems/User/User.php
===================================================================
--- trunk/library/classes/Gems/User/User.php 2012-10-10 18:00:13 UTC (rev 977)
+++ trunk/library/classes/Gems/User/User.php 2012-10-11 12:14:57 UTC (rev 978)
@@ -94,7 +94,17 @@
protected $failureIgnoreTime = 600;
/**
+ * Array containing the parameter names that may point to an organization
*
+ * @var array
+ */
+ public $possibleOrgIds = array(
+ MUtil_Model::REQUEST_ID2,
+ 'gr2o_id_organization',
+ 'gto_id_organization');
+
+ /**
+ *
* @var Gems_Project_ProjectSettings
*/
protected $project;
@@ -1376,15 +1386,11 @@
if ($requestCache = $this->session->requestCache) {
//Create the list of request cache keys that match an organization ID (to be extended)
- $possibleOrgIds = array(
- MUtil_Model::REQUEST_ID2,
- 'gr2o_id_organization',
- 'gto_id_organization');
-
foreach ($requestCache as $key => $value) {
if (is_array($value)) {
foreach ($value as $paramKey => $paramValue) {
- if (in_array($paramKey, $possibleOrgIds)) {
+ if (in_array($paramKey, $this->possibleOrgIds)) {
+
if ($paramValue == $oldOrganizationId) {
$requestCache[$key][$paramKey] = $organizationId;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-10-10 18:00:24
|
Revision: 977
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=977&view=rev
Author: matijsdejong
Date: 2012-10-10 18:00:13 +0000 (Wed, 10 Oct 2012)
Log Message:
-----------
Ronde information shown in larger font
Modified Paths:
--------------
trunk/library/snippets/Track/Token/ShowAllOpenSnippet.php
Modified: trunk/library/snippets/Track/Token/ShowAllOpenSnippet.php
===================================================================
--- trunk/library/snippets/Track/Token/ShowAllOpenSnippet.php 2012-10-10 17:43:44 UTC (rev 976)
+++ trunk/library/snippets/Track/Token/ShowAllOpenSnippet.php 2012-10-10 18:00:13 UTC (rev 977)
@@ -157,7 +157,7 @@
$lastRound = $row['gto_round_description'];
$div = $html->div();
$div->class = 'askRound';
- $div->append(sprintf($this->_('Round: %s'), $row['gto_round_description']));
+ $div->strong(sprintf($this->_('Round: %s'), $row['gto_round_description']));
$div->br();
}
$token = $tracker->getToken($row);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-10-10 17:43:51
|
Revision: 976
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=976&view=rev
Author: matijsdejong
Date: 2012-10-10 17:43:44 +0000 (Wed, 10 Oct 2012)
Log Message:
-----------
If you have multi org rights and login as an organization that has patients, that organization is selected by default in the respondent overview
Modified Paths:
--------------
trunk/library/classes/Gems/Default/RespondentAction.php
Modified: trunk/library/classes/Gems/Default/RespondentAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RespondentAction.php 2012-10-10 16:00:45 UTC (rev 975)
+++ trunk/library/classes/Gems/Default/RespondentAction.php 2012-10-10 17:43:44 UTC (rev 976)
@@ -115,7 +115,7 @@
protected function addFormElements(MUtil_Model_FormBridge $bridge, MUtil_Model_ModelAbstract $model, array $data, $new = false)
{
$returnValues = array();
-
+
if (APPLICATION_ENV !== 'production') {
$bsn = new MUtil_Validate_Dutch_Burgerservicenummer();
$num = mt_rand(100000000, 999999999);
@@ -353,6 +353,28 @@
}
/**
+ * Returns the default search values for this class instance.
+ *
+ * Used to specify the filter when no values have been entered by the user.
+ *
+ * @return array
+ */
+ public function getDefaultSearchData()
+ {
+ if ($this->getModel()->isMultiOrganization()) {
+ $user = $this->loader->getCurrentUser();
+
+ $orgId = $user->getCurrentOrganizationId();
+ $orgs = $user->getRespondentOrganizations();
+
+ if (isset($orgs[$orgId])) {
+ return array(MUtil_Model::REQUEST_ID2 => $orgId);
+ }
+ }
+ return parent::getDefaultSearchData();
+ }
+
+ /**
* Returns the currently used organization
*
* @param int $default Optional default value
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-10-10 16:00:55
|
Revision: 975
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=975&view=rev
Author: matijsdejong
Date: 2012-10-10 16:00:45 +0000 (Wed, 10 Oct 2012)
Log Message:
-----------
Track end dates can now be edited and are shown
Modified Paths:
--------------
trunk/library/classes/Gems/Default/TrackActionAbstract.php
trunk/library/classes/Gems/Tracker/RespondentTrack.php
trunk/library/classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php
trunk/library/languages/default-en.mo
trunk/library/languages/default-en.po
trunk/library/languages/default-nl.mo
trunk/library/languages/default-nl.po
trunk/library/snippets/EditTrackSnippet.php
Modified: trunk/library/classes/Gems/Default/TrackActionAbstract.php
===================================================================
--- trunk/library/classes/Gems/Default/TrackActionAbstract.php 2012-10-09 08:31:04 UTC (rev 974)
+++ trunk/library/classes/Gems/Default/TrackActionAbstract.php 2012-10-10 16:00:45 UTC (rev 975)
@@ -208,6 +208,9 @@
'dateFormat', 'dd-MM-yyyy',
'formatFunction', $this->util->getTranslated()->formatDate,
'default', new Zend_Date());
+ $model->set('gr2t_end_date', 'label', $this->_('Ending on'),
+ 'dateFormat', 'dd-MM-yyyy',
+ 'formatFunction', $this->util->getTranslated()->formatDate);
$model->set('gr2t_reception_code');
$model->set('gr2t_comment', 'label', $this->_('Comment'));
Modified: trunk/library/classes/Gems/Tracker/RespondentTrack.php
===================================================================
--- trunk/library/classes/Gems/Tracker/RespondentTrack.php 2012-10-09 08:31:04 UTC (rev 974)
+++ trunk/library/classes/Gems/Tracker/RespondentTrack.php 2012-10-10 16:00:45 UTC (rev 975)
@@ -146,8 +146,11 @@
//Handle TrackCompletionEvent, send only changed fields in $values array
$this->tracker->filterChangesOnly($this->_respTrackData, $values);
$this->handleTrackCompletion($values, $userId);
- } else {
- $values['gr2t_end_date'] = null;
+ // } else {
+ // NOTE: end date should not be set to null if already set, i.e. the end date should not change
+ // as it is sometimes set manually or by calculation and rounds can use the date for calculation
+ // (Matijs, 10 October 2012)
+ // $values['gr2t_end_date'] = null;
}
return $this->_updateTrack($values, $userId);
@@ -228,6 +231,7 @@
private function _updateTrack(array $values, $userId)
{
+ // MUtil_Echo::track($values);
if ($this->tracker->filterChangesOnly($this->_respTrackData, $values)) {
$where = $this->db->quoteInto('gr2t_id_respondent_track = ?', $this->_respTrackId);
@@ -247,6 +251,7 @@
}
$this->_respTrackData = $values + $this->_respTrackData;
+ // MUtil_Echo::track($values);
// return 1;
return $this->db->update('gems__respondent2track', $values, $where);
@@ -671,6 +676,20 @@
}
/**
+ * Set the end date for this respondent track.
+ *
+ * @param mixed $endDate The new end date for this track
+ * @param int $userId The current user
+ * @return int 1 if the token has changed, 0 otherwise
+ */
+ public function setEndDate($endDate, $userId)
+ {
+ $values['gr2t_end_date'] = $endDate;
+
+ return $this->_updateTrack($values, $userId);
+ }
+
+ /**
* Set the reception code for this respondent track and make sure the
* necessary cascade to the tokens and thus the source takes place.
*
Modified: trunk/library/classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php 2012-10-09 08:31:04 UTC (rev 974)
+++ trunk/library/classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php 2012-10-10 16:00:45 UTC (rev 975)
@@ -153,6 +153,10 @@
'dateFormat', 'dd-MM-yyyy',
'formatFunction', $this->loader->getUtil()->getTranslated()->formatDate,
'default', new Zend_Date());
+ $model->set('gr2t_end_date', 'label', $this->_('Ending on'),
+ 'dateFormat', 'dd-MM-yyyy',
+ 'formatFunction', $this->loader->getUtil()->getTranslated()->formatDate,
+ 'default', new Zend_Date());
$model->set('gr2t_reception_code');
$model->set('gr2t_comment', 'label', $this->_('Comment'));
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2012-10-09 08:31:04 UTC (rev 974)
+++ trunk/library/languages/default-en.po 2012-10-10 16:00:45 UTC (rev 975)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-24 11:55+0100\n"
+"POT-Creation-Date: 2012-10-10 17:58+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -495,69 +495,69 @@
msgid "Edit %s"
msgstr "Edit %s"
-#: classes/Gems/Controller/BrowseEditAction.php:514
+#: classes/Gems/Controller/BrowseEditAction.php:516
msgid "Free search text"
msgstr "Free search text"
-#: classes/Gems/Controller/BrowseEditAction.php:585
+#: classes/Gems/Controller/BrowseEditAction.php:587
msgid "Search"
msgstr "Search"
-#: classes/Gems/Controller/BrowseEditAction.php:601
+#: classes/Gems/Controller/BrowseEditAction.php:603
#, php-format
msgid "No %s found"
msgstr "No %s found"
-#: classes/Gems/Controller/BrowseEditAction.php:685
+#: classes/Gems/Controller/BrowseEditAction.php:690
#, php-format
msgid "No %s found."
msgstr "No %s found."
-#: classes/Gems/Controller/BrowseEditAction.php:803
+#: classes/Gems/Controller/BrowseEditAction.php:805
msgid "Are you sure?"
msgstr "Are you sure?"
-#: classes/Gems/Controller/BrowseEditAction.php:819
+#: classes/Gems/Controller/BrowseEditAction.php:821
msgid "Yes"
msgstr "Yes"
-#: classes/Gems/Controller/BrowseEditAction.php:820
+#: classes/Gems/Controller/BrowseEditAction.php:822
msgid "No"
msgstr "No"
-#: classes/Gems/Controller/BrowseEditAction.php:873
+#: classes/Gems/Controller/BrowseEditAction.php:875
#, php-format
msgid "Unknown %s requested"
msgstr "Unknown %s requested"
-#: classes/Gems/Controller/BrowseEditAction.php:896
+#: classes/Gems/Controller/BrowseEditAction.php:898
#, php-format
msgid "New %1$s..."
msgstr "New %1$s..."
-#: classes/Gems/Controller/BrowseEditAction.php:904
+#: classes/Gems/Controller/BrowseEditAction.php:906
msgid "Save"
msgstr "Save"
-#: classes/Gems/Controller/BrowseEditAction.php:940
+#: classes/Gems/Controller/BrowseEditAction.php:942
#, php-format
msgid "%2$u %1$s saved"
msgstr "%2$u %1$s saved"
-#: classes/Gems/Controller/BrowseEditAction.php:943
+#: classes/Gems/Controller/BrowseEditAction.php:945
msgid "No changes to save."
msgstr "No changes to save."
-#: classes/Gems/Controller/BrowseEditAction.php:952
+#: classes/Gems/Controller/BrowseEditAction.php:954
msgid "Input error! No changes saved!"
msgstr "Input error! No changes saved!"
-#: classes/Gems/Controller/BrowseEditAction.php:980
+#: classes/Gems/Controller/BrowseEditAction.php:982
#, php-format
msgid "Show %s"
msgstr "Show %s"
-#: classes/Gems/Controller/BrowseEditAction.php:987
+#: classes/Gems/Controller/BrowseEditAction.php:989
#, php-format
msgid "Unknown %s."
msgstr "Unknown %s."
@@ -651,7 +651,7 @@
msgstr "The survey for token %s is no longer active."
#: classes/Gems/Default/ConsentAction.php:68
-#: classes/Gems/Default/GroupAction.php:88
+#: classes/Gems/Default/GroupAction.php:116
msgid "Description"
msgstr "Description"
@@ -710,15 +710,15 @@
msgid "Links concerning this web application:"
msgstr "Links concerning this web application:"
-#: classes/Gems/Default/CronAction.php:148
+#: classes/Gems/Default/CronAction.php:133
msgid "Cron jobs turned off."
msgstr "Cron jobs turned off."
-#: classes/Gems/Default/CronAction.php:223
+#: classes/Gems/Default/CronAction.php:192
msgid "No mails sent."
msgstr "No mails sent."
-#: classes/Gems/Default/CronAction.php:226
+#: classes/Gems/Default/CronAction.php:195
msgid "On this test system all mail will be delivered to the from address."
msgstr "On this test system all mail will be delivered to the from address."
@@ -1020,30 +1020,34 @@
msgid "Export data"
msgstr "Export data"
-#: classes/Gems/Default/GroupAction.php:89
+#: classes/Gems/Default/GroupAction.php:71
+msgid "Can be assigned to"
+msgstr "Can be assigned to"
+
+#: classes/Gems/Default/GroupAction.php:117
#: classes/Gems/Default/LogAction.php:201
msgid "Role"
msgstr "Role"
-#: classes/Gems/Default/GroupAction.php:92
+#: classes/Gems/Default/GroupAction.php:120
msgid "Active"
msgstr "Active"
-#: classes/Gems/Default/GroupAction.php:97
+#: classes/Gems/Default/GroupAction.php:125
msgid "Allowed IP Ranges"
msgstr "Allowed IP Ranges"
-#: classes/Gems/Default/GroupAction.php:98
+#: classes/Gems/Default/GroupAction.php:126
msgid "Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)"
msgstr "Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)"
-#: classes/Gems/Default/GroupAction.php:108
+#: classes/Gems/Default/GroupAction.php:136
msgid "group"
msgid_plural "groups"
msgstr[0] "group"
msgstr[1] "groups"
-#: classes/Gems/Default/GroupAction.php:113
+#: classes/Gems/Default/GroupAction.php:141
msgid "Administrative groups"
msgstr "Administrative groups"
@@ -1779,10 +1783,6 @@
msgid "Track %s does not exist."
msgstr "Track %s does not exist."
-#: classes/Gems/Default/ReceptionAction.php:55
-msgid "Can be assigned to"
-msgstr "Can be assigned to"
-
#: classes/Gems/Default/ReceptionAction.php:56
msgid "Additional action"
msgstr "Additional action"
@@ -1795,55 +1795,55 @@
msgid "Is success code"
msgstr "Is success code"
-#: classes/Gems/Default/ReceptionAction.php:87
+#: classes/Gems/Default/ReceptionAction.php:86
msgid "This reception code is a success code."
msgstr "This reception code is a success code."
-#: classes/Gems/Default/ReceptionAction.php:91
+#: classes/Gems/Default/ReceptionAction.php:90
msgid "Only active codes can be selected."
msgstr "Only active codes can be selected."
-#: classes/Gems/Default/ReceptionAction.php:92
+#: classes/Gems/Default/ReceptionAction.php:91
msgid "For respondents"
msgstr "For patients"
-#: classes/Gems/Default/ReceptionAction.php:95
+#: classes/Gems/Default/ReceptionAction.php:94
msgid "This reception code can be assigned to a respondent."
msgstr "This reception code can be assigned to a patient."
-#: classes/Gems/Default/ReceptionAction.php:96
+#: classes/Gems/Default/ReceptionAction.php:95
msgid "For tracks"
msgstr "For tracks"
-#: classes/Gems/Default/ReceptionAction.php:99
+#: classes/Gems/Default/ReceptionAction.php:98
msgid "This reception code can be assigned to a track."
msgstr "This reception code can be assigned to a track."
-#: classes/Gems/Default/ReceptionAction.php:100
+#: classes/Gems/Default/ReceptionAction.php:99
msgid "For surveys"
msgstr "For surveys"
-#: classes/Gems/Default/ReceptionAction.php:102
+#: classes/Gems/Default/ReceptionAction.php:101
msgid "This reception code can be assigned to a survey."
msgstr "This reception code can be assigned to a survey."
-#: classes/Gems/Default/ReceptionAction.php:103
+#: classes/Gems/Default/ReceptionAction.php:102
msgid "Redo survey"
msgstr "Redo survey"
-#: classes/Gems/Default/ReceptionAction.php:105
+#: classes/Gems/Default/ReceptionAction.php:104
msgid "Redo a survey on this reception code."
msgstr "Redo a survey on this reception code."
-#: classes/Gems/Default/ReceptionAction.php:106
+#: classes/Gems/Default/ReceptionAction.php:105
msgid "Overwrite ansers"
msgstr "Overwrite ansers"
-#: classes/Gems/Default/ReceptionAction.php:109
+#: classes/Gems/Default/ReceptionAction.php:108
msgid "Remove the consent from already answered surveys."
msgstr "Remove the consent from already answered surveys."
-#: classes/Gems/Default/ReceptionAction.php:127
+#: classes/Gems/Default/ReceptionAction.php:126
msgid "reception code"
msgid_plural "reception codes"
msgstr[0] "reception code"
@@ -2279,149 +2279,149 @@
msgid "Single Survey Assignment"
msgstr "Single Survey Assignment"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:200
+#: classes/Gems/Default/SurveyMaintenanceAction.php:201
msgid "Assignable since"
msgstr "Assignable since"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:201
+#: classes/Gems/Default/SurveyMaintenanceAction.php:202
msgid "Assignable until"
msgstr "Assignable until"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:207
+#: classes/Gems/Default/SurveyMaintenanceAction.php:208
msgid "Create Single Survey"
msgstr "Create Single Survey"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:211
+#: classes/Gems/Default/SurveyMaintenanceAction.php:212
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:296
+#: classes/Gems/Default/SurveyMaintenanceAction.php:297
#, php-format
msgid "Answered surveys: %d."
msgstr "Answered surveys: %d."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:297
+#: classes/Gems/Default/SurveyMaintenanceAction.php:298
#, php-format
msgid "Average answer time: %s."
msgstr "Average answer time: %s."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:298
+#: classes/Gems/Default/SurveyMaintenanceAction.php:299
#, php-format
msgid "Standard deviation: %s."
msgstr "Standard deviation: %s."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:314
+#: classes/Gems/Default/SurveyMaintenanceAction.php:315
#, php-format
msgid "Median value: %s."
msgstr "Median value: %s."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:321
+#: classes/Gems/Default/SurveyMaintenanceAction.php:322
msgid "incalculable"
msgstr "incalculable"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:334
+#: classes/Gems/Default/SurveyMaintenanceAction.php:335
#, php-format
msgid "Checking survey results for the %s survey."
msgstr "Checking survey results for the %s survey."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:338
+#: classes/Gems/Default/SurveyMaintenanceAction.php:339
msgid "This task checks all tokens for this survey."
msgstr "This task checks all tokens for this survey."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:348
+#: classes/Gems/Default/SurveyMaintenanceAction.php:349
msgid "Checking survey results for all surveys."
msgstr "Checking survey results for all surveys."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:351
+#: classes/Gems/Default/SurveyMaintenanceAction.php:352
msgid "This task checks all tokens for all surveys."
msgstr "This task checks all tokens for all surveys."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:407
+#: classes/Gems/Default/SurveyMaintenanceAction.php:408
msgid "OK"
msgstr "OK"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:415
+#: classes/Gems/Default/SurveyMaintenanceAction.php:416
msgid "Source"
msgstr "Source"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:417
-#: classes/Gems/Default/SurveyMaintenanceAction.php:440
+#: classes/Gems/Default/SurveyMaintenanceAction.php:418
+#: classes/Gems/Default/SurveyMaintenanceAction.php:441
msgid "Duration description"
msgstr "Duration description"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:417
-#: classes/Gems/Default/SurveyMaintenanceAction.php:440
+#: classes/Gems/Default/SurveyMaintenanceAction.php:418
+#: classes/Gems/Default/SurveyMaintenanceAction.php:441
msgid "Text to inform the respondent, e.g. \"20 seconds\" or \"1 minute\"."
msgstr "Text to inform the respondent, e.g. \"20 seconds\" or \"1 minute\"."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:419
+#: classes/Gems/Default/SurveyMaintenanceAction.php:420
msgid "Status in source"
msgstr "Status in source"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:422
+#: classes/Gems/Default/SurveyMaintenanceAction.php:423
msgid "Active in source"
msgstr "Active in source"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:423
+#: classes/Gems/Default/SurveyMaintenanceAction.php:424
#, php-format
msgid "Active in %s"
msgstr "Active in %s"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:430
+#: classes/Gems/Default/SurveyMaintenanceAction.php:431
msgid "Single"
msgstr "Single"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:439
+#: classes/Gems/Default/SurveyMaintenanceAction.php:440
msgid "Result field"
msgstr "Result field"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:444
+#: classes/Gems/Default/SurveyMaintenanceAction.php:445
msgid "Before answering"
msgstr "Before answering"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:445
+#: classes/Gems/Default/SurveyMaintenanceAction.php:446
msgid "After completion"
msgstr "After completion"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:446
+#: classes/Gems/Default/SurveyMaintenanceAction.php:447
msgid "Answer display"
msgstr "Answer display"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:475
+#: classes/Gems/Default/SurveyMaintenanceAction.php:476
msgid "(all groups)"
msgstr "(all groups)"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:481
+#: classes/Gems/Default/SurveyMaintenanceAction.php:482
msgid "OK in source, not active"
msgstr "OK in source, not active"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:482
+#: classes/Gems/Default/SurveyMaintenanceAction.php:483
msgid "Blocked in source"
msgstr "Blocked in source"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:484
+#: classes/Gems/Default/SurveyMaintenanceAction.php:485
msgid "(every state)"
msgstr "(every state)"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:543
+#: classes/Gems/Default/SurveyMaintenanceAction.php:544
#, php-format
msgid "%d times in track."
msgstr "%d times in track."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:545
+#: classes/Gems/Default/SurveyMaintenanceAction.php:546
#, php-format
msgid "%d times in %d track(s)."
msgstr "%d times in %d track(s)."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:549
+#: classes/Gems/Default/SurveyMaintenanceAction.php:550
msgid "Not used in track."
msgstr "Not used in track."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:551
+#: classes/Gems/Default/SurveyMaintenanceAction.php:552
msgid "Not used in tracks."
msgstr "Not used in tracks."
@@ -2622,26 +2622,30 @@
msgid "Start"
msgstr "Start"
-#: classes/Gems/Default/TrackActionAbstract.php:212
+#: classes/Gems/Default/TrackActionAbstract.php:211
+msgid "Ending on"
+msgstr "Ending on"
+
+#: classes/Gems/Default/TrackActionAbstract.php:215
msgid "Comment"
msgstr "Comment"
-#: classes/Gems/Default/TrackActionAbstract.php:299
+#: classes/Gems/Default/TrackActionAbstract.php:302
#, php-format
msgid "Email %s %s"
msgstr "Email %s %s"
-#: classes/Gems/Default/TrackActionAbstract.php:305
+#: classes/Gems/Default/TrackActionAbstract.php:308
#, php-format
msgid "%s %s not found."
msgstr "%s %s not found."
-#: classes/Gems/Default/TrackActionAbstract.php:482
+#: classes/Gems/Default/TrackActionAbstract.php:485
#, php-format
msgid "Overview of %s track for respondent %s"
msgstr "Overview of %s track for patient %s"
-#: classes/Gems/Default/TrackActionAbstract.php:486
+#: classes/Gems/Default/TrackActionAbstract.php:489
msgid "This track is currently not assigned to this respondent."
msgstr "This track is currently not assigned to this patient."
@@ -3099,7 +3103,7 @@
msgstr "Synchronize surveys"
#: classes/Gems/Menu/MenuAbstract.php:439
-#: classes/Gems/Menu/MenuAbstract.php:451
+#: classes/Gems/Menu/MenuAbstract.php:452
msgid "Check is answered"
msgstr "Check is answered"
@@ -3112,19 +3116,19 @@
msgstr "Synchronize all surveys"
#: classes/Gems/Menu/MenuAbstract.php:442
-#: classes/Gems/Menu/MenuAbstract.php:452
+#: classes/Gems/Menu/MenuAbstract.php:453
msgid "Check all is answered"
msgstr "Check all is answered"
-#: classes/Gems/Menu/MenuAbstract.php:448
+#: classes/Gems/Menu/MenuAbstract.php:449
msgid "PDF"
msgstr "PDF"
-#: classes/Gems/Menu/MenuAbstract.php:486
+#: classes/Gems/Menu/MenuAbstract.php:487
msgid "Check assignments"
msgstr "Check assignments"
-#: classes/Gems/Menu/MenuAbstract.php:489
+#: classes/Gems/Menu/MenuAbstract.php:490
msgid "Check all assignments"
msgstr "Check all assignments"
@@ -3447,6 +3451,7 @@
msgstr "%d sources checked."
#: classes/Gems/Tracker/Engine/AnyStepEngine.php:95
+#: classes/Gems/Tracker/Engine/NextStepEngine.php:92
msgid "This round"
msgstr "This round"
@@ -3612,13 +3617,11 @@
msgstr "Answers for token %s, patient number %s: %s."
#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:255
-#: classes/Gems/Tracker/Snippets/EditTokenSnippetAbstract.php:124
#, php-format
msgid "Token %s not found."
msgstr "Token %s not found."
#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:259
-#: classes/Gems/Tracker/Snippets/EditTokenSnippetAbstract.php:128
msgid "No token specified."
msgstr "No token specified."
@@ -3976,7 +3979,6 @@
msgstr "Your birthday"
#: classes/Gems/User/User.php:1193
-#: classes/Gems/User/Form/ChangePasswordForm.php:163
#, php-format
msgid "%s is not correct."
msgstr "%s is not correct."
@@ -4057,11 +4059,11 @@
msgid "User not found or no e-mail address known or user cannot be reset."
msgstr "User not found or no e-mail address known or user cannot be reset."
-#: classes/Gems/Util/DbLookup.php:376
+#: classes/Gems/Util/DbLookup.php:415
msgid "inactive"
msgstr "inactive"
-#: classes/Gems/Util/DbLookup.php:377
+#: classes/Gems/Util/DbLookup.php:416
msgid "source inactive"
msgstr "source inactive"
@@ -4445,6 +4447,7 @@
msgstr "Lists choices changed."
#: snippets/EditSingleSurveyTokenSnippet.php:132
+#: snippets/ShowSingleSurveyTokenSnippet.php:153
msgid "Show survey"
msgstr "Show survey"
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2012-10-09 08:31:04 UTC (rev 974)
+++ trunk/library/languages/default-nl.po 2012-10-10 16:00:45 UTC (rev 975)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-24 11:56+0100\n"
+"POT-Creation-Date: 2012-10-10 17:58+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -495,69 +495,69 @@
msgid "Edit %s"
msgstr "Bewerk %s"
-#: classes/Gems/Controller/BrowseEditAction.php:514
+#: classes/Gems/Controller/BrowseEditAction.php:516
msgid "Free search text"
msgstr "Vrije zoek tekst"
-#: classes/Gems/Controller/BrowseEditAction.php:585
+#: classes/Gems/Controller/BrowseEditAction.php:587
msgid "Search"
msgstr "Zoeken"
-#: classes/Gems/Controller/BrowseEditAction.php:601
+#: classes/Gems/Controller/BrowseEditAction.php:603
#, php-format
msgid "No %s found"
msgstr "Geen %s gevonden"
-#: classes/Gems/Controller/BrowseEditAction.php:685
+#: classes/Gems/Controller/BrowseEditAction.php:690
#, php-format
msgid "No %s found."
msgstr "Geen %s gevonden."
-#: classes/Gems/Controller/BrowseEditAction.php:803
+#: classes/Gems/Controller/BrowseEditAction.php:805
msgid "Are you sure?"
msgstr "Weet u het zeker?"
-#: classes/Gems/Controller/BrowseEditAction.php:819
+#: classes/Gems/Controller/BrowseEditAction.php:821
msgid "Yes"
msgstr "Ja"
-#: classes/Gems/Controller/BrowseEditAction.php:820
+#: classes/Gems/Controller/BrowseEditAction.php:822
msgid "No"
msgstr "Nee"
-#: classes/Gems/Controller/BrowseEditAction.php:873
+#: classes/Gems/Controller/BrowseEditAction.php:875
#, php-format
msgid "Unknown %s requested"
msgstr "Onjuist %s verzoek"
-#: classes/Gems/Controller/BrowseEditAction.php:896
+#: classes/Gems/Controller/BrowseEditAction.php:898
#, php-format
msgid "New %1$s..."
msgstr "Nieuwe %1$s..."
-#: classes/Gems/Controller/BrowseEditAction.php:904
+#: classes/Gems/Controller/BrowseEditAction.php:906
msgid "Save"
msgstr "Opslaan"
-#: classes/Gems/Controller/BrowseEditAction.php:940
+#: classes/Gems/Controller/BrowseEditAction.php:942
#, php-format
msgid "%2$u %1$s saved"
msgstr "%2$u %1$s opgeslagen"
-#: classes/Gems/Controller/BrowseEditAction.php:943
+#: classes/Gems/Controller/BrowseEditAction.php:945
msgid "No changes to save."
msgstr "Geen verandering om op te slaan."
-#: classes/Gems/Controller/BrowseEditAction.php:952
+#: classes/Gems/Controller/BrowseEditAction.php:954
msgid "Input error! No changes saved!"
msgstr "Invoer fout! Veranderingen niet opgeslagen!"
-#: classes/Gems/Controller/BrowseEditAction.php:980
+#: classes/Gems/Controller/BrowseEditAction.php:982
#, php-format
msgid "Show %s"
msgstr "Toon %s"
-#: classes/Gems/Controller/BrowseEditAction.php:987
+#: classes/Gems/Controller/BrowseEditAction.php:989
#, php-format
msgid "Unknown %s."
msgstr "%s is onbekend."
@@ -651,7 +651,7 @@
msgstr "De vragenlijst voor kenmerk %s is niet meer in gebruik."
#: classes/Gems/Default/ConsentAction.php:68
-#: classes/Gems/Default/GroupAction.php:88
+#: classes/Gems/Default/GroupAction.php:116
msgid "Description"
msgstr "Omschrijving"
@@ -710,15 +710,15 @@
msgid "Links concerning this web application:"
msgstr "Links met informatie over deze website:"
-#: classes/Gems/Default/CronAction.php:148
+#: classes/Gems/Default/CronAction.php:133
msgid "Cron jobs turned off."
msgstr "Cron opdrachten uitgezet."
-#: classes/Gems/Default/CronAction.php:223
+#: classes/Gems/Default/CronAction.php:192
msgid "No mails sent."
msgstr "Geen mail verzonden."
-#: classes/Gems/Default/CronAction.php:226
+#: classes/Gems/Default/CronAction.php:195
msgid "On this test system all mail will be delivered to the from address."
msgstr "Op dit test systeem worden alle emails gestuurd naar het \"van\" adres."
@@ -1020,30 +1020,34 @@
msgid "Export data"
msgstr "Exporteer gegevens"
-#: classes/Gems/Default/GroupAction.php:89
+#: classes/Gems/Default/GroupAction.php:71
+msgid "Can be assigned to"
+msgstr "Kan toegewezen worden aan"
+
+#: classes/Gems/Default/GroupAction.php:117
#: classes/Gems/Default/LogAction.php:201
msgid "Role"
msgstr "Rol"
-#: classes/Gems/Default/GroupAction.php:92
+#: classes/Gems/Default/GroupAction.php:120
msgid "Active"
msgstr "Actief"
-#: classes/Gems/Default/GroupAction.php:97
+#: classes/Gems/Default/GroupAction.php:125
msgid "Allowed IP Ranges"
msgstr "Toegestane IP adres reeksen"
-#: classes/Gems/Default/GroupAction.php:98
+#: classes/Gems/Default/GroupAction.php:126
msgid "Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)"
msgstr "Scheiden met | voorbeeld: 10.0.0.0-10.0.0.255 (subnet masks worden niet ondersteund)"
-#: classes/Gems/Default/GroupAction.php:108
+#: classes/Gems/Default/GroupAction.php:136
msgid "group"
msgid_plural "groups"
msgstr[0] "groep"
msgstr[1] "groepen"
-#: classes/Gems/Default/GroupAction.php:113
+#: classes/Gems/Default/GroupAction.php:141
msgid "Administrative groups"
msgstr "Beheer groepen"
@@ -1779,10 +1783,6 @@
msgid "Track %s does not exist."
msgstr "Trajectnummer %s bestaat niet."
-#: classes/Gems/Default/ReceptionAction.php:55
-msgid "Can be assigned to"
-msgstr "Kan toegewezen worden aan"
-
#: classes/Gems/Default/ReceptionAction.php:56
msgid "Additional action"
msgstr "Aanvullende actie"
@@ -1795,55 +1795,55 @@
msgid "Is success code"
msgstr "Is succes code"
-#: classes/Gems/Default/ReceptionAction.php:87
+#: classes/Gems/Default/ReceptionAction.php:86
msgid "This reception code is a success code."
msgstr "Aanzetten als deze ontvangst code positief is."
-#: classes/Gems/Default/ReceptionAction.php:91
+#: classes/Gems/Default/ReceptionAction.php:90
msgid "Only active codes can be selected."
msgstr "Alleen actieve codes kunnen geselecteerd worden."
-#: classes/Gems/Default/ReceptionAction.php:92
+#: classes/Gems/Default/ReceptionAction.php:91
msgid "For respondents"
msgstr "Voor patiënten"
-#: classes/Gems/Default/ReceptionAction.php:95
+#: classes/Gems/Default/ReceptionAction.php:94
msgid "This reception code can be assigned to a respondent."
msgstr "Deze ontvangstcode kan aan een patiënt toegewezen worden."
-#: classes/Gems/Default/ReceptionAction.php:96
+#: classes/Gems/Default/ReceptionAction.php:95
msgid "For tracks"
msgstr "Voor trajecten"
-#: classes/Gems/Default/ReceptionAction.php:99
+#: classes/Gems/Default/ReceptionAction.php:98
msgid "This reception code can be assigned to a track."
msgstr "Deze ontvangstcode kan aan een traject toegewezen worden."
-#: classes/Gems/Default/ReceptionAction.php:100
+#: classes/Gems/Default/ReceptionAction.php:99
msgid "For surveys"
msgstr "Voor vragenlijsten"
-#: classes/Gems/Default/ReceptionAction.php:102
+#: classes/Gems/Default/ReceptionAction.php:101
msgid "This reception code can be assigned to a survey."
msgstr "Deze ontvangstcode kan aan een vragenlijst toegewezen worden."
-#: classes/Gems/Default/ReceptionAction.php:103
+#: classes/Gems/Default/ReceptionAction.php:102
msgid "Redo survey"
msgstr "Vragenlijsten herhalen"
-#: classes/Gems/Default/ReceptionAction.php:105
+#: classes/Gems/Default/ReceptionAction.php:104
msgid "Redo a survey on this reception code."
msgstr "Herhaal vragenlijst bij deze ontvangstcode."
-#: classes/Gems/Default/ReceptionAction.php:106
+#: classes/Gems/Default/ReceptionAction.php:105
msgid "Overwrite ansers"
msgstr "Overschrijf bestaande antwoorden"
-#: classes/Gems/Default/ReceptionAction.php:109
+#: classes/Gems/Default/ReceptionAction.php:108
msgid "Remove the consent from already answered surveys."
msgstr "Verwijder \"informed consent\" van beantwoorde vragenlijsten"
-#: classes/Gems/Default/ReceptionAction.php:127
+#: classes/Gems/Default/ReceptionAction.php:126
msgid "reception code"
msgid_plural "reception codes"
msgstr[0] "Ontvangst code"
@@ -2279,149 +2279,149 @@
msgid "Single Survey Assignment"
msgstr "Losse vragenlijst toewijzing"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:200
+#: classes/Gems/Default/SurveyMaintenanceAction.php:201
msgid "Assignable since"
msgstr "Toewijsbaar sinds"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:201
+#: classes/Gems/Default/SurveyMaintenanceAction.php:202
msgid "Assignable until"
msgstr "Toewijsbaar tot"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:207
+#: classes/Gems/Default/SurveyMaintenanceAction.php:208
msgid "Create Single Survey"
msgstr "Maak losse vragenlijst"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:211
+#: classes/Gems/Default/SurveyMaintenanceAction.php:212
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:296
+#: classes/Gems/Default/SurveyMaintenanceAction.php:297
#, php-format
msgid "Answered surveys: %d."
msgstr "Beantwoorde vragenlijsten: %d."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:297
+#: classes/Gems/Default/SurveyMaintenanceAction.php:298
#, php-format
msgid "Average answer time: %s."
msgstr "Gemiddelde antwoordtijd: %s."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:298
+#: classes/Gems/Default/SurveyMaintenanceAction.php:299
#, php-format
msgid "Standard deviation: %s."
msgstr "Standaard deviatie: %s."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:314
+#: classes/Gems/Default/SurveyMaintenanceAction.php:315
#, php-format
msgid "Median value: %s."
msgstr "Median waarde: %s."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:321
+#: classes/Gems/Default/SurveyMaintenanceAction.php:322
msgid "incalculable"
msgstr "onberekenbaar"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:334
+#: classes/Gems/Default/SurveyMaintenanceAction.php:335
#, php-format
msgid "Checking survey results for the %s survey."
msgstr "Controle op vragenlijstresultaten voor de vragenlijst '%s'."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:338
+#: classes/Gems/Default/SurveyMaintenanceAction.php:339
msgid "This task checks all tokens for this survey."
msgstr "Deze opdracht controleert alle kenmerken voor deze vragenlijst."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:348
+#: classes/Gems/Default/SurveyMaintenanceAction.php:349
msgid "Checking survey results for all surveys."
msgstr "Controle op vragenlijstresultaten voor alle vragenlijsten."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:351
+#: classes/Gems/Default/SurveyMaintenanceAction.php:352
msgid "This task checks all tokens for all surveys."
msgstr "Deze opdracht controleert alle kenmerken voor alle vragenlijsten."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:407
+#: classes/Gems/Default/SurveyMaintenanceAction.php:408
msgid "OK"
msgstr "OK"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:415
+#: classes/Gems/Default/SurveyMaintenanceAction.php:416
msgid "Source"
msgstr "Bron"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:417
-#: classes/Gems/Default/SurveyMaintenanceAction.php:440
+#: classes/Gems/Default/SurveyMaintenanceAction.php:418
+#: classes/Gems/Default/SurveyMaintenanceAction.php:441
msgid "Duration description"
msgstr "Beschrijving afnametijd"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:417
-#: classes/Gems/Default/SurveyMaintenanceAction.php:440
+#: classes/Gems/Default/SurveyMaintenanceAction.php:418
+#: classes/Gems/Default/SurveyMaintenanceAction.php:441
msgid "Text to inform the respondent, e.g. \"20 seconds\" or \"1 minute\"."
msgstr "Tekst om de patiënt te informeren, bijv. \"20 seconden\" of \"1 minuut\"."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:419
+#: classes/Gems/Default/SurveyMaintenanceAction.php:420
msgid "Status in source"
msgstr "Status in bron"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:422
+#: classes/Gems/Default/SurveyMaintenanceAction.php:423
msgid "Active in source"
msgstr "Actief in bron"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:423
+#: classes/Gems/Default/SurveyMaintenanceAction.php:424
#, php-format
msgid "Active in %s"
msgstr "Actief in %s"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:430
+#: classes/Gems/Default/SurveyMaintenanceAction.php:431
msgid "Single"
msgstr "Los"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:439
+#: classes/Gems/Default/SurveyMaintenanceAction.php:440
msgid "Result field"
msgstr "Resultaat veld"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:444
+#: classes/Gems/Default/SurveyMaintenanceAction.php:445
msgid "Before answering"
msgstr "Voor beantwoording"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:445
+#: classes/Gems/Default/SurveyMaintenanceAction.php:446
msgid "After completion"
msgstr "Na afronding"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:446
+#: classes/Gems/Default/SurveyMaintenanceAction.php:447
msgid "Answer display"
msgstr "Antwoord weergave"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:475
+#: classes/Gems/Default/SurveyMaintenanceAction.php:476
msgid "(all groups)"
msgstr "(alle groepen)"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:481
+#: classes/Gems/Default/SurveyMaintenanceAction.php:482
msgid "OK in source, not active"
msgstr "OK in bron, niet actief"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:482
+#: classes/Gems/Default/SurveyMaintenanceAction.php:483
msgid "Blocked in source"
msgstr "Gelokkeerd in bron"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:484
+#: classes/Gems/Default/SurveyMaintenanceAction.php:485
msgid "(every state)"
msgstr "(ieder status)"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:543
+#: classes/Gems/Default/SurveyMaintenanceAction.php:544
#, php-format
msgid "%d times in track."
msgstr "%d keer in traject."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:545
+#: classes/Gems/Default/SurveyMaintenanceAction.php:546
#, php-format
msgid "%d times in %d track(s)."
msgstr "%d keer in %d traject(en)."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:549
+#: classes/Gems/Default/SurveyMaintenanceAction.php:550
msgid "Not used in track."
msgstr "Niet in traject gebruikt."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:551
+#: classes/Gems/Default/SurveyMaintenanceAction.php:552
msgid "Not used in tracks."
msgstr "Niet in trajecten gebruikt."
@@ -2622,26 +2622,30 @@
msgid "Start"
msgstr "Aanvang"
-#: classes/Gems/Default/TrackActionAbstract.php:212
+#: classes/Gems/Default/TrackActionAbstract.php:211
+msgid "Ending on"
+msgstr "Afgelopen op"
+
+#: classes/Gems/Default/TrackActionAbstract.php:215
msgid "Comment"
msgstr "Opmerkingen"
-#: classes/Gems/Default/TrackActionAbstract.php:299
+#: classes/Gems/Default/TrackActionAbstract.php:302
#, php-format
msgid "Email %s %s"
msgstr "Email %s %s"
-#: classes/Gems/Default/TrackActionAbstract.php:305
+#: classes/Gems/Default/TrackActionAbstract.php:308
#, php-format
msgid "%s %s not found."
msgstr "%s %s niet gevonden."
-#: classes/Gems/Default/TrackActionAbstract.php:482
+#: classes/Gems/Default/TrackActionAbstract.php:485
#, php-format
msgid "Overview of %s track for respondent %s"
msgstr "Overzicht van het %s traject voor patiënt %s "
-#: classes/Gems/Default/TrackActionAbstract.php:486
+#: classes/Gems/Default/TrackActionAbstract.php:489
msgid "This track is currently not assigned to this respondent."
msgstr "Dit traject is nog niet aan deze patiënt toegewezen."
@@ -3099,7 +3103,7 @@
msgstr "Synchroniseer vragenlijsten"
#: classes/Gems/Menu/MenuAbstract.php:439
-#: classes/Gems/Menu/MenuAbstract.php:451
+#: classes/Gems/Menu/MenuAbstract.php:452
msgid "Check is answered"
msgstr "Controleer op antwoorden"
@@ -3112,19 +3116,19 @@
msgstr "Synchroniseer alle vragenlijsten"
#: classes/Gems/Menu/MenuAbstract.php:442
-#: classes/Gems/Menu/MenuAbstract.php:452
+#: classes/Gems/Menu/MenuAbstract.php:453
msgid "Check all is answered"
msgstr "Controleer alles op antwoorden"
-#: classes/Gems/Menu/MenuAbstract.php:448
+#: classes/Gems/Menu/MenuAbstract.php:449
msgid "PDF"
msgstr "PDF"
-#: classes/Gems/Menu/MenuAbstract.php:486
+#: classes/Gems/Menu/MenuAbstract.php:487
msgid "Check assignments"
msgstr "Controleer toewijzingen"
-#: classes/Gems/Menu/MenuAbstract.php:489
+#: classes/Gems/Menu/MenuAbstract.php:490
msgid "Check all assignments"
msgstr "Controleer alle toewijzingen"
@@ -3447,6 +3451,7 @@
msgstr "%d bronnen gecontroleerd."
#: classes/Gems/Tracker/Engine/AnyStepEngine.php:95
+#: classes/Gems/Tracker/Engine/NextStepEngine.php:92
msgid "This round"
msgstr "Deze ronde"
@@ -3612,13 +3617,11 @@
msgstr "Antwoorden voor kenmerk %s, patientnummer %s: %s."
#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:255
-#: classes/Gems/Tracker/Snippets/EditTokenSnippetAbstract.php:124
#, php-format
msgid "Token %s not found."
msgstr "Kenmerk %s niet gevonden"
#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:259
-#: classes/Gems/Tracker/Snippets/EditTokenSnippetAbstract.php:128
msgid "No token specified."
msgstr "Geen kenmerk opgegeven."
@@ -3976,7 +3979,6 @@
msgstr "Uw geboortedatum"
#: classes/Gems/User/User.php:1193
-#: classes/Gems/User/Form/ChangePasswordForm.php:163
#, php-format
msgid "%s is not correct."
msgstr "%s is onjuist."
@@ -4057,11 +4059,11 @@
msgid "User not found or no e-mail address known or user cannot be reset."
msgstr "Gebruiker niet gevonden of email adres onbekend of gebruiker kan niet gereset worden."
-#: classes/Gems/Util/DbLookup.php:376
+#: classes/Gems/Util/DbLookup.php:415
msgid "inactive"
msgstr "inactief"
-#: classes/Gems/Util/DbLookup.php:377
+#: classes/Gems/Util/DbLookup.php:416
msgid "source inactive"
msgstr "bron inactief"
@@ -4445,6 +4447,7 @@
msgstr "Keuzelijst is veranderd."
#: snippets/EditSingleSurveyTokenSnippet.php:132
+#: snippets/ShowSingleSurveyTokenSnippet.php:153
msgid "Show survey"
msgstr "Toon vragenlijst"
Modified: trunk/library/snippets/EditTrackSnippet.php
===================================================================
--- trunk/library/snippets/EditTrackSnippet.php 2012-10-09 08:31:04 UTC (rev 974)
+++ trunk/library/snippets/EditTrackSnippet.php 2012-10-10 16:00:45 UTC (rev 975)
@@ -89,6 +89,7 @@
} else {
$bridge->addDate('gr2t_start_date', 'size', 30);
}
+ $bridge->addDate('gr2t_end_date', 'size', 30);
if (isset($this->formData['grc_succes']) && $this->formData['grc_succes']) {
$bridge->addExhibitor('grc_description', 'label', $this->_('Rejection code'));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-10-09 08:31:16
|
Revision: 974
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=974&view=rev
Author: mennodekker
Date: 2012-10-09 08:31:04 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
Fixed #571: Group edit - Staff/Patient selection from checkbox to radio
Modified Paths:
--------------
trunk/library/classes/Gems/Default/GroupAction.php
Modified: trunk/library/classes/Gems/Default/GroupAction.php
===================================================================
--- trunk/library/classes/Gems/Default/GroupAction.php 2012-10-08 09:46:57 UTC (rev 973)
+++ trunk/library/classes/Gems/Default/GroupAction.php 2012-10-09 08:31:04 UTC (rev 974)
@@ -64,11 +64,39 @@
$bridge->addText('ggp_description', 'size', 40);
$bridge->addSelect('ggp_role');
$bridge->addCheckbox('ggp_group_active');
- $bridge->addCheckbox('ggp_staff_members');
- $bridge->addCheckbox('ggp_respondent_members');
+ $options = array(
+ '1'=>$model->get('ggp_staff_members', 'label'),
+ '2'=>$model->get('ggp_respondent_members', 'label')
+ );
+ $bridge->addRadio('staff_respondent', 'label', $this->_('Can be assigned to'), 'multiOptions', $options);
+ if (!isset($data['staff_respondent'])) {
+ if (isset($data['ggp_staff_members']) && $data['ggp_staff_members'] == 1) {
+ $data['staff_respondent'] = 1;
+ } else if (isset($data['ggp_respondent_members']) && $data['ggp_respondent_members'] == 1) {
+ $data['staff_respondent'] = 2;
+ }
+ }
$bridge->addText('ggp_allowed_ip_ranges', 'size', 50, 'validator', new Gems_Validate_IPRanges(), 'maxlength', 500);
+
+ return $data;
}
+ public function beforeSave(array &$data, $isNew, \Zend_Form $form = null)
+ {
+ $data['ggp_staff_members'] = 0;
+ $data['ggp_respondent_members'] = 0;
+ if (isset($data['staff_respondent'])) {
+ if ($data['staff_respondent'] == 1) {
+ $data['ggp_staff_members'] = 1;
+ } elseif ($data['staff_respondent'] == 2) {
+ $data['ggp_respondent_members'] = 1;
+ }
+ unset($data['staff_respondent']);
+ }
+
+ return parent::beforeSave($data, $isNew, $form);
+ }
+
/**
* Creates a model for getModel(). Called only for each new $action.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-10-08 09:47:08
|
Revision: 973
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=973&view=rev
Author: mennodekker
Date: 2012-10-08 09:46:57 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
Updated changelog
Modified Paths:
--------------
trunk/library/changelog.txt
Modified: trunk/library/changelog.txt
===================================================================
--- trunk/library/changelog.txt 2012-10-08 09:35:02 UTC (rev 972)
+++ trunk/library/changelog.txt 2012-10-08 09:46:57 UTC (rev 973)
@@ -1,3 +1,7 @@
+Important changes from 1.5.5 => 1.5.6
+============================================================
+Transparent lessCss compiling was added. When you add a .less file GemsTracker will take care of compiling it to css. If you need to force a recompile, add the ?compilecss parameter to your url.
+
Important changes from 1.5.4 => 1.5.5
============================================================
New default: user can only login to his own organization and needs to switch after login if desired, to enable old behaviour that could lead to problems with duplicate logins see $allowLoginOnOtherOrganization in Gems_User_UserLoader
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-10-08 09:35:08
|
Revision: 972
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=972&view=rev
Author: mennodekker
Date: 2012-10-08 09:35:02 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
Fixed #572: Show selected tokens in mailjob overview
Modified Paths:
--------------
trunk/library/classes/Gems/Default/CronAction.php
trunk/library/classes/Gems/Default/MailJobAction.php
trunk/library/classes/Gems/Default/TokenPlanAction.php
trunk/library/classes/Gems/Util/DbLookup.php
Added Paths:
-----------
trunk/library/classes/Gems/Snippets/TokenPlanTableSnippet.php
Modified: trunk/library/classes/Gems/Default/CronAction.php
===================================================================
--- trunk/library/classes/Gems/Default/CronAction.php 2012-10-02 14:38:55 UTC (rev 971)
+++ trunk/library/classes/Gems/Default/CronAction.php 2012-10-08 09:35:02 UTC (rev 972)
@@ -44,7 +44,7 @@
* @license New BSD License
* @since Class available since version 1.4
*/
-class Gems_Default_CronAction extends MUtil_Controller_Action
+class Gems_Default_CronAction extends Gems_Controller_Action
{
/**
*
@@ -53,22 +53,7 @@
public $db;
/**
- * Standard filter that must be true for every token query.
*
- * @var array
- */
- protected $defaultFilter = array(
- 'can_email' => 1,
- 'gtr_active' => 1,
- 'gsu_active' => 1,
- 'grc_success' => 1,
- 'gto_completion_time' => NULL,
- 'gto_valid_from <= CURRENT_DATE',
- '(gto_valid_until IS NULL OR gto_valid_until >= CURRENT_TIMESTAMP)'
- );
-
- /**
- *
* @var GemsEscort
*/
public $escort;
@@ -179,23 +164,7 @@
$user->setAsCurrentUser();
}
- // Set up filter
- $filter = $this->defaultFilter;
- if ($job['gmj_filter_mode'] == 'R') {
- $filter[] = 'gto_mail_sent_date <= DATE_SUB(CURRENT_DATE, INTERVAL ' . $job['gmj_filter_days_between'] . ' DAY)';
- $filter[] = 'gto_mail_sent_num < ' . $job['gmj_filter_max_reminders'];
- } else {
- $filter['gto_mail_sent_date'] = NULL;
- }
- if ($job['gmj_id_organization']) {
- $filter['gto_id_organization'] = $job['gmj_id_organization'];
- }
- if ($job['gmj_id_track']) {
- $filter['gto_id_track'] = $job['gmj_id_track'];
- }
- if ($job['gmj_id_survey']) {
- $filter['gto_id_survey'] = $job['gmj_id_survey'];
- }
+ $filter = $this->loader->getUtil()->getDbLookup()->getFilterForMailJob($job);
$tokensData = $model->load($filter);
Modified: trunk/library/classes/Gems/Default/MailJobAction.php
===================================================================
--- trunk/library/classes/Gems/Default/MailJobAction.php 2012-10-02 14:38:55 UTC (rev 971)
+++ trunk/library/classes/Gems/Default/MailJobAction.php 2012-10-08 09:35:02 UTC (rev 972)
@@ -175,4 +175,22 @@
$this->html->pInfo($this->_('With automatic mail jobs and a cron job on the server, mails can be sent without manual user action.'));
}
+
+ public function showAction()
+ {
+ parent::showAction();
+
+ $id = $this->getRequest()->getParam('id');
+ if (!is_null($id)) {
+ $id = (int) $id;
+ $job = $this->db->fetchRow("SELECT * FROM gems__mail_jobs WHERE gmj_active = 1 and gmj_id_job = ?", $id);
+ if ($job) {
+ $model = $this->loader->getTracker()->getTokenModel();
+ $filter = $this->loader->getUtil()->getDbLookup()->getFilterForMailJob($job);
+ $params['model'] = $model;
+ $params['filter'] = $filter;
+ $this->addSnippet('TokenPlanTableSnippet', $params);
+ }
+ }
+ }
}
Modified: trunk/library/classes/Gems/Default/TokenPlanAction.php
===================================================================
--- trunk/library/classes/Gems/Default/TokenPlanAction.php 2012-10-02 14:38:55 UTC (rev 971)
+++ trunk/library/classes/Gems/Default/TokenPlanAction.php 2012-10-08 09:35:02 UTC (rev 972)
@@ -110,7 +110,7 @@
public function createModel($detailed, $action)
{
// MUtil_Model::$verbose = true;
- $model = $this->loader->getTracker()->getTokenModel();;
+ $model = $this->loader->getTracker()->getTokenModel();
$model->setCreate(false);
$model->set('gr2o_patient_nr', 'label', $this->_('Respondent'));
Added: trunk/library/classes/Gems/Snippets/TokenPlanTableSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/TokenPlanTableSnippet.php (rev 0)
+++ trunk/library/classes/Gems/Snippets/TokenPlanTableSnippet.php 2012-10-08 09:35:02 UTC (rev 972)
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package Gems
+ * @subpackage Snippets
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: Sample.php 215 2011-07-12 08:52:54Z michiel $
+ */
+
+/**
+ * Displays a table for TokenModel
+ *
+ * @package Gems
+ * @subpackage Snippets
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.5.6
+ */
+class Gems_Snippets_TokenPlanTableSnippet extends Gems_Snippets_ModelTableSnippetGeneric
+{
+ public $filter = array();
+
+ /**
+ * @var GemsEscort
+ */
+ public $escort;
+
+ public function addBrowseTableColumns(\MUtil_Model_TableBridge $bridge, \MUtil_Model_ModelAbstract $model)
+ {
+ $model->set('gr2o_patient_nr', 'label', $this->_('Respondent'));
+ $model->set('gto_round_description', 'label', $this->_('Round / Details'));
+ $model->set('gto_valid_from', 'label', $this->_('Valid from'));
+ $model->set('gto_valid_until', 'label', $this->_('Valid until'));
+ $model->set('gto_mail_sent_date', 'label', $this->_('Contact date'));
+ $model->set('respondent_name', 'label', $this->_('Name'));
+
+ $HTML = MUtil_Html::create();
+
+ // Row with dates and patient data
+ $bridge->gtr_track_type; // Data needed for buttons
+
+ $bridge->setDefaultRowClass(MUtil_Html_TableElement::createAlternateRowClass('even', 'even', 'odd', 'odd'));
+ $bridge->addColumn($this->getTokenLinks($bridge), ' ')->rowspan = 2; // Space needed because TableElement does not look at rowspans
+ $bridge->addSortable('gto_valid_from');
+ $bridge->addSortable('gto_valid_until');
+
+ $bridge->addMultiSort('gr2o_patient_nr', $HTML->raw('; '), 'respondent_name');
+ $bridge->addMultiSort('ggp_name', array($this->getActionLinks($bridge)));
+
+ $bridge->tr();
+ $bridge->addSortable('gto_mail_sent_date');
+ $bridge->addSortable('gto_completion_time');
+
+ if ($this->escort instanceof Gems_Project_Tracks_SingleTrackInterface) {
+ $bridge->addMultiSort('calc_round_description', $HTML->raw('; '), 'gsu_survey_name');
+ } else {
+ $model->set('calc_track_info', 'tableDisplay', 'smallData');
+ $model->set('calc_round_description', 'tableDisplay', 'smallData');
+ $bridge->addMultiSort(
+ 'calc_track_name', 'calc_track_info',
+ $bridge->calc_track_name->if($HTML->raw(' » ')),
+ 'gsu_survey_name', 'calc_round_description');
+ }
+
+ $bridge->addSortable('assigned_by');
+ }
+
+ public function getActionLinks(MUtil_Model_TableBridge $bridge)
+ {
+ // Get the other token buttons
+ if ($menuItems = $this->menu->findAll(array('controller' => array('track', 'survey'), 'action' => array('email', 'answer'), 'allowed' => true))) {
+ $buttons = $menuItems->toActionLink($this->request, $bridge);
+ $buttons->appendAttrib('class', 'rightFloat');
+ } else {
+ $buttons = null;
+ }
+ // Add the ask button
+ if ($menuItem = $this->menu->find(array('controller' => 'ask', 'action' => 'take', 'allowed' => true))) {
+ $askLink = $menuItem->toActionLink($this->request, $bridge);
+ $askLink->appendAttrib('class', 'rightFloat');
+
+ if ($buttons) {
+ // Show previous link if show, otherwise show ask link
+ $buttons = array($buttons, $askLink);
+ } else {
+ $buttons = $askLink;
+ }
+ }
+
+ return $buttons;
+ }
+
+ public function getTokenLinks(MUtil_Model_TableBridge $bridge)
+ {
+ // Get the token buttons
+ if ($menuItems = $this->menu->findAll(array('controller' => array('track', 'survey'), 'action' => 'show', 'allowed' => true))) {
+ $buttons = $menuItems->toActionLink($this->request, $bridge, $this->_('+'));
+ $buttons->title = $bridge->gto_id_token->strtoupper();
+
+ return $buttons;
+ }
+ }
+
+ public function processFilterAndSort(MUtil_Model_ModelAbstract $model)
+ {
+ if (!empty($this->filter)) {
+ $model->setFilter($this->filter);
+ }
+
+ parent::processFilterAndSort($model);
+
+ if (!empty($this->filter)) {
+ $filter = $model->getFilter();
+ unset($filter['gto_id_token']);
+ $model->setFilter($filter);
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/library/classes/Gems/Util/DbLookup.php
===================================================================
--- trunk/library/classes/Gems/Util/DbLookup.php 2012-10-02 14:38:55 UTC (rev 971)
+++ trunk/library/classes/Gems/Util/DbLookup.php 2012-10-08 09:35:02 UTC (rev 972)
@@ -185,6 +185,44 @@
}
}
+ /**
+ * Get the filter to use on the tokenmodel when working with a mailjob.
+ *
+ * @param array $job
+ * @return array
+ */
+ public function getFilterForMailJob($job)
+ {
+ // Set up filter
+ $filter = array(
+ 'can_email' => 1,
+ 'gtr_active' => 1,
+ 'gsu_active' => 1,
+ 'grc_success' => 1,
+ 'gto_completion_time' => NULL,
+ 'gto_valid_from <= CURRENT_DATE',
+ '(gto_valid_until IS NULL OR gto_valid_until >= CURRENT_TIMESTAMP)'
+ );
+
+ if ($job['gmj_filter_mode'] == 'R') {
+ $filter[] = 'gto_mail_sent_date <= DATE_SUB(CURRENT_DATE, INTERVAL ' . $job['gmj_filter_days_between'] . ' DAY)';
+ $filter[] = 'gto_mail_sent_num < ' . $job['gmj_filter_max_reminders'];
+ } else {
+ $filter['gto_mail_sent_date'] = NULL;
+ }
+ if ($job['gmj_id_organization']) {
+ $filter['gto_id_organization'] = $job['gmj_id_organization'];
+ }
+ if ($job['gmj_id_track']) {
+ $filter['gto_id_track'] = $job['gmj_id_track'];
+ }
+ if ($job['gmj_id_survey']) {
+ $filter['gto_id_survey'] = $job['gmj_id_survey'];
+ }
+
+ return $filter;
+ }
+
public function getGroups()
{
static $groups;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-10-02 14:39:06
|
Revision: 971
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=971&view=rev
Author: mennodekker
Date: 2012-10-02 14:38:55 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
removed search parameter in submiturl (probably copy/pasted)
Modified Paths:
--------------
trunk/library/classes/Gems/Default/ExportAction.php
Modified: trunk/library/classes/Gems/Default/ExportAction.php
===================================================================
--- trunk/library/classes/Gems/Default/ExportAction.php 2012-10-02 09:54:51 UTC (rev 970)
+++ trunk/library/classes/Gems/Default/ExportAction.php 2012-10-02 14:38:55 UTC (rev 971)
@@ -314,7 +314,7 @@
//Make the form 'autosubmit' so it can refresh
$form->setAttrib('id', 'autosubmit');
- $form->setAutoSubmit(MUtil_Html::attrib('href', array('action' => 'index', MUtil_Model::TEXT_FILTER => null, 'RouteReset' => true)), 'mainform');
+ $form->setAutoSubmit(MUtil_Html::attrib('href', array('action' => 'index', 'RouteReset' => true)), 'mainform');
if ($data) {
$form->populate($data);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-10-02 09:54:57
|
Revision: 970
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=970&view=rev
Author: mennodekker
Date: 2012-10-02 09:54:51 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
Added project-bootstrap with common settings for projects
Added Paths:
-----------
trunk/test/library/project-bootstrap.php
Added: trunk/test/library/project-bootstrap.php
===================================================================
--- trunk/test/library/project-bootstrap.php (rev 0)
+++ trunk/test/library/project-bootstrap.php 2012-10-02 09:54:51 UTC (rev 970)
@@ -0,0 +1,40 @@
+<?php
+/*
+ * This is a helper bootstrap file so projects need only to set their project name using
+ * define('GEMS_PROJECT_NAME', 'ProjectName');
+ * and additional settings in their own bootstrap file and then can include this file for
+ * the common settings
+ */
+
+/**
+ * Setup environment
+ */
+define('GEMS_WEB_DIR', dirname(__FILE__));
+define('GEMS_ROOT_DIR', realpath(dirname(__FILE__) . '/../'));
+define('GEMS_LIBRARY_DIR', realpath(dirname(__FILE__) . '/../library/Gems'));
+define('GEMS_PROJECT_NAME_UC', ucfirst(GEMS_PROJECT_NAME));
+define('APPLICATION_ENV', 'development');
+define('APPLICATION_PATH', GEMS_ROOT_DIR . '/application');
+
+$GLOBALS['GEMS_DIRS'] = array(
+ GEMS_PROJECT_NAME_UC => APPLICATION_PATH . '/classes',
+ 'Gems' => GEMS_LIBRARY_DIR . '/classes'
+);
+
+/**
+ * Setup include path
+ */
+set_include_path(
+ GEMS_LIBRARY_DIR . '/classes' . PATH_SEPARATOR .
+ GEMS_ROOT_DIR . '/application/classes' . PATH_SEPARATOR .
+ GEMS_WEB_DIR . '/classes' . PATH_SEPARATOR . //Test folder
+ GEMS_WEB_DIR . '/library' . PATH_SEPARATOR . //Test folder
+ get_include_path());
+
+// Set up autoload.
+require_once "Zend/Loader/Autoloader.php";
+$autoloader = Zend_Loader_Autoloader::getInstance();
+$autoloader->registerNamespace('MUtil_');
+$autoloader->registerNamespace('Gems_');
+$autoloader->registerNameSpace(GEMS_PROJECT_NAME_UC . '_');
+$autoloader->registerNameSpace('ZFDebug_');
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-10-02 08:54:47
|
Revision: 969
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=969&view=rev
Author: mennodekker
Date: 2012-10-02 08:54:36 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
Moved IndexControllerTest.php from library (helpers) to classes (the real tests)
Added Paths:
-----------
trunk/test/classes/IndexControllerTest.php
Removed Paths:
-------------
trunk/test/library/IndexControllerTest.php
Copied: trunk/test/classes/IndexControllerTest.php (from rev 968, trunk/test/library/IndexControllerTest.php)
===================================================================
--- trunk/test/classes/IndexControllerTest.php (rev 0)
+++ trunk/test/classes/IndexControllerTest.php 2012-10-02 08:54:36 UTC (rev 969)
@@ -0,0 +1,59 @@
+<?php
+require_once 'ControllerTestAbstract.php';
+class IndexControllerTest extends ControllerTestAbstract
+{
+ public function testSaltRequired()
+ {
+ $this->dispatch('/');
+ $reponse = $this->getFrontController()->getResponse();
+ $exception = $reponse->getExceptionByMessage("Missing required project setting: 'salt'.");
+ $this->assertTrue(count($exception) == 1);
+ }
+
+ public function testHomeRedirectsToLogin()
+ {
+ $this->_fixSetup();
+ $this->dispatch('/');
+ $this->assertRedirectTo('/index/login');
+ }
+
+ public function testLoginPage()
+ {
+ $this->_fixSetup();
+ $this->dispatch('/index/login');
+ $this->assertController('index');
+ $this->assertAction('login');
+ }
+
+ public function testValidProjectLogin()
+ {
+ $this->_fixSetup();
+ $postVars = array(
+ 'organization'=>'',
+ 'userlogin'=>'superadmin', //Valid login, this comes from project.ini in newproject
+ 'password'=>'superadmin',
+ 'button'=>'Login' //Submit button / label come from Gems_User_Form_LoginForm
+ );
+ $this->getRequest()->setMethod('POST')->setPost($postVars);
+
+ $this->dispatch('/index/login');
+ $response = $this->getResponse();
+ $this->assertRedirect('Valid project login not accepted');
+ }
+
+ public function testInvalidProjectLogin()
+ {
+ $this->_fixSetup();
+ $postVars = array(
+ 'organization'=>'',
+ 'userlogin'=>'superadmin',
+ 'password'=>'superpassword', //This is wrong
+ 'submit'=>'Login'
+ );
+ $this->getRequest()->setMethod('POST')->setPost($postVars);
+
+ $this->dispatch('/index/login');
+ $response = $this->getResponse();
+ $this->assertNotRedirect('Invalid project login accepted');
+ }
+}
Deleted: trunk/test/library/IndexControllerTest.php
===================================================================
--- trunk/test/library/IndexControllerTest.php 2012-10-02 08:49:09 UTC (rev 968)
+++ trunk/test/library/IndexControllerTest.php 2012-10-02 08:54:36 UTC (rev 969)
@@ -1,59 +0,0 @@
-<?php
-require_once 'ControllerTestAbstract.php';
-class IndexControllerTest extends ControllerTestAbstract
-{
- public function testSaltRequired()
- {
- $this->dispatch('/');
- $reponse = $this->getFrontController()->getResponse();
- $exception = $reponse->getExceptionByMessage("Missing required project setting: 'salt'.");
- $this->assertTrue(count($exception) == 1);
- }
-
- public function testHomeRedirectsToLogin()
- {
- $this->_fixSetup();
- $this->dispatch('/');
- $this->assertRedirectTo('/index/login');
- }
-
- public function testLoginPage()
- {
- $this->_fixSetup();
- $this->dispatch('/index/login');
- $this->assertController('index');
- $this->assertAction('login');
- }
-
- public function testValidProjectLogin()
- {
- $this->_fixSetup();
- $postVars = array(
- 'organization'=>'',
- 'userlogin'=>'superadmin', //Valid login, this comes from project.ini in newproject
- 'password'=>'superadmin',
- 'button'=>'Login' //Submit button / label come from Gems_User_Form_LoginForm
- );
- $this->getRequest()->setMethod('POST')->setPost($postVars);
-
- $this->dispatch('/index/login');
- $response = $this->getResponse();
- $this->assertRedirect('Valid project login not accepted');
- }
-
- public function testInvalidProjectLogin()
- {
- $this->_fixSetup();
- $postVars = array(
- 'organization'=>'',
- 'userlogin'=>'superadmin',
- 'password'=>'superpassword', //This is wrong
- 'submit'=>'Login'
- );
- $this->getRequest()->setMethod('POST')->setPost($postVars);
-
- $this->dispatch('/index/login');
- $response = $this->getResponse();
- $this->assertNotRedirect('Invalid project login accepted');
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-10-02 08:49:16
|
Revision: 968
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=968&view=rev
Author: mennodekker
Date: 2012-10-02 08:49:09 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
Separated test helpers from tests so projects can use helpers in their own test setups without having to run all Gems / MUtil tests too
Modified Paths:
--------------
trunk/test/bootstrap.php
Added Paths:
-----------
trunk/test/library/
trunk/test/library/ControllerTestAbstract.php
trunk/test/library/Gems/
trunk/test/library/Gems/Test/
trunk/test/library/Gems/Test/DbTestAbstract.php
trunk/test/library/Gems/Test/TestAbstract.php
trunk/test/library/IndexControllerTest.php
trunk/test/library/Zend/
trunk/test/library/Zend/Test/
trunk/test/library/Zend/Test/PHPUnit/
trunk/test/library/Zend/Test/PHPUnit/Constraint/
trunk/test/library/Zend/Test/PHPUnit/Constraint/Redirect.php
trunk/test/library/Zend/Test/PHPUnit/Db/
trunk/test/library/Zend/Test/PHPUnit/Db/Metadata/
trunk/test/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php
Removed Paths:
-------------
trunk/test/classes/ControllerTestAbstract.php
trunk/test/classes/Gems/Test/
trunk/test/classes/IndexControllerTest.php
trunk/test/classes/Zend/
Modified: trunk/test/bootstrap.php
===================================================================
--- trunk/test/bootstrap.php 2012-10-02 07:47:36 UTC (rev 967)
+++ trunk/test/bootstrap.php 2012-10-02 08:49:09 UTC (rev 968)
@@ -63,6 +63,7 @@
$path . '/library/classes' . PATH_SEPARATOR .
GEMS_ROOT_DIR . '/application/classes' . PATH_SEPARATOR .
GEMS_WEB_DIR . '/classes' . PATH_SEPARATOR .
+ GEMS_WEB_DIR . '/library' . PATH_SEPARATOR .
get_include_path());
// Set up autoload.
Deleted: trunk/test/classes/ControllerTestAbstract.php
===================================================================
--- trunk/test/classes/ControllerTestAbstract.php 2012-10-02 07:47:36 UTC (rev 967)
+++ trunk/test/classes/ControllerTestAbstract.php 2012-10-02 08:49:09 UTC (rev 968)
@@ -1,29 +0,0 @@
-<?php
-class ControllerTestAbstract extends Zend_Test_PHPUnit_ControllerTestCase
-{
- public function setUp()
- {
- // Zend_Application: loads the autoloader
- require_once 'Zend/Application.php';
-
- // Create application, bootstrap, and run
- $application = new Zend_Application(
- APPLICATION_ENV,
- APPLICATION_PATH . '/configs/application.ini'
- );
-
- $this->bootstrap = $application;
-
- parent::setUp();
- }
-
- /**
- * Here we fix the intentional errors that are in de default setup
- *
- * At the moment we only set a salt in the project resource
- */
- protected function _fixSetup() {
- $project = $this->bootstrap->getBootstrap()->getResource('project');
- $project->salt = 'TESTCASE';
- }
-}
Deleted: trunk/test/classes/IndexControllerTest.php
===================================================================
--- trunk/test/classes/IndexControllerTest.php 2012-10-02 07:47:36 UTC (rev 967)
+++ trunk/test/classes/IndexControllerTest.php 2012-10-02 08:49:09 UTC (rev 968)
@@ -1,59 +0,0 @@
-<?php
-require_once 'ControllerTestAbstract.php';
-class IndexControllerTest extends ControllerTestAbstract
-{
- public function testSaltRequired()
- {
- $this->dispatch('/');
- $reponse = $this->getFrontController()->getResponse();
- $exception = $reponse->getExceptionByMessage("Missing required project setting: 'salt'.");
- $this->assertTrue(count($exception) == 1);
- }
-
- public function testHomeRedirectsToLogin()
- {
- $this->_fixSetup();
- $this->dispatch('/');
- $this->assertRedirectTo('/index/login');
- }
-
- public function testLoginPage()
- {
- $this->_fixSetup();
- $this->dispatch('/index/login');
- $this->assertController('index');
- $this->assertAction('login');
- }
-
- public function testValidProjectLogin()
- {
- $this->_fixSetup();
- $postVars = array(
- 'organization'=>'',
- 'userlogin'=>'superadmin', //Valid login, this comes from project.ini in newproject
- 'password'=>'superadmin',
- 'button'=>'Login' //Submit button / label come from Gems_User_Form_LoginForm
- );
- $this->getRequest()->setMethod('POST')->setPost($postVars);
-
- $this->dispatch('/index/login');
- $response = $this->getResponse();
- $this->assertRedirect('Valid project login not accepted');
- }
-
- public function testInvalidProjectLogin()
- {
- $this->_fixSetup();
- $postVars = array(
- 'organization'=>'',
- 'userlogin'=>'superadmin',
- 'password'=>'superpassword', //This is wrong
- 'submit'=>'Login'
- );
- $this->getRequest()->setMethod('POST')->setPost($postVars);
-
- $this->dispatch('/index/login');
- $response = $this->getResponse();
- $this->assertNotRedirect('Invalid project login accepted');
- }
-}
Copied: trunk/test/library/ControllerTestAbstract.php (from rev 966, trunk/test/classes/ControllerTestAbstract.php)
===================================================================
--- trunk/test/library/ControllerTestAbstract.php (rev 0)
+++ trunk/test/library/ControllerTestAbstract.php 2012-10-02 08:49:09 UTC (rev 968)
@@ -0,0 +1,29 @@
+<?php
+class ControllerTestAbstract extends Zend_Test_PHPUnit_ControllerTestCase
+{
+ public function setUp()
+ {
+ // Zend_Application: loads the autoloader
+ require_once 'Zend/Application.php';
+
+ // Create application, bootstrap, and run
+ $application = new Zend_Application(
+ APPLICATION_ENV,
+ APPLICATION_PATH . '/configs/application.ini'
+ );
+
+ $this->bootstrap = $application;
+
+ parent::setUp();
+ }
+
+ /**
+ * Here we fix the intentional errors that are in de default setup
+ *
+ * At the moment we only set a salt in the project resource
+ */
+ protected function _fixSetup() {
+ $project = $this->bootstrap->getBootstrap()->getResource('project');
+ $project->salt = 'TESTCASE';
+ }
+}
Copied: trunk/test/library/Gems/Test/DbTestAbstract.php (from rev 966, trunk/test/classes/Gems/Test/DbTestAbstract.php)
===================================================================
--- trunk/test/library/Gems/Test/DbTestAbstract.php (rev 0)
+++ trunk/test/library/Gems/Test/DbTestAbstract.php 2012-10-02 08:49:09 UTC (rev 968)
@@ -0,0 +1,122 @@
+<?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.
+ *
+ *
+ * Base test class for Gems object test cases
+ *
+ * @package Gems
+ * @subpackage Test
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @version $Id: TestAbstract.php 925 2012-09-05 09:59:13Z mennodekker $
+ */
+
+/**
+ * Base test class for Gems object test cases that involve a database test
+ *
+ * @package Gems
+ * @subpackage Test
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @version $Id: TestAbstract.php 925 2012-09-05 09:59:13Z mennodekker $
+ */
+abstract class Gems_Test_DbTestAbstract extends Zend_Test_PHPUnit_DatabaseTestCase
+{
+ /**
+ * @var Gems_Loader
+ */
+ protected $loader = null;
+
+ /**
+ * @var Zend_Db
+ */
+ protected $db = null;
+
+ /**
+ *
+ * @var PHPUnit_Extensions_Database_DB_IDatabaseConnection
+ */
+ protected $_connectionMock;
+
+ /**
+ * Sets up the fixture, for example, opens a network connection.
+ * This method is called before a test is executed.
+ */
+ protected function setUp()
+ {
+ parent::setUp();
+
+ global $GEMS_DIRS;
+
+ $this->db = $this->getConnection()->getConnection();
+
+ Zend_Registry::set('db', $this->db);
+
+ $this->loader = new Gems_Loader(Zend_Registry::getInstance(), $GEMS_DIRS);
+
+ Zend_Registry::set('loader', $this->loader);
+ }
+
+ /**
+ * Returns the test database connection.
+ *
+ * @return PHPUnit_Extensions_Database_DB_IDatabaseConnection
+ */
+ protected function getConnection()
+ {
+ if($this->_connectionMock == null) {
+ $connection = Zend_Db::factory('Pdo_Sqlite', array('dbname' => ':memory:', 'username' => 'test'));
+
+ if ($sqlFiles = $this->getInitSql()) {
+ foreach ($sqlFiles as $file) {
+ $sql = file_get_contents($file);
+ $statements = explode(';', $sql);
+ foreach($statements as $sql) {
+ if (!strpos(strtoupper($sql), 'INSERT INTO') && !strpos(strtoupper($sql), 'INSERT IGNORE')) {
+ $stmt = $connection->query($sql);
+ }
+ }
+ }
+ }
+ $this->_connectionMock = $this->createZendDbConnection(
+ $connection, 'zfunittests'
+ );
+ Zend_Db_Table_Abstract::setDefaultAdapter($connection);
+ }
+
+ return $this->_connectionMock;
+ }
+
+ protected function getInitSql()
+ {
+ $path = GEMS_WEB_DIR . '/data/';
+
+ // For successful testing of the complete tokens class, we need more tables
+ return array($path . 'sqllite/create-lite.sql');
+ }
+}
\ No newline at end of file
Copied: trunk/test/library/Gems/Test/TestAbstract.php (from rev 966, trunk/test/classes/Gems/Test/TestAbstract.php)
===================================================================
--- trunk/test/library/Gems/Test/TestAbstract.php (rev 0)
+++ trunk/test/library/Gems/Test/TestAbstract.php 2012-10-02 08:49:09 UTC (rev 968)
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL 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.
+ *
+ *
+ * Base test class for Gems object test cases
+ *
+ * @package Gems
+ * @subpackage Test
+ * @author Michiel Rook <mi...@to...>
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
+ */
+
+/**
+ * Base test class for Gems object test cases
+ *
+ * @package Gems
+ * @subpackage Test
+ * @author Michiel Rook <mi...@to...>
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
+ */
+abstract class Gems_Test_TestAbstract extends PHPUnit_Framework_TestCase
+{
+ /**
+ * @var Gems_Loader
+ */
+ protected $loader = null;
+
+ /**
+ * @var Zend_Db
+ */
+ protected $db = null;
+
+ /**
+ * @var Gems_Tracker
+ */
+ protected $tracker = null;
+
+ /**
+ * Sets up the fixture, for example, opens a network connection.
+ * This method is called before a test is executed.
+ */
+ protected function setUp()
+ {
+ global $GEMS_DIRS;
+
+ $this->db = Zend_Db::factory('pdo_sqlite', array('dbname'=>':memory:'));
+
+ Zend_Registry::set('db', $this->db);
+
+ $this->loader = new Gems_Loader(Zend_Registry::getInstance(), $GEMS_DIRS);
+
+ Zend_Registry::set('loader', $this->loader);
+
+ $this->tracker = $this->loader->getTracker();
+
+ Zend_Registry::set('tracker', $this->tracker);
+ }
+}
Copied: trunk/test/library/IndexControllerTest.php (from rev 966, trunk/test/classes/IndexControllerTest.php)
===================================================================
--- trunk/test/library/IndexControllerTest.php (rev 0)
+++ trunk/test/library/IndexControllerTest.php 2012-10-02 08:49:09 UTC (rev 968)
@@ -0,0 +1,59 @@
+<?php
+require_once 'ControllerTestAbstract.php';
+class IndexControllerTest extends ControllerTestAbstract
+{
+ public function testSaltRequired()
+ {
+ $this->dispatch('/');
+ $reponse = $this->getFrontController()->getResponse();
+ $exception = $reponse->getExceptionByMessage("Missing required project setting: 'salt'.");
+ $this->assertTrue(count($exception) == 1);
+ }
+
+ public function testHomeRedirectsToLogin()
+ {
+ $this->_fixSetup();
+ $this->dispatch('/');
+ $this->assertRedirectTo('/index/login');
+ }
+
+ public function testLoginPage()
+ {
+ $this->_fixSetup();
+ $this->dispatch('/index/login');
+ $this->assertController('index');
+ $this->assertAction('login');
+ }
+
+ public function testValidProjectLogin()
+ {
+ $this->_fixSetup();
+ $postVars = array(
+ 'organization'=>'',
+ 'userlogin'=>'superadmin', //Valid login, this comes from project.ini in newproject
+ 'password'=>'superadmin',
+ 'button'=>'Login' //Submit button / label come from Gems_User_Form_LoginForm
+ );
+ $this->getRequest()->setMethod('POST')->setPost($postVars);
+
+ $this->dispatch('/index/login');
+ $response = $this->getResponse();
+ $this->assertRedirect('Valid project login not accepted');
+ }
+
+ public function testInvalidProjectLogin()
+ {
+ $this->_fixSetup();
+ $postVars = array(
+ 'organization'=>'',
+ 'userlogin'=>'superadmin',
+ 'password'=>'superpassword', //This is wrong
+ 'submit'=>'Login'
+ );
+ $this->getRequest()->setMethod('POST')->setPost($postVars);
+
+ $this->dispatch('/index/login');
+ $response = $this->getResponse();
+ $this->assertNotRedirect('Invalid project login accepted');
+ }
+}
Copied: trunk/test/library/Zend/Test/PHPUnit/Constraint/Redirect.php (from rev 966, trunk/test/classes/Zend/Test/PHPUnit/Constraint/Redirect.php)
===================================================================
--- trunk/test/library/Zend/Test/PHPUnit/Constraint/Redirect.php (rev 0)
+++ trunk/test/library/Zend/Test/PHPUnit/Constraint/Redirect.php 2012-10-02 08:49:09 UTC (rev 968)
@@ -0,0 +1,282 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to li...@ze... so we can send you a copy immediately.
+ *
+ * @category Zend
+ * @package Zend_Test
+ * @subpackage PHPUnit
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @version $Id$
+ */
+
+/** @see PHPUnit_Framework_Constraint */
+require_once 'PHPUnit/Framework/Constraint.php';
+
+/**
+ * Redirection constraints
+ *
+ * @uses PHPUnit_Framework_Constraint
+ * @category Zend
+ * @package Zend_Test
+ * @subpackage PHPUnit
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint
+{
+ /**#@+
+ * Assertion type constants
+ */
+ const ASSERT_REDIRECT = 'assertRedirect';
+ const ASSERT_REDIRECT_TO = 'assertRedirectTo';
+ const ASSERT_REDIRECT_REGEX = 'assertRedirectRegex';
+ /**#@-*/
+
+ /**
+ * Current assertion type
+ * @var string
+ */
+ protected $_assertType = null;
+
+ /**
+ * Available assertion types
+ * @var array
+ */
+ protected $_assertTypes = array(
+ self::ASSERT_REDIRECT,
+ self::ASSERT_REDIRECT_TO,
+ self::ASSERT_REDIRECT_REGEX,
+ );
+
+ /**
+ * Pattern to match against
+ * @var string
+ */
+ protected $_match = null;
+
+ /**
+ * Whether or not assertion is negated
+ * @var bool
+ */
+ protected $_negate = false;
+
+ /**
+ * Constructor; setup constraint state
+ *
+ * @return void
+ */
+ public function __construct()
+ {
+ }
+
+ /**
+ * Indicate negative match
+ *
+ * @param bool $flag
+ * @return void
+ */
+ public function setNegate($flag = true)
+ {
+ $this->_negate = $flag;
+ }
+
+ /**
+ * Evaluate an object to see if it fits the constraints
+ *
+ * @param string $other String to examine
+ * @param null|string Assertion type
+ * @return bool
+ */
+ public function evaluate($other, $assertType = null, $returnResult = FALSE)
+ {
+ if (!$other instanceof Zend_Controller_Response_Abstract) {
+ require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
+ throw new Zend_Test_PHPUnit_Constraint_Exception('Redirect constraint assertions require a response object');
+ }
+
+ if (strstr($assertType, 'Not')) {
+ $this->setNegate(true);
+ $assertType = str_replace('Not', '', $assertType);
+ }
+
+ if (!in_array($assertType, $this->_assertTypes)) {
+ require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
+ throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__));
+ }
+
+ $this->_assertType = $assertType;
+
+ $response = $other;
+ $argv = func_get_args();
+ $argc = func_num_args();
+
+ switch ($assertType) {
+ case self::ASSERT_REDIRECT_TO:
+ if (3 > $argc) {
+ require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
+ throw new Zend_Test_PHPUnit_Constraint_Exception('No redirect URL provided against which to match');
+ }
+ $this->_match = $match = $argv[2];
+ return ($this->_negate)
+ ? $this->_notMatch($response, $match)
+ : $this->_match($response, $match);
+ case self::ASSERT_REDIRECT_REGEX:
+ if (3 > $argc) {
+ require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
+ throw new Zend_Test_PHPUnit_Constraint_Exception('No pattern provided against which to match redirect');
+ }
+ $this->_match = $match = $argv[2];
+ return ($this->_negate)
+ ? $this->_notRegex($response, $match)
+ : $this->_regex($response, $match);
+ case self::ASSERT_REDIRECT:
+ default:
+ return ($this->_negate) ? !$response->isRedirect() : $response->isRedirect();
+ }
+ }
+
+ /**
+ * Report Failure
+ *
+ * @see PHPUnit_Framework_Constraint for implementation details
+ * @param mixed $other
+ * @param string $description Additional message to display
+ * @param bool $not
+ * @return void
+ * @throws PHPUnit_Framework_ExpectationFailedException
+ */
+ public function fail($other, $description, PHPUnit_Framework_ComparisonFailure $comparisonFailure = NULL)
+ {
+ require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
+ switch ($this->_assertType) {
+ case self::ASSERT_REDIRECT_TO:
+ $failure = 'Failed asserting response redirects to "%s"';
+ if ($this->_negate) {
+ $failure = 'Failed asserting response DOES NOT redirect to "%s"';
+ }
+ $failure = sprintf($failure, $this->_match);
+ break;
+ case self::ASSERT_REDIRECT_REGEX:
+ $failure = 'Failed asserting response redirects to URL MATCHING "%s"';
+ if ($this->_negate) {
+ $failure = 'Failed asserting response DOES NOT redirect to URL MATCHING "%s"';
+ }
+ $failure = sprintf($failure, $this->_match);
+ break;
+ case self::ASSERT_REDIRECT:
+ default:
+ $failure = 'Failed asserting response is a redirect';
+ if ($this->_negate) {
+ $failure = 'Failed asserting response is NOT a redirect';
+ }
+ break;
+ }
+
+ if (!empty($description)) {
+ $failure = $description . "\n" . $failure;
+ }
+
+ throw new Zend_Test_PHPUnit_Constraint_Exception($failure);
+ }
+
+ /**
+ * Complete implementation
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return '';
+ }
+
+ /**
+ * Check to see if content is matched in selected nodes
+ *
+ * @param Zend_Controller_Response_HttpTestCase $response
+ * @param string $match Content to match
+ * @return bool
+ */
+ protected function _match($response, $match)
+ {
+ if (!$response->isRedirect()) {
+ return false;
+ }
+
+ $headers = $response->sendHeaders();
+ $redirect = $headers['location'];
+ $redirect = str_replace('Location: ', '', $redirect);
+
+ return ($redirect == $match);
+ }
+
+ /**
+ * Check to see if content is NOT matched in selected nodes
+ *
+ * @param Zend_Controller_Response_HttpTestCase $response
+ * @param string $match
+ * @return bool
+ */
+ protected function _notMatch($response, $match)
+ {
+ if (!$response->isRedirect()) {
+ return true;
+ }
+
+ $headers = $response->sendHeaders();
+ $redirect = $headers['location'];
+ $redirect = str_replace('Location: ', '', $redirect);
+
+ return ($redirect != $match);
+ }
+
+ /**
+ * Check to see if content is matched by regex in selected nodes
+ *
+ * @param Zend_Controller_Response_HttpTestCase $response
+ * @param string $pattern
+ * @return bool
+ */
+ protected function _regex($response, $pattern)
+ {
+ if (!$response->isRedirect()) {
+ return false;
+ }
+
+ $headers = $response->sendHeaders();
+ $redirect = $headers['location'];
+ $redirect = str_replace('Location: ', '', $redirect);
+
+ return preg_match($pattern, $redirect);
+ }
+
+ /**
+ * Check to see if content is NOT matched by regex in selected nodes
+ *
+ * @param Zend_Controller_Response_HttpTestCase $response
+ * @param string $pattern
+ * @return bool
+ */
+ protected function _notRegex($response, $pattern)
+ {
+ if (!$response->isRedirect()) {
+ return true;
+ }
+
+ $headers = $response->sendHeaders();
+ $redirect = $headers['location'];
+ $redirect = str_replace('Location: ', '', $redirect);
+
+ return !preg_match($pattern, $redirect);
+ }
+}
Copied: trunk/test/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php (from rev 966, trunk/test/classes/Zend/Test/PHPUnit/Db/Metadata/Generic.php)
===================================================================
--- trunk/test/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php (rev 0)
+++ trunk/test/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php 2012-10-02 08:49:09 UTC (rev 968)
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to li...@ze... so we can send you a copy immediately.
+ *
+ * @category Zend
+ * @package Zend_Test
+ * @subpackage PHPUnit
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @version $Id$
+ */
+
+/**
+ * @see Zend_Db_Adapter_Abstract
+ */
+require_once "Zend/Db/Adapter/Abstract.php";
+
+/**
+ * @see PHPUnit_Extensions_Database_DB_IMetaData
+ */
+require_once "PHPUnit/Extensions/Database/DB/IMetaData.php";
+
+/**
+ * Generic Metadata accessor for the Zend_Db adapters
+ *
+ * @uses PHPUnit_Extensions_Database_DB_IMetaData
+ * @category Zend
+ * @package Zend_Test
+ * @subpackage PHPUnit
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+class Zend_Test_PHPUnit_Db_Metadata_Generic implements PHPUnit_Extensions_Database_DB_IMetaData
+{
+ /**
+ * Zend_Db Connection
+ *
+ * @var Zend_Db_Adapter_Abstract
+ */
+ protected $_connection;
+
+ /**
+ * Schemaname
+ *
+ * @var string
+ */
+ protected $_schema;
+
+ /**
+ * Cached Table metadata
+ *
+ * @var array
+ */
+ protected $_tableMetadata = array();
+
+ /**
+ * Creates a new database meta data object using the given pdo connection
+ * and schema name.
+ *
+ * @param PDO $pdo
+ * @param string $schema
+ */
+ public final function __construct(Zend_Db_Adapter_Abstract $db, $schema)
+ {
+ $this->_connection = $db;
+ $this->_schema = $schema;
+ }
+
+ /**
+ * List Tables
+ *
+ * @return array
+ */
+ public function getTableNames()
+ {
+ return $this->_connection->listTables();
+ }
+
+ /**
+ * Get Table information
+ *
+ * @param string $tableName
+ * @return array
+ */
+ protected function getTableDescription($tableName)
+ {
+ if(!isset($this->_tableMetadata[$tableName])) {
+ $this->_tableMetadata[$tableName] = $this->_connection->describeTable($tableName);
+ }
+ return $this->_tableMetadata[$tableName];
+ }
+
+ /**
+ * Returns an array containing the names of all the columns in the
+ * $tableName table,
+ *
+ * @param string $tableName
+ * @return array
+ */
+ public function getTableColumns($tableName)
+ {
+ $tableMeta = $this->getTableDescription($tableName);
+ $columns = array_keys($tableMeta);
+ return $columns;
+ }
+
+ /**
+ * Returns an array containing the names of all the primary key columns in
+ * the $tableName table.
+ *
+ * @param string $tableName
+ * @return array
+ */
+ public function getTablePrimaryKeys($tableName)
+ {
+ $tableMeta = $this->getTableDescription($tableName);
+
+ $primaryColumnNames = array();
+ foreach($tableMeta AS $column) {
+ if($column['PRIMARY'] == true) {
+ $primaryColumnNames[] = $column['COLUMN_NAME'];
+ }
+ }
+ return $primaryColumnNames;
+ }
+
+ /**
+ * Returns the name of the default schema.
+ *
+ * @return string
+ */
+ public function getSchema()
+ {
+ return $this->_schema;
+ }
+
+ /**
+ * Returns a quoted schema object. (table name, column name, etc)
+ *
+ * @param string $object
+ * @return string
+ */
+ public function quoteSchemaObject($object)
+ {
+ return $this->_connection->quoteIdentifier($object);
+ }
+
+ /**
+ * Returns true if the rdbms allows cascading
+ *
+ * @return bool
+ */
+ public function allowsCascading()
+ {
+ return false;
+ }
+
+ public function disablePrimaryKeys($tableName)
+ {
+ }
+
+ public function enablePrimaryKeys($tableName)
+ {
+ }
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-10-02 07:47:48
|
Revision: 967
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=967&view=rev
Author: mennodekker
Date: 2012-10-02 07:47:36 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
Keywords updated
Modified Paths:
--------------
trunk/library/classes/Gems/Event/Survey/BeforeAnswering/GetPreviousAnswers.php
trunk/library/classes/Gems/Event/Survey/Completed/BmiCalculation.php
trunk/library/classes/Gems/Event/Survey/Completed/DisplayVars.php
trunk/library/classes/Gems/Event/SurveyDisplayEventInterface.php
trunk/library/classes/Gems/Export/RespondentExport.php
trunk/library/classes/Gems/Snippets/AutosearchFormSnippet.php
trunk/library/classes/Gems/Snippets/Export/ReportFooterSnippet.php
trunk/library/classes/Gems/Snippets/Export/ReportHeaderSnippet.php
trunk/library/classes/Gems/Snippets/Export/RespondentSnippet.php
trunk/library/classes/Gems/Snippets/Export/SurveyHeaderSnippet.php
trunk/library/classes/Gems/Snippets/SnippetLoader.php
trunk/library/classes/Gems/Task/Tracker/CheckTrackRounds.php
trunk/library/classes/Gems/Task/Tracker/SourceCommand.php
trunk/library/classes/Gems/User/Adapter/Radius/radius.class.php
trunk/library/classes/Gems/User/Adapter/Radius.php
trunk/library/classes/Gems/User/Form/LayeredLoginForm.php
trunk/library/classes/Gems/User/Validate/GetUserPasswordValidator.php
trunk/library/classes/Gems/User/Validate/NewPasswordValidator.php
trunk/library/classes/Gems/User/Validate/PasswordValidatorAbstract.php
trunk/library/classes/Gems/User/Validate/UserPasswordValidator.php
trunk/library/classes/Gems/View/Helper/HeadLink.php
trunk/library/classes/MUtil/Batch/BatchAbstract.php
trunk/library/classes/MUtil/Batch/WaitBatch.php
trunk/library/classes/MUtil/Controller/ModelSnippetActionAbstract.php
trunk/library/classes/MUtil/Html/IFrame.php
trunk/library/classes/MUtil/Html/PFormElement.php
trunk/library/classes/MUtil/Html/ProgressPanel.php
trunk/library/classes/MUtil/Html/SrcArrayAttribute.php
trunk/library/classes/MUtil/Mail/Transport/EchoLog.php
trunk/library/classes/MUtil/ProgressBar/Adapter/JsPush.php
trunk/library/classes/MUtil/Snippets/ModelYesNoDeleteSnippetAbstract.php
trunk/library/classes/MUtil/Snippets/SnippetLoaderInterface.php
trunk/library/classes/MUtil/Snippets/Standard/ModelYesNoDeleteSnippet.php
trunk/library/classes/Zend/Translate/Adapter.php
Property Changed:
----------------
trunk/library/classes/Gems/Event/Survey/BeforeAnswering/GetPreviousAnswers.php
trunk/library/classes/Gems/Event/Survey/Completed/BmiCalculation.php
trunk/library/classes/Gems/Event/Survey/Completed/DisplayVars.php
trunk/library/classes/Gems/Event/Survey/Display/ByValue.php
trunk/library/classes/Gems/Event/Survey/Display/OnlyAnswered.php
trunk/library/classes/Gems/Event/Survey/Display/Reverse.php
trunk/library/classes/Gems/Event/SurveyAnswerFilterAbstract.php
trunk/library/classes/Gems/Event/SurveyDisplayEventInterface.php
trunk/library/classes/Gems/Export/RespondentExport.php
trunk/library/classes/Gems/Filter/TrailingSlash.php
trunk/library/classes/Gems/Form/AutoLoadFormAbstract.php
trunk/library/classes/Gems/Mail.php
trunk/library/classes/Gems/Menu/ContainerItem.php
trunk/library/classes/Gems/Menu/HiddenOrganizationHrefAttribute.php
trunk/library/classes/Gems/Snippets/AutosearchFormSnippet.php
trunk/library/classes/Gems/Snippets/Export/ReportFooterSnippet.php
trunk/library/classes/Gems/Snippets/Export/ReportHeaderSnippet.php
trunk/library/classes/Gems/Snippets/Export/RespondentSnippet.php
trunk/library/classes/Gems/Snippets/Export/SurveyHeaderSnippet.php
trunk/library/classes/Gems/Snippets/SnippetLoader.php
trunk/library/classes/Gems/Task/Tracker/CheckTrackRounds.php
trunk/library/classes/Gems/Task/Tracker/SourceCommand.php
trunk/library/classes/Gems/Tracker/Form/AskTokenForm.php
trunk/library/classes/Gems/Tracker/Snippets/AnswerNameFilterInterface.php
trunk/library/classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php
trunk/library/classes/Gems/User/Adapter/Radius/radius.class.php
trunk/library/classes/Gems/User/Adapter/Radius.php
trunk/library/classes/Gems/User/Form/ChangePasswordForm.php
trunk/library/classes/Gems/User/Form/LayeredLoginForm.php
trunk/library/classes/Gems/User/Form/LoginForm.php
trunk/library/classes/Gems/User/Form/OrganizationFormAbstract.php
trunk/library/classes/Gems/User/Form/ResetRequestForm.php
trunk/library/classes/Gems/User/Validate/GetUserInterface.php
trunk/library/classes/Gems/User/Validate/GetUserPasswordValidator.php
trunk/library/classes/Gems/User/Validate/NewPasswordValidator.php
trunk/library/classes/Gems/User/Validate/PasswordValidatorAbstract.php
trunk/library/classes/Gems/User/Validate/ResetRequestValidator.php
trunk/library/classes/Gems/User/Validate/UserPasswordValidator.php
trunk/library/classes/Gems/View/Helper/HeadLink.php
trunk/library/classes/MUtil/Batch/BatchAbstract.php
trunk/library/classes/MUtil/Batch/BatchException.php
trunk/library/classes/MUtil/Batch/WaitBatch.php
trunk/library/classes/MUtil/Controller/ModelSnippetActionAbstract.php
trunk/library/classes/MUtil/Form/Element/Multiselect.php
trunk/library/classes/MUtil/Form/Element/Select.php
trunk/library/classes/MUtil/Html/Code/DynamicAbstract.php
trunk/library/classes/MUtil/Html/Code/JavaScript.php
trunk/library/classes/MUtil/Html/HnElement.php
trunk/library/classes/MUtil/Html/IFrame.php
trunk/library/classes/MUtil/Html/PFormElement.php
trunk/library/classes/MUtil/Html/ProgressPanel.php
trunk/library/classes/MUtil/Html/SrcArrayAttribute.php
trunk/library/classes/MUtil/Mail/Transport/EchoLog.php
trunk/library/classes/MUtil/Model/SelectModelPaginator.php
trunk/library/classes/MUtil/Model/Type/ConcatenatedRow.php
trunk/library/classes/MUtil/ProgressBar/Adapter/JsPush.php
trunk/library/classes/MUtil/Queue/Adapter/DbPrefixed.php
trunk/library/classes/MUtil/Snippets/ModelYesNoDeleteSnippetAbstract.php
trunk/library/classes/MUtil/Snippets/SnippetLoaderInterface.php
trunk/library/classes/MUtil/Snippets/Standard/ModelYesNoDeleteSnippet.php
trunk/library/classes/MUtil/View/Helper/FormSelectHtml.php
trunk/library/classes/Zend/Translate/Adapter.php
Modified: trunk/library/classes/Gems/Event/Survey/BeforeAnswering/GetPreviousAnswers.php
===================================================================
--- trunk/library/classes/Gems/Event/Survey/BeforeAnswering/GetPreviousAnswers.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/Event/Survey/BeforeAnswering/GetPreviousAnswers.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @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 $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Event/Survey/BeforeAnswering/GetPreviousAnswers.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/Event/Survey/Completed/BmiCalculation.php
===================================================================
--- trunk/library/classes/Gems/Event/Survey/Completed/BmiCalculation.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/Event/Survey/Completed/BmiCalculation.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @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 $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Event/Survey/Completed/BmiCalculation.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/Event/Survey/Completed/DisplayVars.php
===================================================================
--- trunk/library/classes/Gems/Event/Survey/Completed/DisplayVars.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/Event/Survey/Completed/DisplayVars.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -30,7 +30,7 @@
* @subpackage Event
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: Sample.php 215 2011-07-12 08:52:54Z michiel $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Event/Survey/Completed/DisplayVars.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/Gems/Event/Survey/Display/ByValue.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/Gems/Event/Survey/Display/OnlyAnswered.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/Gems/Event/Survey/Display/Reverse.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/Gems/Event/SurveyAnswerFilterAbstract.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/Event/SurveyDisplayEventInterface.php
===================================================================
--- trunk/library/classes/Gems/Event/SurveyDisplayEventInterface.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/Event/SurveyDisplayEventInterface.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @author Matijs de Jong <mj...@ma...>
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: SurveyCompletedEventInterface.php 59 2011-09-22 07:23:44Z mennodekker $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Event/SurveyDisplayEventInterface.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/Export/RespondentExport.php
===================================================================
--- trunk/library/classes/Gems/Export/RespondentExport.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/Export/RespondentExport.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -29,7 +29,7 @@
* @subpackage Export
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: Sample.php 215 2011-07-12 08:52:54Z michiel $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Export/RespondentExport.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/Gems/Filter/TrailingSlash.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/Gems/Form/AutoLoadFormAbstract.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/Gems/Mail.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/Gems/Menu/ContainerItem.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/Gems/Menu/HiddenOrganizationHrefAttribute.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/Snippets/AutosearchFormSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/AutosearchFormSnippet.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/Snippets/AutosearchFormSnippet.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @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 $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Snippets/AutosearchFormSnippet.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/Snippets/Export/ReportFooterSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/Export/ReportFooterSnippet.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/Snippets/Export/ReportFooterSnippet.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -29,7 +29,7 @@
* @subpackage Snippets
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: Sample.php 215 2011-07-12 08:52:54Z michiel $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Snippets/Export/ReportFooterSnippet.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/Snippets/Export/ReportHeaderSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/Export/ReportHeaderSnippet.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/Snippets/Export/ReportHeaderSnippet.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -29,7 +29,7 @@
* @subpackage Snippets
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: Sample.php 215 2011-07-12 08:52:54Z michiel $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Snippets/Export/ReportHeaderSnippet.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/Snippets/Export/RespondentSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/Export/RespondentSnippet.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/Snippets/Export/RespondentSnippet.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -29,7 +29,7 @@
* @subpackage Snippets
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: Sample.php 215 2011-07-12 08:52:54Z michiel $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Snippets/Export/RespondentSnippet.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/Snippets/Export/SurveyHeaderSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/Export/SurveyHeaderSnippet.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/Snippets/Export/SurveyHeaderSnippet.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -29,7 +29,7 @@
* @subpackage Snippets
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: Sample.php 215 2011-07-12 08:52:54Z michiel $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Snippets/Export/SurveyHeaderSnippet.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/Snippets/SnippetLoader.php
===================================================================
--- trunk/library/classes/Gems/Snippets/SnippetLoader.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/Snippets/SnippetLoader.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -31,7 +31,7 @@
* @subpackage Snippets
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: Sample.php 215 2011-07-12 08:52:54Z michiel $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Snippets/SnippetLoader.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/Task/Tracker/CheckTrackRounds.php
===================================================================
--- trunk/library/classes/Gems/Task/Tracker/CheckTrackRounds.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/Task/Tracker/CheckTrackRounds.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -31,7 +31,7 @@
* @author Matijs de Jong <mj...@ma...>
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: CheckTokenCompletion.php 528 2012-03-01 14:06:23Z mennodekker $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Task/Tracker/CheckTrackRounds.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/Task/Tracker/SourceCommand.php
===================================================================
--- trunk/library/classes/Gems/Task/Tracker/SourceCommand.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/Task/Tracker/SourceCommand.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -29,7 +29,7 @@
* @subpackage Task_Tracker
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: SourceSyncSurveys.php 528 2012-03-01 14:06:23Z mennodekker $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Task/Tracker/SourceCommand.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/Gems/Tracker/Form/AskTokenForm.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/Gems/Tracker/Snippets/AnswerNameFilterInterface.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/User/Adapter/Radius/radius.class.php
===================================================================
--- trunk/library/classes/Gems/User/Adapter/Radius/radius.class.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/User/Adapter/Radius/radius.class.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -46,9 +46,9 @@
* @author: SysCo/al
* @since CreationDate: 2008-01-04
* @copyright (c) 2008 by SysCo systemes de communication sa
- * @version $LastChangedRevision: 1.2.2 $
- * @version $LastChangedDate: 2009-01-05 $
- * @version $LastChangedBy: SysCo/al $
+ * @version $LastChangedRevision$
+ * @version $LastChangedDate$
+ * @version $LastChangedBy$
* @link $HeadURL: radius.class.php $
* @link http://developer.sysco.ch/php/
* @link dev...@sy...
Property changes on: trunk/library/classes/Gems/User/Adapter/Radius/radius.class.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/User/Adapter/Radius.php
===================================================================
--- trunk/library/classes/Gems/User/Adapter/Radius.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/User/Adapter/Radius.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -29,7 +29,7 @@
* @subpackage User
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: Radius.php 228 2011-12-21 09:39:34Z 175780 $
+ * @version $Id$
*/
include_once 'Radius/radius.class.php';
Property changes on: trunk/library/classes/Gems/User/Adapter/Radius.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/Gems/User/Form/ChangePasswordForm.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/User/Form/LayeredLoginForm.php
===================================================================
--- trunk/library/classes/Gems/User/Form/LayeredLoginForm.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/User/Form/LayeredLoginForm.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -30,7 +30,7 @@
* @subpackage User\Form
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: Sample.php 215 2011-07-12 08:52:54Z michiel $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/User/Form/LayeredLoginForm.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/Gems/User/Form/LoginForm.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/Gems/User/Form/OrganizationFormAbstract.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/Gems/User/Form/ResetRequestForm.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/Gems/User/Validate/GetUserInterface.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/User/Validate/GetUserPasswordValidator.php
===================================================================
--- trunk/library/classes/Gems/User/Validate/GetUserPasswordValidator.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/User/Validate/GetUserPasswordValidator.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @author Matijs de Jong <mj...@ma...>
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: UserPasswordValidator.php 370 2011-12-19 09:27:19Z mennodekker $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/User/Validate/GetUserPasswordValidator.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/User/Validate/NewPasswordValidator.php
===================================================================
--- trunk/library/classes/Gems/User/Validate/NewPasswordValidator.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/User/Validate/NewPasswordValidator.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @author Matijs de Jong <mj...@ma...>
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: UserNewPasswordValidator.php 553 2012-03-16 12:32:50Z matijsdejong $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/User/Validate/NewPasswordValidator.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/User/Validate/PasswordValidatorAbstract.php
===================================================================
--- trunk/library/classes/Gems/User/Validate/PasswordValidatorAbstract.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/User/Validate/PasswordValidatorAbstract.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @author Matijs de Jong <mj...@ma...>
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: UserPasswordValidator.php 370 2011-12-19 09:27:19Z mennodekker $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/User/Validate/PasswordValidatorAbstract.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/Gems/User/Validate/ResetRequestValidator.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/User/Validate/UserPasswordValidator.php
===================================================================
--- trunk/library/classes/Gems/User/Validate/UserPasswordValidator.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/User/Validate/UserPasswordValidator.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @author Matijs de Jong <mj...@ma...>
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: UserPasswordValidator.php 370 2011-12-19 09:27:19Z mennodekker $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/User/Validate/UserPasswordValidator.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/View/Helper/HeadLink.php
===================================================================
--- trunk/library/classes/Gems/View/Helper/HeadLink.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Gems/View/Helper/HeadLink.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -31,7 +31,7 @@
* @subpackage View\Helper
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: Sample.php 215 2011-07-12 08:52:54Z michiel $
+ * @version $Id$
*/
// We need to load the class first
@@ -50,8 +50,7 @@
* @subpackage View\Helper
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @since Class available since version 1.0
- * @deprecated Class deprecated since version 2.0
+ * @since Class available since version 1.5.5
*/
class Gems_View_Helper_HeadLink extends Zend_View_Helper_HeadLink
{
Property changes on: trunk/library/classes/Gems/View/Helper/HeadLink.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/MUtil/Batch/BatchAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Batch/BatchAbstract.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/MUtil/Batch/BatchAbstract.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @author Matijs de Jong <mj...@ma...>
* @copyright Copyright (c) 2012 Erasmus MC
* @license New BSD License
- * @version $Id: Sample.php 203 2011-07-07 12:51:32Z matijs $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/MUtil/Batch/BatchAbstract.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/MUtil/Batch/BatchException.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/MUtil/Batch/WaitBatch.php
===================================================================
--- trunk/library/classes/MUtil/Batch/WaitBatch.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/MUtil/Batch/WaitBatch.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @author Matijs de Jong <mj...@ma...>
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: Sample.php 203 2012-07-07 12:51:32Z matijs $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/MUtil/Batch/WaitBatch.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/MUtil/Controller/ModelSnippetActionAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Controller/ModelSnippetActionAbstract.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/MUtil/Controller/ModelSnippetActionAbstract.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @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 $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/MUtil/Controller/ModelSnippetActionAbstract.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/MUtil/Form/Element/Multiselect.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/MUtil/Form/Element/Select.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/MUtil/Html/Code/DynamicAbstract.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/MUtil/Html/Code/JavaScript.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/MUtil/Html/HnElement.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/MUtil/Html/IFrame.php
===================================================================
--- trunk/library/classes/MUtil/Html/IFrame.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/MUtil/Html/IFrame.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @author Matijs de Jong <mj...@ma...>
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: AElement.php 515 2012-02-23 15:40:31Z matijsdejong $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/MUtil/Html/IFrame.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/MUtil/Html/PFormElement.php
===================================================================
--- trunk/library/classes/MUtil/Html/PFormElement.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/MUtil/Html/PFormElement.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @author Matijs de Jong <mj...@ma...>
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: TableElement.php 53 2011-09-20 16:00:47Z matijsdejong $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/MUtil/Html/PFormElement.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/MUtil/Html/ProgressPanel.php
===================================================================
--- trunk/library/classes/MUtil/Html/ProgressPanel.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/MUtil/Html/ProgressPanel.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @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 $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/MUtil/Html/ProgressPanel.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/MUtil/Html/SrcArrayAttribute.php
===================================================================
--- trunk/library/classes/MUtil/Html/SrcArrayAttribute.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/MUtil/Html/SrcArrayAttribute.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @author Matijs de Jong <mj...@ma...>
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: AttributeAbstract.php 514 2012-02-23 15:00:56Z matijsdejong $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/MUtil/Html/SrcArrayAttribute.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/MUtil/Mail/Transport/EchoLog.php
===================================================================
--- trunk/library/classes/MUtil/Mail/Transport/EchoLog.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/MUtil/Mail/Transport/EchoLog.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @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 $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/MUtil/Mail/Transport/EchoLog.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/MUtil/Model/SelectModelPaginator.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/MUtil/Model/Type/ConcatenatedRow.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/MUtil/ProgressBar/Adapter/JsPush.php
===================================================================
--- trunk/library/classes/MUtil/ProgressBar/Adapter/JsPush.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/MUtil/ProgressBar/Adapter/JsPush.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @author Matijs de Jong <mj...@ma...>
* @copyright Copyright (c) 2012 Erasmus MC
* @license New BSD License
- * @version $Id: JsPush.php 203 2012-01-01t 12:51:32Z matijs $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/MUtil/ProgressBar/Adapter/JsPush.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/MUtil/Queue/Adapter/DbPrefixed.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/MUtil/Snippets/ModelYesNoDeleteSnippetAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Snippets/ModelYesNoDeleteSnippetAbstract.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/MUtil/Snippets/ModelYesNoDeleteSnippetAbstract.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @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 $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/MUtil/Snippets/ModelYesNoDeleteSnippetAbstract.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/MUtil/Snippets/SnippetLoaderInterface.php
===================================================================
--- trunk/library/classes/MUtil/Snippets/SnippetLoaderInterface.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/MUtil/Snippets/SnippetLoaderInterface.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -29,7 +29,7 @@
* @subpackage Snippets
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: Sample.php 215 2011-07-12 08:52:54Z michiel $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/MUtil/Snippets/SnippetLoaderInterface.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/MUtil/Snippets/Standard/ModelYesNoDeleteSnippet.php
===================================================================
--- trunk/library/classes/MUtil/Snippets/Standard/ModelYesNoDeleteSnippet.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/MUtil/Snippets/Standard/ModelYesNoDeleteSnippet.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -32,7 +32,7 @@
* @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 $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/MUtil/Snippets/Standard/ModelYesNoDeleteSnippet.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Property changes on: trunk/library/classes/MUtil/View/Helper/FormSelectHtml.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Zend/Translate/Adapter.php
===================================================================
--- trunk/library/classes/Zend/Translate/Adapter.php 2012-10-01 15:04:49 UTC (rev 966)
+++ trunk/library/classes/Zend/Translate/Adapter.php 2012-10-02 07:47:36 UTC (rev 967)
@@ -17,7 +17,7 @@
* @subpackage Zend_Translate_Adapter
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: Adapter.php 24268 2011-07-25 14:47:42Z guilhermeblanco $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Zend/Translate/Adapter.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-10-01 15:04:59
|
Revision: 966
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=966&view=rev
Author: mennodekker
Date: 2012-10-01 15:04:49 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
Get rid of empty search parameter that get's stuck
Modified Paths:
--------------
trunk/library/classes/Gems/Controller/BrowseEditAction.php
Modified: trunk/library/classes/Gems/Controller/BrowseEditAction.php
===================================================================
--- trunk/library/classes/Gems/Controller/BrowseEditAction.php 2012-10-01 12:57:20 UTC (rev 965)
+++ trunk/library/classes/Gems/Controller/BrowseEditAction.php 2012-10-01 15:04:49 UTC (rev 966)
@@ -579,7 +579,7 @@
protected function getAutoSearchHref()
{
- return MUtil_Html::attrib('href', array('action' => 'autofilter', MUtil_Model::TEXT_FILTER => null, 'RouteReset' => true));
+ return MUtil_Html::attrib('href', array('action' => 'autofilter', 'RouteReset' => true));
}
protected function getAutoSearchSubmit(MUtil_Model_ModelAbstract $model, MUtil_Form $form)
@@ -636,7 +636,7 @@
foreach ($data as $key => $value) {
if ((is_array($value) && empty($value)) || (is_string($value) && 0 === strlen($value))) {
unset($data[$key]);
- }
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-10-01 12:57:26
|
Revision: 965
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=965&view=rev
Author: mennodekker
Date: 2012-10-01 12:57:20 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
Fix error with tabs and autosearch (request doesn't know about tabs)
Add Excel to survey maintenance
Modified Paths:
--------------
trunk/library/classes/Gems/Controller/BrowseEditAction.php
trunk/library/classes/Gems/Menu/MenuAbstract.php
Modified: trunk/library/classes/Gems/Controller/BrowseEditAction.php
===================================================================
--- trunk/library/classes/Gems/Controller/BrowseEditAction.php 2012-09-27 11:14:25 UTC (rev 964)
+++ trunk/library/classes/Gems/Controller/BrowseEditAction.php 2012-10-01 12:57:20 UTC (rev 965)
@@ -640,6 +640,9 @@
}
}
+ // Make sure to update the request
+ $this->getRequest()->setParams($data);
+
return $data;
}
Modified: trunk/library/classes/Gems/Menu/MenuAbstract.php
===================================================================
--- trunk/library/classes/Gems/Menu/MenuAbstract.php 2012-09-27 11:14:25 UTC (rev 964)
+++ trunk/library/classes/Gems/Menu/MenuAbstract.php 2012-10-01 12:57:20 UTC (rev 965)
@@ -444,6 +444,7 @@
// SURVEY MAINTENANCE CONTROLLER
$page = $setup->addPage($this->_('Surveys'), 'pr.survey-maintenance', 'survey-maintenance');
$page->addEditAction();
+ $page->addExcelAction();
$page->addShowAction();
$page->addPdfButton($this->_('PDF'), 'pr.survey-maintenance')
->addParameters(MUtil_Model::REQUEST_ID)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-09-27 11:14:31
|
Revision: 964
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=964&view=rev
Author: matijsdejong
Date: 2012-09-27 11:14:25 +0000 (Thu, 27 Sep 2012)
Log Message:
-----------
Fix where standalone surveys where saved with the gtr_track_type "'" instead of "S".
Modified Paths:
--------------
trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php
Modified: trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php
===================================================================
--- trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php 2012-09-27 08:41:00 UTC (rev 963)
+++ trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php 2012-09-27 11:14:25 UTC (rev 964)
@@ -192,10 +192,11 @@
// These fields are needed only when the stand alone survey is being created.
$bridge->addHiddenMulti('gro_id_order', 'gro_id_track',
'gro_id_survey', 'gro_survey_name', 'gro_round_description',
- 'gtr_track_name', 'gtr_survey_rounds', 'gtr_track_type');
+ 'gtr_track_name', 'gtr_survey_rounds');
}
$bridge->addHidden('create_stand_alone');
+ $bridge->addHidden('gtr_track_type'); // Always store, otherwise join expression is used as value. :(
$bridge->addText( 'gtr_track_info', 'label', $this->_('Description'));
$bridge->addDate( 'gtr_date_start', 'label', $this->_('Assignable since'));
$bridge->addDate( 'gtr_date_until', 'label', $this->_('Assignable until'));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-09-27 08:41:06
|
Revision: 963
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=963&view=rev
Author: mennodekker
Date: 2012-09-27 08:41:00 +0000 (Thu, 27 Sep 2012)
Log Message:
-----------
removed debug statement
Modified Paths:
--------------
trunk/library/classes/MUtil/Snippets/SnippetAbstract.php
Modified: trunk/library/classes/MUtil/Snippets/SnippetAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Snippets/SnippetAbstract.php 2012-09-26 18:33:03 UTC (rev 962)
+++ trunk/library/classes/MUtil/Snippets/SnippetAbstract.php 2012-09-27 08:41:00 UTC (rev 963)
@@ -243,7 +243,7 @@
public function redirectRoute()
{
if ($url = $this->getRedirectRoute()) {
- MUtil_Echo::track($url);
+ //MUtil_Echo::track($url);
$router = new Zend_Controller_Action_Helper_Redirector();
$router->gotoRouteAndExit($url, null, $this->resetRoute);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-09-26 18:33:12
|
Revision: 962
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=962&view=rev
Author: matijsdejong
Date: 2012-09-26 18:33:03 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
Code now works with multiple success reception codes
Modified Paths:
--------------
trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php
trunk/library/classes/Gems/Default/ReceptionAction.php
trunk/library/classes/Gems/Util/ReceptionCode.php
trunk/library/classes/MUtil/Snippets/SnippetAbstract.php
trunk/library/snippets/Generic/ModelItemTableSnippet.php
trunk/library/snippets/ShowSingleSurveyTokenSnippet.php
trunk/library/snippets/ShowTrackTokenSnippet.php
Modified: trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php
===================================================================
--- trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php 2012-09-26 13:35:44 UTC (rev 961)
+++ trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php 2012-09-26 18:33:03 UTC (rev 962)
@@ -118,7 +118,7 @@
*
* @var mixed String or array of snippets name
*/
- protected $showSnippets = array('Generic_ContentTitleSnippet', 'Generic_ModelItemTableSnippet');
+ protected $showSnippets = array('Generic_ContentTitleSnippet', 'ModelItemTableSnippetGeneric');
/**
*
Modified: trunk/library/classes/Gems/Default/ReceptionAction.php
===================================================================
--- trunk/library/classes/Gems/Default/ReceptionAction.php 2012-09-26 13:35:44 UTC (rev 961)
+++ trunk/library/classes/Gems/Default/ReceptionAction.php 2012-09-26 18:33:03 UTC (rev 962)
@@ -82,7 +82,6 @@
$model->set('grc_success', 'label', $this->_('Is success code'),
'multiOptions', $yesNo ,
- 'disabled', true,
'elementClass', 'CheckBox',
'description', $this->_('This reception code is a success code.'));
$model->set('grc_active', 'label', $this->_('Active'),
Modified: trunk/library/classes/Gems/Util/ReceptionCode.php
===================================================================
--- trunk/library/classes/Gems/Util/ReceptionCode.php 2012-09-26 13:35:44 UTC (rev 961)
+++ trunk/library/classes/Gems/Util/ReceptionCode.php 2012-09-26 18:33:03 UTC (rev 962)
@@ -92,6 +92,24 @@
*
* @return boolean
*/
+ public function getDescription()
+ {
+ return $this->_get('grc_description');
+ }
+
+ /**
+ *
+ * @return boolean
+ */
+ public function hasDescription()
+ {
+ return (boolean) $this->_get('grc_description');
+ }
+
+ /**
+ *
+ * @return boolean
+ */
public function hasRedoCode()
{
return (boolean) $this->_get('grc_redo_survey');
Modified: trunk/library/classes/MUtil/Snippets/SnippetAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Snippets/SnippetAbstract.php 2012-09-26 13:35:44 UTC (rev 961)
+++ trunk/library/classes/MUtil/Snippets/SnippetAbstract.php 2012-09-26 18:33:03 UTC (rev 962)
@@ -243,6 +243,7 @@
public function redirectRoute()
{
if ($url = $this->getRedirectRoute()) {
+ MUtil_Echo::track($url);
$router = new Zend_Controller_Action_Helper_Redirector();
$router->gotoRouteAndExit($url, null, $this->resetRoute);
}
Modified: trunk/library/snippets/Generic/ModelItemTableSnippet.php
===================================================================
--- trunk/library/snippets/Generic/ModelItemTableSnippet.php 2012-09-26 13:35:44 UTC (rev 961)
+++ trunk/library/snippets/Generic/ModelItemTableSnippet.php 2012-09-26 18:33:03 UTC (rev 962)
@@ -39,6 +39,7 @@
* Displays each fields of a single item in a model in a row in a Html table
* the model set through the $model snippet parameter.
*
+ * @deprecated No longer needed with new snippet loader
* @package Gems
* @subpackage Snippets\Generic
* @copyright Copyright (c) 2011 Erasmus MC
Modified: trunk/library/snippets/ShowSingleSurveyTokenSnippet.php
===================================================================
--- trunk/library/snippets/ShowSingleSurveyTokenSnippet.php 2012-09-26 13:35:44 UTC (rev 961)
+++ trunk/library/snippets/ShowSingleSurveyTokenSnippet.php 2012-09-26 18:33:03 UTC (rev 962)
@@ -100,7 +100,7 @@
// COMPLETION DATE
$fields = array();
- if (! $this->token->hasSuccesCode()) {
+ if ($this->token->getReceptionCode()->hasDescription()) {
$bridge->addMarkerRow();
$fields[] = 'grc_description';
}
Modified: trunk/library/snippets/ShowTrackTokenSnippet.php
===================================================================
--- trunk/library/snippets/ShowTrackTokenSnippet.php 2012-09-26 13:35:44 UTC (rev 961)
+++ trunk/library/snippets/ShowTrackTokenSnippet.php 2012-09-26 18:33:03 UTC (rev 962)
@@ -105,7 +105,7 @@
// COMPLETION DATE
$fields = array();
- if (! $this->token->hasSuccesCode()) {
+ if ($this->token->getReceptionCode()->hasDescription()) {
$bridge->addMarkerRow();
$fields[] = 'grc_description';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-09-26 13:35:55
|
Revision: 961
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=961&view=rev
Author: mennodekker
Date: 2012-09-26 13:35:44 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
exclude external radius class
Modified Paths:
--------------
trunk/scripts/build.xml
Modified: trunk/scripts/build.xml
===================================================================
--- trunk/scripts/build.xml 2012-09-26 13:07:13 UTC (rev 960)
+++ trunk/scripts/build.xml 2012-09-26 13:35:44 UTC (rev 961)
@@ -4,6 +4,7 @@
<include name="Gems/**/*.php"/>
<include name="MUtil/**/*.php"/>
<include name="GemsEscort.php"/>
+ <exclude name="Gems/User/Adapter/Radius/**.**"/>
</fileset>
<fileset id="sql-creation-scripts" dir="../library/configs/db/tables">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-09-26 13:07:19
|
Revision: 960
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=960&view=rev
Author: mennodekker
Date: 2012-09-26 13:07:13 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
Updated build file with dependencies + moved to phpdocumentor2
Modified Paths:
--------------
trunk/scripts/build.xml
Modified: trunk/scripts/build.xml
===================================================================
--- trunk/scripts/build.xml 2012-09-26 12:48:58 UTC (rev 959)
+++ trunk/scripts/build.xml 2012-09-26 13:07:13 UTC (rev 960)
@@ -87,17 +87,18 @@
</phplint>
</target>
- <!-- Build documentation (docblox) -->
- <target name="build-docs">
- <docblox title="Gems Code Documentation"
+ <!-- Build documentation (phpdocumentor2) -->
+ <target name="build-docs" depends="prepare">
+ <phpdoc2 title="Gems Code Documentation"
quiet="true"
- output="docs">
+ destdir="docs"
+ template="responsive">
<fileset refid="library"/>
- </docblox>
+ </phpdoc2>
</target>
<!-- Gather metrics -->
- <target name="build-metrics">
+ <target name="build-metrics" depends="prepare">
<phpmd>
<formatter type="html" outfile="reports/pmd.html"/>
<fileset refid="library"/>
@@ -115,7 +116,7 @@
</target>
<!-- Run PHP CodeSniffer -->
- <target name="build-phpcs">
+ <target name="build-phpcs" depends="prepare">
<phpcodesniffer standard="gems.xml">
<fileset refid="library"/>
<formatter type="checkstyle"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-09-26 12:49:08
|
Revision: 959
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=959&view=rev
Author: matijsdejong
Date: 2012-09-26 12:48:58 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
Bug where ModelTableSnippetAbstract.php would result in a different query from the request cache than from the request.
Made generic version of AutosearchFormSnippet.php for ease of inheritance
Modified Paths:
--------------
trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php
trunk/library/classes/Gems/Snippets/ModelTableSnippetAbstract.php
trunk/library/classes/Gems/Util/DbLookup.php
trunk/library/snippets/Generic/AutosearchFormSnippet.php
Added Paths:
-----------
trunk/library/classes/Gems/Snippets/AutosearchFormSnippet.php
Modified: trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php
===================================================================
--- trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php 2012-09-26 10:50:29 UTC (rev 958)
+++ trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php 2012-09-26 12:48:58 UTC (rev 959)
@@ -104,7 +104,7 @@
*
* @var mixed String or array of snippets name
*/
- protected $indexStartSnippets = array('Generic_ContentTitleSnippet', 'Generic_AutosearchFormSnippet');
+ protected $indexStartSnippets = array('Generic_ContentTitleSnippet', 'AutosearchFormSnippet');
/**
* The snippets used for the index action, after those in autofilter
Added: trunk/library/classes/Gems/Snippets/AutosearchFormSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/AutosearchFormSnippet.php (rev 0)
+++ trunk/library/classes/Gems/Snippets/AutosearchFormSnippet.php 2012-09-26 12:48:58 UTC (rev 959)
@@ -0,0 +1,269 @@
+<?php
+
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * @package Gems
+ * @subpackage Snippets\Generic
+ * @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 $
+ */
+
+/**
+ * Display a search form that selects on typed text only
+ *
+ * @package Gems
+ * @subpackage Snippets\Generic
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.5.6
+ */
+class Gems_Snippets_AutosearchFormSnippet extends MUtil_Snippets_SnippetAbstract
+{
+ /**
+ *
+ * @var Zend_Db_Adapter_Abstract
+ */
+ protected $db;
+
+ /**
+ *
+ * @var string The id of a div that contains target that should be replaced.
+ */
+ protected $containingId;
+
+ /**
+ *
+ * @var MUtil_Model_ModelAbstract
+ */
+ protected $model;
+
+ /**
+ *
+ * @var Zend_Controller_Request_Abstract
+ */
+ protected $request;
+
+ /**
+ * Optional, otherwise created from $util
+ *
+ * @var Gems_Util_RequestCache
+ */
+ public $requestCache;
+
+ /**
+ *
+ * @var Gems_Util
+ */
+ protected $util;
+
+ /**
+ *
+ * @var string Id for auto search button
+ */
+ protected $searchButtonId = 'AUTO_SEARCH_TEXT_BUTTON';
+
+
+ /**
+ * Creates a Zend_Form_Element_Select
+ *
+ * If $options is a string it is assumed to contain an SQL statement.
+ *
+ * @param string $name Name of the select element
+ * @param string|array $options Can be a SQL select string or key/value array of options
+ * @param string $empty Text to display for the empty selector
+ * @return Zend_Form_Element_Select
+ */
+ protected function _createSelectElement($name, $options, $empty = null)
+ {
+ if ($options instanceof MUtil_Model_ModelAbstract) {
+ $options = $options->get($name, 'multiOptions');
+ } elseif (is_string($options)) {
+ $options = $this->db->fetchPairs($options);
+ natsort($options);
+ }
+ if ($options || null !== $empty)
+ {
+ if (null !== $empty) {
+ $options = array('' => $empty) + $options;
+ }
+ $element = new Zend_Form_Element_Select($name, array('multiOptions' => $options));
+
+ return $element;
+ }
+ }
+
+ /**
+ * Should be called after answering the request to allow the Target
+ * to check if all required registry values have been set correctly.
+ *
+ * @return boolean False if required are missing.
+ */
+ public function checkRegistryRequestsAnswers()
+ {
+ if ($this->util && (! $this->requestCache)) {
+ $this->requestCache = $this->util->getRequestCache();
+ }
+ if ($this->requestCache) {
+ // Do not store searchButtonId
+ $this->requestCache->removeParams($this->searchButtonId);
+ }
+
+ return parent::checkRegistryRequestsAnswers();
+ }
+
+ /**
+ * Creates the form itself
+ *
+ * @param array $options
+ * @return Gems_Form
+ */
+ protected function createForm($options = null)
+ {
+ $form = new Gems_Form($options);
+
+ return $form;
+ }
+
+ /**
+ * 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.
+ * That creates a distinct group of elements
+ *
+ * @param array $data The $form field values (can be usefull, but no need to set them)
+ * @return array Of Zend_Form_Element's or static tekst to add to the html or null for group breaks.
+ */
+ protected function getAutoSearchElements(array $data)
+ {
+ // Search text
+ $element = new Zend_Form_Element_Text($this->model->getTextFilter(), array('label' => $this->_('Free search text'), 'size' => 20, 'maxlength' => 30));
+
+ return array($element);
+ }
+
+ /**
+ * Creates an autosearch form for indexAction.
+ *
+ * @return Gems_Form|null
+ */
+ protected function getAutoSearchForm()
+ {
+ $data = $this->getSearchData();
+
+ $elements = $this->getAutoSearchElements($data);
+
+ if ($elements) {
+ $form = $this->createForm(array('name' => 'autosubmit')); // Assign a name so autosubmit will only work on this form (when there are others)
+ $form->setHtml('div');
+
+ $div = $form->getHtml();
+ $div->class = 'search';
+
+ $span = $div->div(array('class' => 'inputgroup'));
+
+ $elements[] = $this->getAutoSearchSubmit();
+
+ foreach ($elements as $element) {
+ if ($element instanceof Zend_Form_Element) {
+ if ($element->getLabel()) {
+ $span->label($element);
+ }
+ $span->input($element);
+ // TODO: Elementen automatisch toevoegen in MUtil_Form
+ $form->addElement($element);
+ } elseif (null === $element) {
+ $span = $div->div(array('class' => 'inputgroup'));
+ } else {
+ $span[] = $element;
+ }
+ }
+
+ if ($this->request->isPost()) {
+ if (! $form->isValid($data)) {
+ $this->addMessage($form->getErrorMessages());
+ $this->addMessage($form->getMessages());
+ }
+ } else {
+ $form->populate($data);
+ }
+
+ $href = $this->getAutoSearchHref();
+ $form->setAutoSubmit($href, $this->containingId);
+
+ return $form;
+ }
+ }
+
+ /**
+ *
+ * @return string Href attribute for type as you go autofilter
+ */
+ protected function getAutoSearchHref()
+ {
+ return MUtil_Html::attrib('href', array('action' => 'autofilter', $this->model->getTextFilter() => null, 'RouteReset' => true));
+ }
+
+ /**
+ * Creates a submit button
+ *
+ * @param MUtil_Form $form
+ * @return Zend_Form_Element_Submit
+ */
+ protected function getAutoSearchSubmit()
+ {
+ return new Zend_Form_Element_Submit($this->searchButtonId, array('label' => $this->_('Search'), 'class' => 'button small'));
+ }
+
+ /**
+ * Create the snippets content
+ *
+ * This is a stub function either override getHtmlOutput() or override render()
+ *
+ * @param Zend_View_Abstract $view Just in case it is needed here
+ * @return MUtil_Html_HtmlInterface Something that can be rendered
+ */
+ public function getHtmlOutput(Zend_View_Abstract $view)
+ {
+ return $this->getAutoSearchForm();
+ }
+
+ /**
+ *
+ * @return array The data to fill the form with
+ */
+ protected function getSearchData()
+ {
+ if ($this->requestCache) {
+ return $this->requestCache->getProgramParams();
+ } else {
+ return $this->request->getParams();
+ }
+ }
+}
Modified: trunk/library/classes/Gems/Snippets/ModelTableSnippetAbstract.php
===================================================================
--- trunk/library/classes/Gems/Snippets/ModelTableSnippetAbstract.php 2012-09-26 10:50:29 UTC (rev 958)
+++ trunk/library/classes/Gems/Snippets/ModelTableSnippetAbstract.php 2012-09-26 12:48:58 UTC (rev 959)
@@ -275,6 +275,9 @@
if ($this->requestCache) {
$data = $this->requestCache->getProgramParams();
+ // Remove all empty values (but not arrays) from the filter
+ $data = array_filter($data, function($i) { return is_array($i) || strlen($i); });
+
$model->applyParameters($data);
} else {
Modified: trunk/library/classes/Gems/Util/DbLookup.php
===================================================================
--- trunk/library/classes/Gems/Util/DbLookup.php 2012-09-26 10:50:29 UTC (rev 958)
+++ trunk/library/classes/Gems/Util/DbLookup.php 2012-09-26 12:48:58 UTC (rev 959)
@@ -92,6 +92,7 @@
return $organizations;
}
+
/**
* Return key/value pairs of all active staff members
*
Modified: trunk/library/snippets/Generic/AutosearchFormSnippet.php
===================================================================
--- trunk/library/snippets/Generic/AutosearchFormSnippet.php 2012-09-26 10:50:29 UTC (rev 958)
+++ trunk/library/snippets/Generic/AutosearchFormSnippet.php 2012-09-26 12:48:58 UTC (rev 959)
@@ -41,197 +41,12 @@
*
* Long description for class (if any)...
*
+ * @deprecated No longer needed with new snippet loader
* @package Gems
* @subpackage Snippets\Generic
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
* @since Class available since version 1.4.2
*/
-class Generic_AutosearchFormSnippet extends MUtil_Snippets_SnippetAbstract
-{
- /**
- *
- * @var string The id of a div that contains target that should be replaced.
- */
- protected $containingId;
-
- /**
- *
- * @var MUtil_Model_ModelAbstract
- */
- protected $model;
-
- /**
- *
- * @var Zend_Controller_Request_Abstract
- */
- protected $request;
-
- /**
- * Optional, otherwise created from $util
- *
- * @var Gems_Util_RequestCache
- */
- public $requestCache;
-
- /**
- *
- * @var Gems_Util
- */
- protected $util;
-
- /**
- *
- * @var string Id for auto search button
- */
- protected $searchButtonId = 'AUTO_SEARCH_TEXT_BUTTON';
-
-
- /**
- * Should be called after answering the request to allow the Target
- * to check if all required registry values have been set correctly.
- *
- * @return boolean False if required are missing.
- */
- public function checkRegistryRequestsAnswers()
- {
- if ($this->util && (! $this->requestCache)) {
- $this->requestCache = $this->util->getRequestCache();
- }
- if ($this->requestCache) {
- // Do not store searchButtonId
- $this->requestCache->removeParams($this->searchButtonId);
- }
-
- return parent::checkRegistryRequestsAnswers();
- }
-
- /**
- * Creates the form itself
- *
- * @param array $options
- * @return Gems_Form
- */
- protected function createForm($options = null)
- {
- $form = new Gems_Form($options);
-
- return $form;
- }
-
- /**
- * 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.
- * That creates a distinct group of elements
- *
- * @param array $data The $form field values (can be usefull, but no need to set them)
- * @return array Of Zend_Form_Element's or static tekst to add to the html or null for group breaks.
- */
- protected function getAutoSearchElements(array $data)
- {
- // Search text
- $element = new Zend_Form_Element_Text($this->model->getTextFilter(), array('label' => $this->_('Free search text'), 'size' => 20, 'maxlength' => 30));
-
- return array($element);
- }
-
- /**
- * Creates an autosearch form for indexAction.
- *
- * @return Gems_Form|null
- */
- protected function getAutoSearchForm()
- {
- $data = $this->getSearchData();
-
- $elements = $this->getAutoSearchElements($data);
-
- if ($elements) {
- $form = $this->createForm(array('name' => 'autosubmit')); // Assign a name so autosubmit will only work on this form (when there are others)
- $form->setHtml('div');
-
- $div = $form->getHtml();
- $div->class = 'search';
-
- $span = $div->div(array('class' => 'inputgroup'));
-
- $elements[] = $this->getAutoSearchSubmit();
-
- foreach ($elements as $element) {
- if ($element instanceof Zend_Form_Element) {
- if ($element->getLabel()) {
- $span->label($element);
- }
- $span->input($element);
- // TODO: Elementen automatisch toevoegen in MUtil_Form
- $form->addElement($element);
- } elseif (null === $element) {
- $span = $div->div(array('class' => 'inputgroup'));
- } else {
- $span[] = $element;
- }
- }
-
- if ($this->request->isPost()) {
- if (! $form->isValid($data)) {
- $this->addMessage($form->getErrorMessages());
- $this->addMessage($form->getMessages());
- }
- } else {
- $form->populate($data);
- }
-
- $href = $this->getAutoSearchHref();
- $form->setAutoSubmit($href, $this->containingId);
-
- return $form;
- }
- }
-
- /**
- *
- * @return string Href attribute for type as you go autofilter
- */
- protected function getAutoSearchHref()
- {
- return MUtil_Html::attrib('href', array('action' => 'autofilter', $this->model->getTextFilter() => null, 'RouteReset' => true));
- }
-
- /**
- * Creates a submit button
- *
- * @param MUtil_Form $form
- * @return Zend_Form_Element_Submit
- */
- protected function getAutoSearchSubmit()
- {
- return new Zend_Form_Element_Submit($this->searchButtonId, array('label' => $this->_('Search'), 'class' => 'button small'));
- }
-
- /**
- * Create the snippets content
- *
- * This is a stub function either override getHtmlOutput() or override render()
- *
- * @param Zend_View_Abstract $view Just in case it is needed here
- * @return MUtil_Html_HtmlInterface Something that can be rendered
- */
- public function getHtmlOutput(Zend_View_Abstract $view)
- {
- return $this->getAutoSearchForm();
- }
-
- /**
- *
- * @return array The data to fill the form with
- */
- protected function getSearchData()
- {
- if ($this->requestCache) {
- return $this->requestCache->getProgramParams();
- } else {
- return $this->request->getParams();
- }
- }
-}
+class Generic_AutosearchFormSnippet extends Gems_Snippets_AutosearchFormSnippet
+{ }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-09-26 10:50:35
|
Revision: 958
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=958&view=rev
Author: mennodekker
Date: 2012-09-26 10:50:29 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
Fix for missing fields in excel output
Modified Paths:
--------------
trunk/library/classes/Gems/View/Helper/Excel.php
Modified: trunk/library/classes/Gems/View/Helper/Excel.php
===================================================================
--- trunk/library/classes/Gems/View/Helper/Excel.php 2012-09-26 10:33:36 UTC (rev 957)
+++ trunk/library/classes/Gems/View/Helper/Excel.php 2012-09-26 10:50:29 UTC (rev 958)
@@ -62,6 +62,7 @@
$row = (array) $row;
}
if ($rowcnt == 0) {
+ $headerRow = $row;
//Only for the first row: output headers
$output = "<table>\r\n";
$output .= "\t<thead>\r\n";
@@ -77,7 +78,9 @@
}
} else {
$output .= "\t\t<tr>\r\n";
- foreach ($row as $name => $value) {
+ // Make sure we repeat all header rows, even when no data present
+ foreach ($headerRow as $key => $value) {
+ $value = isset($row[$key]) ? $row[$key] : null;
$output .= "\t\t\t<td>$value</td>\r\n";
}
$output .= "\t\t</tr>\r\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
