gemstracker-svn Mailing List for GemsTracker (Page 16)

Brought to you by: frasan, matijsdejong, mennodekker, roelfaber

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

Flat | Threaded

<< < 1 .. 14 15 16 17 18 .. 50 > >> (Page 16 of 50)

[Gemstracker-svn] SF.net SVN: gemstracker:[857] trunk/library/classes/Gems/User/Form/ LayeredLoginForm.php

From: <gem...@li...> - 2012-07-19 08:48:10

Revision: 857
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=857&view=rev
Author:   mennodekker
Date:     2012-07-19 08:48:00 +0000 (Thu, 19 Jul 2012)
Log Message:
-----------
Fix for bug #549

Modified Paths:
--------------
    trunk/library/classes/Gems/User/Form/LayeredLoginForm.php

Modified: trunk/library/classes/Gems/User/Form/LayeredLoginForm.php
===================================================================
--- trunk/library/classes/Gems/User/Form/LayeredLoginForm.php	2012-07-18 11:55:39 UTC (rev 856)
+++ trunk/library/classes/Gems/User/Form/LayeredLoginForm.php	2012-07-19 08:48:00 UTC (rev 857)
@@ -88,11 +88,11 @@
         }
 
         try {
-            $organizations = $this->db->fetchPairs('SELECT gor_id_organization, gor_name FROM gems__organizations WHERE gor_active=1 AND gor_has_login=1 AND (gor_accessible_by LIKE ' . $this->db->quote(':' . $parentId . ':') . ' OR gor_id_organization = ' . $this->db->quote($parentId) .  ') ORDER BY gor_name');
+            $organizations = $this->db->fetchPairs('SELECT gor_id_organization, gor_name FROM gems__organizations WHERE gor_active=1 AND gor_has_login=1 AND (gor_accessible_by LIKE ' . $this->db->quote('%:' . $parentId . ':%') . ' OR gor_id_organization = ' . $this->db->quote($parentId) .  ') ORDER BY gor_name');
         } catch (Exception $e) {
             try {
                 // 1.4 fallback
-                $organizations = $this->db->fetchPairs('SELECT gor_id_organization, gor_name FROM gems__organizations WHERE gor_active=1 AND (gor_accessible_by LIKE ' . $this->db->quote(':' . $parentId . ':') . ' OR gor_id_organization = ' . $this->db->quote($parentId) .  ') ORDER BY gor_name');
+                $organizations = $this->db->fetchPairs('SELECT gor_id_organization, gor_name FROM gems__organizations WHERE gor_active=1 AND (gor_accessible_by LIKE ' . $this->db->quote('%:' . $parentId . ':%') . ' OR gor_id_organization = ' . $this->db->quote($parentId) .  ') ORDER BY gor_name');
             } catch (Exception $e) {
                 $organizations = array();
             }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[856] trunk/library

From: <gem...@li...> - 2012-07-18 11:55:49

Revision: 856
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=856&view=rev
Author:   michieltcs
Date:     2012-07-18 11:55:39 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
Fix 'privilige' typos, mark addHiddenPrivilige as deprecated (but retain it to keep BC)

Modified Paths:
--------------
    trunk/library/classes/Gems/Menu.php
    trunk/library/languages/default-nl.mo
    trunk/library/languages/default-nl.po

Modified: trunk/library/classes/Gems/Menu.php
===================================================================
--- trunk/library/classes/Gems/Menu.php	2012-07-18 11:53:21 UTC (rev 855)
+++ trunk/library/classes/Gems/Menu.php	2012-07-18 11:55:39 UTC (rev 856)
@@ -60,7 +60,7 @@
      */
     private $_currentMenuItem;
 
-    private $_hiddenPriviliges = array();
+    private $_hiddenPrivileges = array();
     private $_onlyActiveBranchVisible = false;
 
     /**
@@ -128,7 +128,7 @@
      *
      * @param string $label Label for the whole menu
      * @param string $project The project object
-     * @param string $privilege The privilige for reporting bugs
+     * @param string $privilege The privilege for reporting bugs
      */
     public function addContactPage($label)
     {
@@ -157,8 +157,8 @@
      * you should ALWAYS put this menu in the root menu.
      *
      * @param string $label Label for the whole menu
-     * @param string $privilegeShow The limited privilige (look and edit some items)
-     * @param string $privilegeEdits The privilige for being allowed to do anything
+     * @param string $privilegeShow The limited privilege (look and edit some items)
+     * @param string $privilegeEdits The privilege for being allowed to do anything
      */
     public function addGemsSetupContainer($label)
     {
@@ -226,15 +226,27 @@
     }
 
     /**
-     * Use this to add a privilege that is not associated with a menu item.
+     * Method retained to maintain BC - {@see Gems_Menu::addHiddenPrivilege}
      *
+     * @deprecated
      * @param string $privilege
      * @return Gems_Menu
      */
     public function addHiddenPrivilige($privilege)
     {
-        $this->_hiddenPriviliges[$privilege] = sprintf($this->_('Stand-alone privilige: %s'), $privilege);
+        return $this->addHiddenPrivilege($privilege);
+    }
 
+    /**
+     * Use this to add a privilege that is not associated with a menu item.
+     *
+     * @param string $privilege
+     * @return Gems_Menu
+     */
+    public function addHiddenPrivilege($privilege)
+    {
+        $this->_hiddenPrivileges[$privilege] = sprintf($this->_('Stand-alone privilege: %s'), $privilege);
+
         return $this;
     }
 
@@ -538,7 +550,7 @@
      */
     public function getUsedPrivileges()
     {
-        $privileges = $this->_hiddenPriviliges;
+        $privileges = $this->_hiddenPrivileges;
 
         $this->_addUsedPrivileges($privileges, '');
 
@@ -601,14 +613,14 @@
         $this->addContactPage($this->_('Contact'));
 
         // Privileges not associated with menu item
-        //$this->addHiddenPrivilige('pr.plan.choose-org');
-        $this->addHiddenPrivilige('pr.plan.mail-as-application');
-        $this->addHiddenPrivilige('pr.respondent.multiorg');
-        $this->addHiddenPrivilige('pr.respondent.result');
-        $this->addHiddenPrivilige('pr.respondent.who');
-        $this->addHiddenPrivilige('pr.staff.edit.all');
-        $this->addHiddenPrivilige('pr.staff.see.all');
-        $this->addHiddenPrivilige('pr.token.mail.freetext');
+        //$this->addHiddenPrivilege('pr.plan.choose-org');
+        $this->addHiddenPrivilege('pr.plan.mail-as-application');
+        $this->addHiddenPrivilege('pr.respondent.multiorg');
+        $this->addHiddenPrivilege('pr.respondent.result');
+        $this->addHiddenPrivilege('pr.respondent.who');
+        $this->addHiddenPrivilege('pr.staff.edit.all');
+        $this->addHiddenPrivilege('pr.staff.see.all');
+        $this->addHiddenPrivilege('pr.token.mail.freetext');
 
 
         //Changelog added as button only

Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)

Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po	2012-07-18 11:53:21 UTC (rev 855)
+++ trunk/library/languages/default-nl.po	2012-07-18 11:55:39 UTC (rev 856)
@@ -1,5230 +1,5219 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: GemsTracker NL\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-18 11:32+0100\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Menno Dekker <men...@er...>\n"
-"Language-Team: Erasmus MGZ <mat...@ma...>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Poedit-Language: Dutch\n"
-"X-Poedit-Country: NETHERLANDS\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Poedit-Basepath: ../\n"
-"X-Poedit-KeywordsList: plural:1,2\n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: classes/GemsEscort.php:215
-#, php-format
-msgid "Path %s not writable"
-msgstr "Path %s niet schrijfbaar"
-
-#: classes/GemsEscort.php:597
-msgid " > "
-msgstr " | "
-
-#: classes/GemsEscort.php:788
-#, php-format
-msgid "You are logged in as %s"
-msgstr "Ingelogd als %s"
-
-#: classes/GemsEscort.php:790
-#: classes/Gems/Menu.php:249
-msgid "Logoff"
-msgstr "Uitloggen"
-
-#: classes/GemsEscort.php:793
-msgid "You are not logged in"
-msgstr "U bent niet ingelogd"
-
-#: classes/GemsEscort.php:980
-#, php-format
-msgid "User: %s"
-msgstr "Login: %s"
-
-#: classes/GemsEscort.php:1005
-msgid "version"
-msgstr "versie"
-
-#: classes/GemsEscort.php:1451
-msgid "Take note: your session has expired, your inputs were not saved. Please check the input data and try again"
-msgstr "Let op: uw sessie is verlopen, uw invoer is niet opgeslagen. Controleer uw gegevens en probeer a.u.b. opnieuw."
-
-#: classes/GemsEscort.php:1580
-msgid "Please check back later."
-msgstr "Probeer het later opnieuw."
-
-#: classes/GemsEscort.php:1582
-#: classes/GemsEscort.php:1586
-#: classes/GemsEscort.php:1587
-msgid "System is in maintenance mode"
-msgstr "Systeem is in onderhoudsmodus"
-
-#: classes/GemsEscort.php:1597
-msgid "No access to site."
-msgstr "Geen toegang tot website."
-
-#: classes/GemsEscort.php:1599
-#: classes/GemsEscort.php:1642
-msgid "You have no access to this site."
-msgstr "U heeft geen toegang tot deze website."
-
-#: classes/GemsEscort.php:1615
-msgid "No access to page"
-msgstr "Geen toegang tot pagina"
-
-#: classes/GemsEscort.php:1617
-#, php-format
-msgid "Access to this page is not allowed for current role: %s."
-msgstr "U heeft geen toegang tot deze pagina. Uw huidige rol is: %s."
-
-#: classes/GemsEscort.php:1627
-#: classes/GemsEscort.php:1640
-msgid "You are no longer logged in."
-msgstr "U bent niet meer ingelogd."
-
-#: classes/GemsEscort.php:1628
-msgid "You must login to access this page."
-msgstr "U moet ingelogd zijn voor toegang tot deze pagina."
-
-#: classes/GemsEscort.php:1769
-#: classes/GemsEscort.php:1771
-#, php-format
-msgid "%d survey"
-msgid_plural "%d surveys"
-msgstr[0] "%d vragenlijst"
-msgstr[1] "%d vragenlijsten"
-
-#: classes/Gems/AccessLog.php:236
-msgid "Database needs to be updated!"
-msgstr "Database dient ververst te worden!"
-
-#: classes/Gems/Html.php:155
-msgid "<< First"
-msgstr "<< Eerste"
-
-#: classes/Gems/Html.php:156
-msgid "< Previous"
-msgstr "< Terug"
-
-#: classes/Gems/Html.php:157
-msgid "Next >"
-msgstr "Verder >"
-
-#: classes/Gems/Html.php:158
-msgid "Last >>"
-msgstr "Laatste >>"
-
-#: classes/Gems/Html.php:159
-msgid " | "
-msgstr " | "
-
-#: classes/Gems/Html.php:163
-msgid "to"
-msgstr "tot"
-
-#: classes/Gems/Html.php:164
-msgid "of"
-msgstr "van"
-
-#: classes/Gems/Menu.php:140
-#, php-format
-msgid "About %s"
-msgstr "Over %s"
-
-#: classes/Gems/Menu.php:144
-msgid "Reporting bugs"
-msgstr "Meld een bug"
-
-#: classes/Gems/Menu.php:147
-msgid "Support"
-msgstr "Ondersteuning"
-
-#: classes/Gems/Menu.php:167
-msgid "Project setup"
-msgstr "Projectinfo"
-
-#: classes/Gems/Menu.php:170
-msgid "Database"
-msgstr "Database"
-
-#: classes/Gems/Menu.php:174
-msgid "Content"
-msgstr "Inhoud"
-
-#: classes/Gems/Menu.php:177
-msgid "Execute"
-msgstr "Uitvoeren"
-
-#: classes/Gems/Menu.php:182
-msgid "Patches"
-msgstr "Patches"
-
-#: classes/Gems/Menu.php:183
-msgid "Execute new"
-msgstr "Nieuwe aanmaken"
-
-#: classes/Gems/Menu.php:185
-msgid "Refresh translateables"
-msgstr "Ververs vertaalbaren"
-
-#: classes/Gems/Menu.php:187
-msgid "Run SQL"
-msgstr "SQL uitvoeren"
-
-#: classes/Gems/Menu.php:190
-msgid "Reception codes"
-msgstr "Ontvangst codes"
-
-#: classes/Gems/Menu.php:193
-msgid "Consents"
-msgstr "Toestemmingen"
-
-#: classes/Gems/Menu.php:196
-msgid "Roles"
-msgstr "Rollen"
-
-#: classes/Gems/Menu.php:197
-#: classes/Gems/Menu.php:377
-msgid "Assigned"
-msgstr "Toegewezen"
-
-#: classes/Gems/Menu.php:198
-msgid "Privileges"
-msgstr "Priviléges"
-
-#: classes/Gems/Menu.php:201
-msgid "Groups"
-msgstr "Groepen"
-
-#: classes/Gems/Menu.php:204
-msgid "Organizations"
-msgstr "Organisaties"
-
-#: classes/Gems/Menu.php:207
-msgid "Staff"
-msgstr "Medewerkers"
-
-#: classes/Gems/Menu.php:210
-msgid "Logging"
-msgstr "Logboek"
-
-#: classes/Gems/Menu.php:214
-msgid "Maintenance"
-msgstr "Onderhoud"
-
-#: classes/Gems/Menu.php:219
-msgid "Upgrade"
-msgstr "Upgrade"
-
-#: classes/Gems/Menu.php:220
-#: classes/Gems/Menu.php:341
-msgid "Show"
-msgstr "Toon"
-
-#: classes/Gems/Menu.php:221
-msgid "Execute all"
-msgstr "Alles uitvoeren"
-
-#: classes/Gems/Menu.php:222
-msgid "Execute this"
-msgstr "Dit uitvoeren"
-
-#: classes/Gems/Menu.php:223
-msgid "Execute from here"
-msgstr "Uitvoeren vanaf hier"
-
-#: classes/Gems/Menu.php:224
-msgid "Execute to here"
-msgstr "Uitvoeren tot hier"
-
-#: classes/Gems/Menu.php:236
-#, php-format
-msgid "Stand-alone privilige: %s"
-msgstr "Zelfstandig privilege: %s"
-
-#: classes/Gems/Menu.php:243
-msgid "Logon"
-msgstr "Login"
-
-#: classes/Gems/Menu.php:244
-msgid "Lost password"
-msgstr "Wachtwoord vergeten"
-
-#: classes/Gems/Menu.php:245
-msgid "Your account"
-msgstr "Uw account"
-
-#: classes/Gems/Menu.php:246
-msgid "Activity overview"
-msgstr "Activiteiten overzicht"
-
-#: classes/Gems/Menu.php:247
-msgid "Change password"
-msgstr "Uw wachtwoord"
-
-#: classes/Gems/Menu.php:248
-#: classes/Gems/Menu.php:301
-#: classes/Gems/Menu.php:347
-msgid "Token"
-msgstr "Kenmerk"
-
-#: classes/Gems/Menu.php:289
-msgid "Export"
-msgstr "Exporteer"
-
-#: classes/Gems/Menu.php:296
-msgid "Track"
-msgstr "Traject"
-
-#: classes/Gems/Menu.php:304
-#: classes/Gems/Menu.php:329
-#: classes/Gems/Menu.php:371
-msgid "Add"
-msgstr "Voeg toe"
-
-#: classes/Gems/Menu.php:310
-#: classes/Gems/Menu.php:410
-msgid "Preview"
-msgstr "Preview"
-
-#: classes/Gems/Menu.php:319
-msgid "Tracks"
-msgstr "Trajecten"
-
-#: classes/Gems/Menu.php:335
-msgid "Assignments"
-msgstr "Toewijzingen"
-
-#: classes/Gems/Menu.php:351
-msgid "Edit"
-msgstr "Wijzig"
-
-#: classes/Gems/Menu.php:357
-msgid "Delete"
-msgstr "Verwijder"
-
-#: classes/Gems/Menu.php:364
-msgid "Surveys"
-msgstr "Vragenlijsten"
-
-#: classes/Gems/Menu.php:401
-msgid "Fill in"
-msgstr "Vul in"
-
-#: classes/Gems/Menu.php:404
-msgid "Print PDF"
-msgstr "Print PDF"
-
-#: classes/Gems/Menu.php:407
-msgid "E-Mail now!"
-msgstr "Email nu!"
-
-#: classes/Gems/Menu.php:413
-msgid "Answers"
-msgstr "Antwoorden"
-
-#: classes/Gems/Menu.php:565
-msgid "Respondents"
-msgstr "Patiënten"
-
-#: classes/Gems/Menu.php:573
-msgid "Overview"
-msgstr "Overzicht"
-
-#: classes/Gems/Menu.php:580
-msgid "Project"
-msgstr "Project"
-
-#: classes/Gems/Menu.php:583
-msgid "Setup"
-msgstr "Beheer"
-
-#: classes/Gems/Menu.php:586
-msgid "Track Builder"
-msgstr "Traject bouwer"
-
-#: classes/Gems/Menu.php:589
-msgid "Mail"
-msgstr "Email"
-
-#: classes/Gems/Menu.php:595
-msgid "Export respondent"
-msgstr "Exporteer patiënt"
-
-#: classes/Gems/Menu.php:601
-msgid "Contact"
-msgstr "Contact"
-
-#: classes/Gems/Menu.php:615
-msgid "Changelog"
-msgstr "Changelog"
-
-#: classes/Gems/Model.php:206
-msgid "Respondent nr"
-msgstr "Patiënt nr"
-
-#: classes/Gems/Model.php:209
-msgid "Organization"
-msgstr "Organisatie"
-
-#: classes/Gems/Model.php:211
-msgid "Opened"
-msgstr "Bekeken op"
-
-#: classes/Gems/Model.php:212
-msgid "Consent"
-msgstr "Toestemming"
-
-#: classes/Gems/Model.php:214
-msgid "E-Mail"
-msgstr "Email"
-
-#: classes/Gems/Model.php:219
-msgid "Gender"
-msgstr "Geslacht"
-
-#: classes/Gems/Model.php:220
-msgid "First name"
-msgstr "Voornaam"
-
-#: classes/Gems/Model.php:221
-msgid "Surname prefix"
-msgstr "Tussenvoegsel"
-
-#: classes/Gems/Model.php:222
-msgid "Last name"
-msgstr "Achternaam"
-
-#: classes/Gems/Model.php:224
-msgid "Name"
-msgstr "Naam"
-
-#: classes/Gems/Model.php:227
-msgid "Street"
-msgstr "Straat"
-
-#: classes/Gems/Model.php:228
-msgid "Zipcode"
-msgstr "Postcode"
-
-#: classes/Gems/Model.php:229
-msgid "City"
-msgstr "Woonplaats"
-
-#: classes/Gems/Model.php:231
-msgid "Phone"
-msgstr "Telefoon"
-
-#: classes/Gems/Model.php:233
-msgid "Birthday"
-msgstr "Geboren op"
-
-#: classes/Gems/Pdf.php:198
-#, php-format
-msgid "PDF Source File '%s' not found!"
-msgstr "PDF bron bestand %s niet gevonden!"
-
-#: classes/Gems/Pdf.php:240
-#, php-format
-msgid "Could not create '%s' directory."
-msgstr "Kon de directory '%s' niet aanmaken."
-
-#: classes/Gems/Pdf.php:283
-#, php-format
-msgid " The error message is: %s"
-msgstr "De foutmelding is: %s"
-
-#: classes/Gems/Upgrades.php:79
-msgid "Syncing surveys for all sources"
-msgstr "Vragenlijsten synchroniseren voor alle bronnen."
-
-#: classes/Gems/UpgradesAbstract.php:154
-msgid "Already at max. level."
-msgstr "Al op het hoogste niveau."
-
-#: classes/Gems/UpgradesAbstract.php:161
-#, php-format
-msgid "Trying upgrade for %s from level %s to level %s"
-msgstr "Probeert upgrade voor %s van niveau %s naar niveau %s uit te voeren"
-
-#: classes/Gems/UpgradesAbstract.php:169
-#, php-format
-msgid "Trying upgrade for %s to level %s: %s"
-msgstr "Probeert upgrade voor %s naar niveau %s: %s"
-
-#: classes/Gems/Controller/BrowseEditAction.php:356
-#, php-format
-msgid "New %s..."
-msgstr "Nieuwe %s..."
-
-#: classes/Gems/Controller/BrowseEditAction.php:389
-#, php-format
-msgid "Delete %s"
-msgstr "Verwijder %s"
-
-#: classes/Gems/Controller/BrowseEditAction.php:393
-#, php-format
-msgid "%2$u %1$s deleted"
-msgstr "%2$u %1$s verwijderd"
-
-#: classes/Gems/Controller/BrowseEditAction.php:410
-#, php-format
-msgid "Edit %s %s"
-msgstr "Bewerk %s %s"
-
-#: classes/Gems/Controller/BrowseEditAction.php:412
-#, php-format
-msgid "Edit %s"
-msgstr "Bewerk %s"
-
-#: classes/Gems/Controller/BrowseEditAction.php:513
-msgid "Free search text"
-msgstr "Vrije zoek tekst"
-
-#: classes/Gems/Controller/BrowseEditAction.php:584
-msgid "Search"
-msgstr "Zoeken"
-
-#: classes/Gems/Controller/BrowseEditAction.php:600
-#, php-format
-msgid "No %s found"
-msgstr "Geen %s gevonden"
-
-#: classes/Gems/Controller/BrowseEditAction.php:684
-#, php-format
-msgid "No %s found."
-msgstr "Geen %s gevonden."
-
-#: classes/Gems/Controller/BrowseEditAction.php:802
-msgid "Are you sure?"
-msgstr "Weet u het zeker?"
-
-#: classes/Gems/Controller/BrowseEditAction.php:818
-msgid "Yes"
-msgstr "Ja"
-
-#: classes/Gems/Controller/BrowseEditAction.php:819
-msgid "No"
-msgstr "Nee"
-
-#: classes/Gems/Controller/BrowseEditAction.php:872
-#, php-format
-msgid "Unknown %s requested"
-msgstr "Onjuist %s verzoek"
-
-#: classes/Gems/Controller/BrowseEditAction.php:895
-#, php-format
-msgid "New %1$s..."
-msgstr "Nieuwe %1$s..."
-
-#: classes/Gems/Controller/BrowseEditAction.php:903
-msgid "Save"
-msgstr "Opslaan"
-
-#: classes/Gems/Controller/BrowseEditAction.php:939
-#, php-format
-msgid "%2$u %1$s saved"
-msgstr "%2$u %1$s opgeslagen"
-
-#: classes/Gems/Controller/BrowseEditAction.php:942
-msgid "No changes to save."
-msgstr "Geen verandering om op te slaan."
-
-#: classes/Gems/Controller/BrowseEditAction.php:951
-msgid "Input error! No changes saved!"
-msgstr "Invoer fout! Veranderingen niet opgeslagen!"
-
-#: classes/Gems/Controller/BrowseEditAction.php:979
-#, php-format
-msgid "Show %s"
-msgstr "Toon %s"
-
-#: classes/Gems/Controller/BrowseEditAction.php:986
-#, php-format
-msgid "Unknown %s."
-msgstr "%s is onbekend."
-
-#: classes/Gems/Controller/ModelActionAbstract.php:97
-#: classes/Gems/Default/DatabaseAction.php:503
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:249
-#, php-format
-msgid "Do you want to delete this %s?"
-msgstr "Weet u zeker dat deze %s verwijderd moet worden?"
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:282
-msgid "No data found."
-msgstr "Geen gegevens gevonden."
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:344
-#, php-format
-msgid "No %s found..."
-msgstr "Geen %s gevonden..."
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:354
-#, php-format
-msgid "Showing %s"
-msgstr "Toon %s"
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:390
-msgid "item"
-msgid_plural "items"
-msgstr[0] "item"
-msgstr[1] "items"
-
-#: classes/Gems/Controller/Action/Helper/BatchRunner.php:65
-msgid "Prepare recheck"
-msgstr "Hercontrole voorbereiden"
-
-#: classes/Gems/Controller/Action/Helper/BatchRunner.php:68
-#, php-format
-msgid "Start %s jobs"
-msgstr "Start %s opdrachten"
-
-#: classes/Gems/Controller/Action/Helper/BatchRunner.php:71
-msgid "Nothing to do."
-msgstr "Niets te doen."
-
-#: classes/Gems/Default/AskAction.php:88
-#, php-format
-msgid "Enter your %s token"
-msgstr "Voer uw %s kenmerk in"
-
-#: classes/Gems/Default/AskAction.php:91
-msgid "Tokens identify a survey that was assigned to you personally."
-msgstr "Elk kenmerk verwijst naar een specifiek aan u toegekende vragenlijst."
-
-#: classes/Gems/Default/AskAction.php:91
-msgid "Entering the token and pressing OK will open that survey."
-msgstr "Vul uw kenmerk in en druk op OK om die vragenlijst te openen."
-
-#: classes/Gems/Default/AskAction.php:95
-msgid "After answering the survey you will be logged off automatically."
-msgstr "Na het invullen wordt u automatisch uitgelogd."
-
-#: 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 "Een kenmerk bestaat uit twee groepen van vier cijfers en letters met een (niet verplicht) streepje ertussen. Hoofdletters of gewone letters maakt niets uit."
-
-#: 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 "Er wordt geen verschil gemaakt tussen het getal nul en de letter O en ook niet tussen het getal één en de 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 "Dank u voor uw antwoorden. Op dit moment hebben we geen vragenlijsten meer voor u."
-
-#: classes/Gems/Default/AskAction.php:138
-#, php-format
-msgid "The survey for token %s has been answered and no further surveys are open."
-msgstr "De vragenlijst met het kenmerk %s is beantwoord en er staan verder geen vragenlijsten open."
-
-#: classes/Gems/Default/AskAction.php:145
-#, php-format
-msgid "The token %s does not exist (any more)."
-msgstr "Het kenmerk %s bestaat niet (meer)."
-
-#: classes/Gems/Default/AskAction.php:273
-#, php-format
-msgid "The survey for token %s is no longer active."
-msgstr "De vragenlijst voor kenmerk %s is niet meer in gebruik."
-
-#: classes/Gems/Default/ConsentAction.php:68
-#: classes/Gems/Default/GroupAction.php:88
-msgid "Description"
-msgstr "Omschrijving"
-
-#: classes/Gems/Default/ConsentAction.php:70
-#: classes/Gems/Default/DatabaseAction.php:139
-msgid "Order"
-msgstr "Volgorde"
-
-#: classes/Gems/Default/ConsentAction.php:71
-msgid "Determines order of presentation in interface."
-msgstr "Bepaald de presentatie volgorde."
-
-#: classes/Gems/Default/ConsentAction.php:73
-msgid "Consent code"
-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 "Interne code, niet zichtbaar voor gebruikers maar wordt met de token informatie aan de bron doorgegeven."
-
-#: classes/Gems/Default/ConsentAction.php:92
-msgid "respondent consent"
-msgid_plural "respondent consents"
-msgstr[0] "patiënt toestemming"
-msgstr[1] "patiënt toestemmingen"
-
-#: classes/Gems/Default/ConsentAction.php:97
-msgid "Respondent consents"
-msgstr "Patiënt toestemming"
-
-#: classes/Gems/Default/ContactAction.php:71
-#, php-format
-msgid "%s is a web application."
-msgstr "%s is een web applicatie."
-
-#: classes/Gems/Default/ContactAction.php:76
-#, php-format
-msgid "The %s project is run by: "
-msgstr "%s is een project van: "
-
-#: classes/Gems/Default/ContactAction.php:82
-#, php-format
-msgid "%s is a collaboration of these organizations:"
-msgstr "Deze organisaties werken samen voor het %s project:"
-
-#: classes/Gems/Default/ContactAction.php:103
-#, php-format
-msgid "The %s project"
-msgstr "Het %s project"
-
-#: classes/Gems/Default/ContactAction.php:106
-msgid "Information on this application"
-msgstr "Information over deze website"
-
-#: classes/Gems/Default/ContactAction.php:107
-msgid "Links concerning this web application:"
-msgstr "Links met informatie over deze website:"
-
-#: classes/Gems/Default/CronAction.php:148
-msgid "Cron jobs turned off."
-msgstr "Cron opdrachten uitgezet."
-
-#: classes/Gems/Default/CronAction.php:223
-msgid "No mails sent."
-msgstr "Geen mail verzonden."
-
-#: classes/Gems/Default/CronAction.php:226
-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."
-
-#: classes/Gems/Default/DatabaseAction.php:75
-msgid "Cache cleaned"
-msgstr "Cache opgeschoond"
-
-#: classes/Gems/Default/DatabaseAction.php:105
-#, php-format
-msgid "No rows in %s."
-msgstr "Geen gegevens in %s."
-
-#: classes/Gems/Default/DatabaseAction.php:134
-msgid "Type"
-msgstr "Type"
-
-#: classes/Gems/Default/DatabaseAction.php:138
-msgid "Group"
-msgstr "Groep"
-
-#: classes/Gems/Default/DatabaseAction.php:140
-msgid "Location"
-msgstr "Locatie"
-
-#: classes/Gems/Default/DatabaseAction.php:143
-msgid "Status"
-msgstr "Status"
-
-#: classes/Gems/Default/DatabaseAction.php:146
-msgid "Script"
-msgstr "Script"
-
-#: classes/Gems/Default/DatabaseAction.php:148
-#: classes/Gems/Default/DatabaseAction.php:293
-#: classes/Gems/Default/DatabaseAction.php:340
-msgid "Changed on"
-msgstr "Veranderd op"
-
-#: classes/Gems/Default/DatabaseAction.php:167
-msgid "This database object does not exist. You cannot delete it."
-msgstr "Dit database object bestaat. Het kan dus ook niet verwijderd worden."
-
-#: classes/Gems/Default/DatabaseAction.php:172
-#, php-format
-msgid "Drop %s"
-msgstr "Verwijder %s"
-
-#: classes/Gems/Default/DatabaseAction.php:180
-#, php-format
-msgid "There are %d rows in the table."
-msgstr "Er zijn %d rijen in deze tabel."
-
-#: classes/Gems/Default/DatabaseAction.php:182
-#, php-format
-msgid "Drop table with %d rows"
-msgstr "Tabel met %d rijen aan data verwijderen"
-
-#: classes/Gems/Default/DatabaseAction.php:183
-msgid "Are you really sure?"
-msgstr "Weet u het heel erg zeker?"
-
-#: classes/Gems/Default/DatabaseAction.php:199
-#, php-format
-msgid "%1$s %2$s dropped"
-msgstr "%1$s %2$s verwijderd"
-
-#: classes/Gems/Default/DatabaseAction.php:205
-msgid " during statement "
-msgstr " tijdens het commando "
-
-#: classes/Gems/Default/DatabaseAction.php:216
-#, php-format
-msgid "%s no longer exists in the database."
-msgstr "%s bestaat niet meer in de database."
-
-#: classes/Gems/Default/DatabaseAction.php:219
-#, php-format
-msgid "%s does not yet exist in the database."
-msgstr "%s bestaat nog niet in de database."
-
-#: classes/Gems/Default/DatabaseAction.php:222
-#, php-format
-msgid "%s object does exist."
-msgstr "%s object bestaat."
-
-#: classes/Gems/Default/DatabaseAction.php:240
-msgid "Object is not a table."
-msgstr "Niet een tabel object."
-
-#: classes/Gems/Default/DatabaseAction.php:264
-msgid "Structure"
-msgstr "Structuur"
-
-#: classes/Gems/Default/DatabaseAction.php:273
-msgid "database object"
-msgid_plural "database objects"
-msgstr[0] "database object"
-msgstr[1] "database objects"
-
-#: classes/Gems/Default/DatabaseAction.php:278
-msgid "Database object overview"
-msgstr "Database object overzicht"
-
-#: classes/Gems/Default/DatabaseAction.php:287
-#: classes/Gems/Default/DatabaseAction.php:333
-msgid "Level"
-msgstr "Niveau"
-
-#: classes/Gems/Default/DatabaseAction.php:288
-#: classes/Gems/Default/DatabaseAction.php:334
-msgid "Subtype"
-msgstr "Subtype"
-
-#: classes/Gems/Default/DatabaseAction.php:290
-msgid "To be executed"
-msgstr "Uit te voeren"
-
-#: classes/Gems/Default/DatabaseAction.php:291
-#: classes/Gems/Default/DatabaseAction.php:337
-msgid "Executed"
-msgstr "Uitgevoerd"
-
-#: classes/Gems/Default/DatabaseAction.php:292
-#: classes/Gems/Default/DatabaseAction.php:338
-msgid "Finished"
-msgstr "Afgerond"
-
-#: classes/Gems/Default/DatabaseAction.php:296
-msgid "Create the patch table!"
-msgstr "De patch tabel bestaat nog niet!"
-
-#: classes/Gems/Default/DatabaseAction.php:298
-#, php-format
-msgid "%d new or changed patch(es)."
-msgstr "%d nieuwe of veranderde patch(es)."
-
-#: classes/Gems/Default/DatabaseAction.php:303
-msgid "Gems build"
-msgstr "Gems bouwnummer"
-
-#: classes/Gems/Default/DatabaseAction.php:304
-msgid "Database build"
-msgstr "Database versie"
-
-#: classes/Gems/Default/DatabaseAction.php:306
-msgid "Execute level"
-msgstr "Uit te voeren versie"
-
-#: classes/Gems/Default/DatabaseAction.php:310
-msgid "Ignore finished"
-msgstr "Afgeronde patches overslaan"
-
-#: classes/Gems/Default/DatabaseAction.php:311
-msgid "Ignore executed"
-msgstr "Uitgevoerde patches overslaan"
-
-#: classes/Gems/Default/DatabaseAction.php:312
-msgid "Show patches"
-msgstr "Toon patches"
-
-#: classes/Gems/Default/DatabaseAction.php:326
-#, php-format
-msgid "%d patch(es) executed."
-msgstr "%d patch(es) uitgevoerd."
-
-#: classes/Gems/Default/DatabaseAction.php:332
-msgid "Patch"
-msgstr "Patch"
-
-#: classes/Gems/Default/DatabaseAction.php:336
-msgid "Query"
-msgstr "Query"
-
-#: classes/Gems/Default/DatabaseAction.php:339
-msgid "Result"
-msgstr "Resultaat"
-
-#: classes/Gems/Default/DatabaseAction.php:364
-msgid "Patch maintenance"
-msgstr "Patch onderhoud"
-
-#: classes/Gems/Default/DatabaseAction.php:368
-msgid "Patch overview"
-msgstr "Patch overzicht"
-
-#: classes/Gems/Default/DatabaseAction.php:430
-msgid "This database object does not exist. You cannot create it."
-msgstr "Dit database object bestaat niet en kan ook niet aangemaakt worden."
-
-#: classes/Gems/Default/DatabaseAction.php:436
-msgid "This database object has no script. You cannot execute it."
-msgstr "Dit database object heeft geen script. Het kan dus ook niet uitgevoerd worden."
-
-#: classes/Gems/Default/DatabaseAction.php:447
-#, php-format
-msgid "Run %s"
-msgstr "Voer %s script uit"
-
-#: classes/Gems/Default/DatabaseAction.php:468
-#, php-format
-msgid "Starting %d object creation scripts."
-msgstr "Aanvang %d object aanmaak scripts."
-
-#: classes/Gems/Default/DatabaseAction.php:474
-#, php-format
-msgid "Finished %s creation script for object %d of %d"
-msgstr "Klaar met %s aanmaak script voor object %d van %d"
-
-#: classes/Gems/Default/DatabaseAction.php:479
-msgid "All objects exist. Nothing was executed."
-msgstr "Alle objects bestaan. Niets was uitgevoerd."
-
-#: classes/Gems/Default/DatabaseAction.php:486
-msgid "Create not-existing database objects"
-msgstr "Aanmaak van database objecten die nog niet bestaan"
-
-#: classes/Gems/Default/DatabaseAction.php:488
-#, php-format
-msgid "One database object does not exist."
-msgid_plural "These %d database objects do not exist."
-msgstr[0] "Één object bestaat nog niet in de database."
-msgstr[1] "%d objecten bestaan nog niet in de database."
-
-#: classes/Gems/Default/DatabaseAction.php:489
-msgid "Are you sure you want to create it?"
-msgid_plural "Are you sure you want to create them all?"
-msgstr[0] "Weet u zeker dat u dit wil aanmaken?"
-msgstr[1] "Weet u zeker dat u deze allemaal wil aanmaken?"
-
-#: classes/Gems/Default/DatabaseAction.php:502
-msgid "All database objects exist. There is nothing to create."
-msgstr "Alle database objecten bestaan. Er valt niets te maken."
-
-#: classes/Gems/Default/DatabaseAction.php:515
-msgid "Separate multiple commands with semicolons (;)."
-msgstr "Scheidt meerdere commando's met punt-comma's (;)."
-
-#: classes/Gems/Default/DatabaseAction.php:522
-msgid "Run"
-msgstr "Uitvoeren"
-
-#: classes/Gems/Default/DatabaseAction.php:531
-msgid "raw"
-msgstr "rauw"
-
-#: classes/Gems/Default/DatabaseAction.php:541
-#, php-format
-msgid "Result set %s."
-msgstr "Resultaat %s."
-
-#: classes/Gems/Default/DatabaseAction.php:564
-msgid "Execute raw SQL"
-msgstr "SQL direct uitvoeren"
-
-#: classes/Gems/Default/DatabaseAction.php:567
-msgid "Result sets"
-msgstr "Resultaten"
-
-#: classes/Gems/Default/DatabaseAction.php:592
-msgid "This database object does not exist. You cannot view it."
-msgstr "Dit database object bestaat. Het kan dus ook niet bekeken worden."
-
-#: classes/Gems/Default/DatabaseAction.php:597
-#, php-format
-msgid "The data in table %s"
-msgstr "De gegevens in tabel %s"
-
-#: classes/Gems/Default/DatabaseAction.php:598
-#, php-format
-msgid "Contents of %s %s"
-msgstr "De inhoud van %s %s"
-
-#: classes/Gems/Default/ExportAction.php:69
-msgid "Data"
-msgstr "Data"
-
-#: classes/Gems/Default/ExportAction.php:74
-msgid "Export data"
-msgstr "Exporteer gegevens"
-
-#: classes/Gems/Default/ExportAction.php:152
-msgid "Survey"
-msgstr "Vragenlijst"
-
-#: classes/Gems/Default/ExportAction.php:167
-#, php-format
-msgid "%s records found."
-msgstr "%s records gevonden."
-
-#: classes/Gems/Default/ExportAction.php:180
-msgid "Export to"
-msgstr "Exporteer naar"
-
-#: classes/Gems/Default/GroupAction.php:89
-#: classes/Gems/Default/LogAction.php:201
-msgid "Role"
-msgstr "Rol"
-
-#: classes/Gems/Default/GroupAction.php:92
-msgid "Active"
-msgstr "Actief"
-
-#: classes/Gems/Default/GroupAction.php:97
-msgid "Allowed IP Ranges"
-msgstr "Toegestane IP adres reeksen"
-
-#: classes/Gems/Default/GroupAction.php:98
-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
-msgid "group"
-msgid_plural "groups"
-msgstr[0] "groep"
-msgstr[1] "groepen"
-
-#: classes/Gems/Default/GroupAction.php:113
-msgid "Administrative groups"
-msgstr "Beheer groepen"
-
-#: classes/Gems/Default/IndexAction.php:174
-msgid "Request password reset"
-msgstr "Wachtwoord vergeten?"
-
-#: classes/Gems/Default/IndexAction.php:178
-msgid "Please enter your organization and your username or e-mail address. "
-msgstr "Geef uw organisatie en uw email adres of de gebruikersnaam op. "
-
-#: classes/Gems/Default/IndexAction.php:180
-msgid "Please enter your username or e-mail address. "
-msgstr "Geef uw email adres of gebruikersnaam op. "
-
-#: 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 "Vervolgens sturen wij u een email met een link. De link verwijst naar een pagina waar u een zelfgekozen wachtwoord in kan voeren."
-
-#: classes/Gems/Default/IndexAction.php:188
-msgid "Execute password reset"
-msgstr "Vervang vergeten passwood"
-
-#: classes/Gems/Default/IndexAction.php:189
-msgid "We received your password reset request."
-msgstr "We hebben uw verzoek voor een nieuw wachtwoord ontvangen."
-
-#: classes/Gems/Default/IndexAction.php:192
-#, php-format
-msgid "Welcome to %s"
-msgstr "Welkom bij %s"
-
-#: classes/Gems/Default/IndexAction.php:193
-msgid "Welcome to this website."
-msgstr "Welkom op deze website."
-
-#: classes/Gems/Default/IndexAction.php:196
-msgid "Please enter your password of choice twice."
-msgstr "Geef twee keer een zelfgekozen wachtwoord op."
-
-#: classes/Gems/Default/IndexAction.php:218
-msgid "Department"
-msgstr "Afdeling"
-
-#: classes/Gems/Default/IndexAction.php:257
-msgid "Your password must be changed."
-msgstr "Uw wachtwoord moet veranderd worden."
-
-#: classes/Gems/Default/IndexAction.php:272
-#, php-format
-msgid "Login successful, welcome %s."
-msgstr "Login in orde, welkom %s."
-
-#: classes/Gems/Default/IndexAction.php:316
-#, php-format
-msgid "Good bye: %s."
-msgstr "Tot ziens: %s."
-
-#: classes/Gems/Default/IndexAction.php:339
-msgid "Your password reset request is no longer valid, please request a new link."
-msgstr "Uw verzoek om een nieuw wachtwoord is niet meer geldig, maar u kan hieronder een nieuwe link aanvragen."
-
-#: classes/Gems/Default/IndexAction.php:341
-msgid "Your password input request is no longer valid, please request a new link."
-msgstr "Uw link om een wachtwoord in te voeren is niet meer geldig, maar u kan hieronder een nieuwe link aanvragen."
-
-#: 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 hebben u een email met reset link gestuurd. Klik op de link in de email."
-
-#: classes/Gems/Default/IndexAction.php:369
-msgid "New password is active."
-msgstr "Nieuwe wachtwoord geactiveerd."
-
-#: classes/Gems/Default/IndexAction.php:390
-msgid "Password reset requested"
-msgstr "Wachtwoord reset aangevraagd"
-
-#: classes/Gems/Default/IndexAction.php:393
-msgid ""
-"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"
-"\n"
-"\n"
-"{organization_signature}\n"
-"\n"
-"[url={reset_url}]{reset_url}[/url]\n"
-msgstr ""
-"Geachte {greeting},\n"
-"\n"
-"\n"
-"Voor uw [b]{organization}[/b] account op de [b]{project}[/b] site is een nieuw wachtwoord aangevraagd. Klik a.u.b. binnen {reset_in_hours} uur op [url={reset_url}]deze link[/url] om een zelfgekozen wachtwoord op te geven.\n"
-"\n"
-"\n"
-"{organization_signature}\n"
-"\n"
-"[url={reset_url}]{reset_url}[/url]\n"
-
-#: classes/Gems/Default/InvitationAction.php:52
-msgid "Invite"
-msgstr "Uitnodigen"
-
-#: classes/Gems/Default/LanguageAction.php:63
-msgid "Cookies must be enabled for setting the language."
-msgstr "Zonder cookies kan de taal niet ingesteld worden."
-
-#: classes/Gems/Default/LanguageAction.php:66
-msgid "Invalid language setting."
-msgstr "Ongeldige taal instelling."
-
-#: classes/Gems/Default/LogAction.php:78
-msgid "from"
-msgstr "vanaf"
-
-#: classes/Gems/Default/LogAction.php:83
-msgid "until"
-msgstr "tot"
-
-#: classes/Gems/Default/LogAction.php:89
-msgid "days"
-msgstr "dagen"
-
-#: classes/Gems/Default/LogAction.php:90
-msgid "weeks"
-msgstr "weken"
-
-#: classes/Gems/Default/LogAction.php:91
-msgid "months"
-msgstr "maanden"
-
-#: classes/Gems/Default/LogAction.php:92
-msgid "years"
-msgstr "jaren"
-
-#: classes/Gems/Default/LogAction.php:113
-msgid "Organization:"
-msgstr "Organisatie:"
-
-#: classes/Gems/Default/LogAction.php:115
-msgid "All organizations"
-msgstr "Alle organisaties"
-
-#: classes/Gems/Default/LogAction.php:117
-msgid "Staff:"
-msgstr "Medewerkers:"
-
-#: classes/Gems/Default/LogAction.php:124
-msgid "All staff"
-msgstr "Alle medewerkers"
-
-#: classes/Gems/Default/LogAction.php:127
-msgid "Patient:"
-msgstr "Patiënt:"
-
-#: classes/Gems/Default/LogAction.php:134
-msgid "All patients"
-msgstr "Alle patiënten"
-
-#: classes/Gems/Default/LogAction.php:136
-msgid "Action:"
-msgstr "Actie:"
-
-#: classes/Gems/Default/LogAction.php:139
-msgid "All actions"
-msgstr "Alle acties"
-
-#: classes/Gems/Default/LogAction.php:190
-msgid "Date"
-msgstr "Datum"
-
-#: classes/Gems/Default/LogAction.php:191
-#: classes/Gems/Default/LogMaintenanceAction.php:52
-msgid "Action"
-msgstr "Actie"
-
-#: classes/Gems/Default/LogAction.php:192
-msgid "Message"
-msgstr "Bericht"
-
-#: classes/Gems/Default/LogAction.php:198
-msgid "Respondent"
-msgstr "Patiënt"
-
-#: classes/Gems/Default/LogAction.php:202
-msgid "IP address"
-msgstr "IP adres"
-
-#: classes/Gems/Default/LogAction.php:209
-#: classes/Gems/Default/LogMaintenanceAction.php:53
-msgid "Log"
-msgstr "Logboek"
-
-#: classes/Gems/Default/LogMaintenanceAction.php:71
-msgid "Log:"
-msgstr "Logboek:"
-
-#: classes/Gems/Default/LogMaintenanceAction.php:72
-msgid "All"
-msgstr "Alles"
-
-#: classes/Gems/Default/LogMaintenanceAction.php:78
-msgid "Log action"
-msgstr "Logboek actie"
-
-#: classes/Gems/Default/LogMaintenanceAction.php:82
-msgid "Log maintenance"
-msgstr "Logboek onderhoud"
-
-#: classes/Gems/Default/MailJobAction.php:78
-#: classes/Gems/Default/MailLogAction.php:118
-msgid "Template"
-msgstr "Sjabloon"
-
-#: classes/Gems/Default/MailJobAction.php:79
-msgid "By staff member"
-msgstr "Door medewerke"
-
-#: classes/Gems/Default/MailJobAction.php:81
-msgid "Used for logging and possibly from address."
-msgstr "Gebruikt voor activiteiten log en eventueel voor vanaf adres."
-
-#: classes/Gems/Default/MailJobAction.php:84
-msgid "Job is only run when active."
-msgstr "Een opdracht wordt alleen uitgevoerd als deze actief is."
-
-#: classes/Gems/Default/MailJobAction.php:87
-msgid "From address used"
-msgstr "Gebruikte vanaf adres"
-
-#: classes/Gems/Default/MailJobAction.php:89
-msgid "From other"
-msgstr "Vanaf overig"
-
-#: classes/Gems/Default/MailJobAction.php:90
-#, php-format
-msgid "Only when '%s' is '%s'."
-msgstr "Aleen als '%s' is '%s'."
-
-#: classes/Gems/Default/MailJobAction.php:92
-msgid "Processing Method"
-msgstr "Verwerkings methode"
-
-#: classes/Gems/Default/MailJobAction.php:93
-msgid "Filter for"
-msgstr "Selecteer op"
-
-#: classes/Gems/Default/MailJobAction.php:94
-msgid "Days between reminders"
-msgstr "Aantal dagen tussen herinneringen"
-
-#: classes/Gems/Default/MailJobAction.php:95
-msgid "Maximum number of reminders"
-msgstr "Maximum aantal herinneringen"
-
-#: classes/Gems/Default/MailJobAction.php:114
-msgid "First mail"
-msgstr "Eerste mail"
-
-#: classes/Gems/Default/MailJobAction.php:115
-msgid "Reminder"
-msgstr "Herinnering"
-
-#: classes/Gems/Default/MailJobAction.php:126
-msgid "Use organizational from address"
-msgstr "Gebruik vanaf adres van organisatie"
-
-#: classes/Gems/Default/MailJobAction.php:129
-#, php-format
-msgid "Use site %s address"
-msgstr "Gebruik %s adres van de site"
-
-#: classes/Gems/Default/MailJobAction.php:132
-msgid "Use the 'By staff member' address"
-msgstr "Gebruik 'Door medewerker' adres"
-
-#: classes/Gems/Default/MailJobAction.php:133
-msgid "Other"
-msgstr "Overige"
-
-#: classes/Gems/Default/MailJobAction.php:145
-msgid "Automatic mail jobs"
-msgstr "Automatische mail opdrachten "
-
-#: classes/Gems/Default/MailJobAction.php:156
-msgid "automatic mail job"
-msgid_plural "automatic mail jobs"
-msgstr[0] "automatische mail opdracht"
-msgstr[1] "automatische mail opdrachten"
-
-#: classes/Gems/Default/MailJobAction.php:166
-#, php-format
-msgid "Automatic mails have been turned off since %s."
-msgstr "Automatische mail opdrachten staan sinds %s uit."
-
-#: classes/Gems/Default/MailJobAction.php:170
-msgid "Turn Automatic Mail Jobs ON"
-msgstr "Automatische mail opdrachten AANzetten"
-
-#: 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 "Met automatische mail opdrachten en een cron opdracht op de server, kunnen mails verstuurd worden zonder dat een gebruiker actie hoeft te ondernemen."
-
-#: classes/Gems/Default/MailLogAction.php:109
-msgid "Date sent"
-msgstr "Verzend datum"
-
-#: classes/Gems/Default/MailLogAction.php:110
-msgid "Receiver"
-msgstr "Ontvanger"
-
-#: classes/Gems/Default/MailLogAction.php:111
-msgid "To address"
-msgstr "Adres aan"
-
-#: classes/Gems/Default/MailLogAction.php:112
-msgid "Sender"
-msgstr "Verzender"
-
-#: classes/Gems/Default/MailLogAction.php:113
-msgid "From address"
-msgstr "Adres van"
-
-#: classes/Gems/Default/MailLogAction.php:115
-#: classes/Gems/Default/MailTemplateAction.php:62
-msgid "Subject"
-msgstr "Onderwerp"
-
-#: classes/Gems/Default/MailLogAction.php:143
-msgid "Mail Activity Log"
-msgstr "Logboek Mail Activiteit"
-
-#: classes/Gems/Default/MailLogAction.php:154
-msgid "mail activity"
-msgid_plural "mail activities"
-msgstr[0] "mail activiteit"
-msgstr[1] "mail activiteiten"
-
-#: classes/Gems/Default/MailServerAction.php:68
-msgid "From address [part]"
-msgstr "Vanaf adres [gedeelte]"
-
-#: classes/Gems/Default/MailServerAction.php:70
-msgid "E.g.: '%', '%.org' or '%@gemstracker.org' or 'ro...@ge...'."
-msgstr "Bijvoorbeeld: '%', '%.nl' of '%@gemstracker.nl' of 'ro...@ge...'."
-
-#: classes/Gems/Default/MailServerAction.php:71
-msgid "Server"
-msgstr "Server"
-
-#: classes/Gems/Default/MailServerAction.php:73
-msgid "Encryption"
-msgstr "Encryptie"
-
-#: classes/Gems/Default/MailServerAction.php:76
-msgid "None"
-msgstr "Geen"
-
-#: classes/Gems/Default/MailServerAction.php:77
-msgid "SSL"
-msgstr "SSL"
-
-#: classes/Gems/Default/MailServerAction.php:78
-msgid "TLS"
-msgstr "TLS"
-
-#: classes/Gems/Default/MailServerAction.php:80
-msgid "Port"
-msgstr "Poort"
-
-#: classes/Gems/Default/MailServerAction.php:82
-msgid "Normal values: 25 for TLS and no encryption, 465 for SSL"
-msgstr "Standaard waardes: 25 voor TLS en voor geen encryptie, 465 voor SSL"
-
-#: classes/Gems/Default/MailServerAction.php:84
-msgid "User ID"
-msgstr "Gebruikers ID"
-
-#: classes/Gems/Default/MailServerAction.php:88
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: classes/Gems/Default/MailServerAction.php:90
-#: classes/Gems/Default/SourceAction.php:95
-msgid "Repeat password"
-msgstr "Herhaal wachtwoord"
-
-#: classes/Gems/Default/MailServerAction.php:91
-#: classes/Gems/Default/SourceAction.php:74
-msgid "Enter only when changing"
-msgstr "Alleen invoeren om het wachtwoord te wijzigen"
-
-#: classes/Gems/Default/MailServerAction.php:100
-msgid "email server"
-msgid_plural "email servers"
-msgstr[0] "email server"
-msgstr[1] "email servers"
-
-#: classes/Gems/Default/MailServerAction.php:105
-msgid "Email servers"
-msgstr "Email servers"
-
-#: classes/Gems/Default/MailTemplateAction.php:76
-#: classes/Gems/Default/RespondentAction.php:338
-msgid "(all organizations)"
-msgstr "(alle organisaties)"
-
-#: classes/Gems/Default/MailTemplateAction.php:95
-msgid "email template"
-msgid_plural "email templates"
-msgstr[0] "email sjabloon"
-msgstr[1] "email sjablonen"
-
-#: classes/Gems/Default/MailTemplateAction.php:100
-msgid "Email templates"
-msgstr "Email sjabloon"
-
-#: classes/Gems/Default/OptionAction.php:81
-msgid "You are not allowed to change your password."
-msgstr "U mag uw wachtwoord niet wijzigen."
-
-#: classes/Gems/Default/OptionAction.php:129
-msgid "Login Name"
-msgstr "Login Naam"
-
-#: classes/Gems/Default/OptionAction.php:136
-#: classes/Gems/Default/OrganizationAction.php:135
-#: classes/Gems/Default/RespondentAction.php:186
-msgid "Language"
-msgstr "Taal"
-
-#: classes/Gems/Default/OptionAction.php:146
-#, php-format
-msgid "Options"
-msgstr "Instellingen"
-
-#: classes/Gems/Default/OptionAction.php:155
-msgid "This overview provides information about the last login activity on your account."
-msgstr "Dit overzicht geeft informatie over de recente inlog activiteit op uw account."
-
-#: classes/Gems/Default/OptionAction.php:175
-msgid "Date / time"
-msgstr "Datum / tijd"
-
-#: classes/Gems/Default/OptionAction.php:186
-msgid "Item"
-msgstr "Item"
-
-#: classes/Gems/Default/OrganizationAction.php:92
-msgid "Inaccessible or unknown organization"
-msgstr "Ontoegankelijke of onbekende organisatie."
-
-#: classes/Gems/Default/OrganizationAction.php:116
-msgid "Url"
-msgstr "Url"
-
-#: classes/Gems/Default/OrganizationAction.php:117
-msgid "Task"
-msgstr "Taak"
-
-#: classes/Gems/Default/OrganizationAction.php:118
-msgid "Contact name"
-msgstr "Contact naam"
-
-#: classes/Gems/Default/OrganizationAction.php:119
-msgid "Contact email"
-msgstr "Contact email"
-
-#: classes/Gems/Default/OrganizationAction.php:122
-msgid "Style"
-msgstr "Stijl"
-
-#: classes/Gems/Default/OrganizationAction.php:127
-msgid "Default url's"
-msgstr "Standaard url's"
-
-#: classes/Gems/Default/OrganizationAction.php:129
-#, 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 "Altijd naar deze organisatie overschakelen als %s vanaf één van deze door spatie gescheiden url's wordt aangeroepen. De eerste url wordt gebruikt voor emails."
-
-#: classes/Gems/Default/OrganizationAction.php:139
-msgid "Can the organization be used?"
-msgstr "Is de organisatie in gebruik?"
-
-#: classes/Gems/Default/OrganizationAction.php:140
-msgid "Login"
-msgstr "Inloggen"
-
-#: classes/Gems/Default/OrganizationAction.php:140
-msgid "Can people login for this organization?"
-msgstr "Kunnen personen inloggen voor deze organisatie?"
-
-#: classes/Gems/Default/OrganizationAction.php:141
-msgid "Accepting"
-msgstr "Accepteert"
-
-#: classes/Gems/Default/OrganizationAction.php:141
-msgid "Can new respondents be added to the organization?"
-msgstr "Accepteert de organisatie nieuwe patiënten?"
-
-#: classes/Gems/Default/OrganizationAction.php:142
-msgid "Does the organization have respondents?"
-msgstr "Heeft de organisatie patiënten?"
-
-#: classes/Gems/Default/OrganizationAction.php:143
-msgid "Respondent group"
-msgstr "Patiënt groep"
-
-#: classes/Gems/Default/OrganizationAction.php:143
-msgid "Allows respondents to login."
-msgstr "Patiënten toestaan in te loggen."
-
-#: classes/Gems/Default/OrganizationAction.php:147
-msgid "Greeting"
-msgstr "Begroeting"
-
-#: classes/Gems/Default/OrganizationAction.php:147
-#: classes/Gems/Default/OrganizationAction.php:148
-msgid "For emails and token forward screen."
-msgstr "Voor emails en kenmerk scherm."
-
-#: classes/Gems/Default/OrganizationAction.php:148
-msgid "Signature"
-msgstr "Handtekening"
-
-#: classes/Gems/Default/OrganizationAction.php:150
-msgid "Accessible by"
-msgstr "Toegankelijk voor"
-
-#: classes/Gems/Default/OrganizationAction.php:150
-msgid "Checked organizations see this organizations respondents."
-msgstr "Geselecteerde organizaties kunnen de patiënten van deze organisatie bekijken."
-
-#: classes/Gems/Default/OrganizationAction.php:160
-msgid "Code name"
-msgstr "Code naam"
-
-#: classes/Gems/Default/OrganizationAction.php:160
-msgid "Only for programmers."
-msgstr "Uitsluitend voor programmeurs."
-
-#: classes/Gems/Default/OrganizationAction.php:178
-msgid "This can not be changed yet"
-msgstr "Dit kan nog niet gewijzigd worden"
-
-#: classes/Gems/Default/OrganizationAction.php:180
-msgid "User Definition"
-msgstr "User Definition"
-
-#: classes/Gems/Default/OrganizationAction.php:210
-msgid "Participating organizations"
-msgstr "Deelnemende organisaties"
-
-#: classes/Gems/Default/OrganizationAction.php:221
-msgid "organization"
-msgid_plural "organizations"
-msgstr[0] "organisatie"
-msgstr[1] "organisaties"
-
-#: classes/Gems/Default/OverviewPlanAction.php:115
-#: classes/Gems/Default/ProjectSurveysAction.php:88
-msgid "survey"
-msgid_plural "surveys"
-msgstr[0] "vragenlijst"
-msgstr[1] "vragenlijsten"
-
-#: classes/Gems/Default/OverviewPlanAction.php:120
-msgid "Planning overview"
-msgstr "Planning overzicht"
-
-#: classes/Gems/Default/ProjectInformationAction.php:83
-msgid "empty file"
-msgstr "leeg bestand"
-
-#: classes/Gems/Default/ProjectInformationAction.php:87
-msgid "file not found"
-msgstr "bestand niet gevonden"
-
-#: classes/Gems/Default/ProjectInformationAction.php:120
-msgid "Logged errors"
-msgstr "Opgeslagen foutmeldingen"
-
-#: classes/Gems/Default/ProjectInformationAction.php:120
-msgid "Empty logfile"
-msgstr "Verwijder alle foutmeldingen"
-
-#: classes/Gems/Default/ProjectInformationAction.php:125
-msgid "Project information"
-msgstr "Project informatie"
-
-#: classes/Gems/Default/ProjectInformationAction.php:129
-msgid "Project name"
-msgstr "Project naam"
-
-#: classes/Gems/Default/ProjectInformationAction.php:130
-msgid "Project version"
-msgstr "Project versie"
-
-#: classes/Gems/Default/ProjectInformationAction.php:131
-msgid "Gems version"
-msgstr "Gems versie"
-
-#: classes/Gems/Default/ProjectInformationAction.php:133
-msgid "Gems project"
-msgstr "Gems project"
-
-#: classes/Gems/Default/ProjectInformationAction.php:134
-msgid "Gems web directory"
-msgstr "Gems web folder"
-
-#: classes/Gems/Default/ProjectInformationAction.php:135
-msgid "Gems code directory"
-msgstr "Gems code folder"
-
-#: classes/Gems/Default/ProjectInformationAction.php:136
-msgid "Gems project path"
-msgstr "Gems project folder"
-
-#: classes/Gems/Default/ProjectInformationAction.php:137
-msgid "MUtil version"
-msgstr "MUtil versie"
-
-#: classes/Gems/Default/ProjectInformationAction.php:138
-msgid "Zend version"
-msgstr "Zend versie"
-
-#: classes/Gems/Default/ProjectInformationAction.php:139
-msgid "Application environment"
-msgstr "Applicatie omgeving"
-
-#: classes/Gems/Default/ProjectInformationAction.php:140
-msgid "Application baseuri"
-msgstr "Applicatie baseuri"
-
-#: classes/Gems/Default/ProjectInformationAction.php:141
-msgid "Application directory"
-msgstr "Applicatie folder"
-
-#: classes/Gems/Default/ProjectInformationAction.php:142
-msgid "PHP version"
-msgstr "PHP versie"
-
-#: classes/Gems/Default/ProjectInformationAction.php:143
-msgid "Server Hostname"
-msgstr "Webserver naam"
-
-#: classes/Gems/Default/ProjectInformationAction.php:144
-msgid "Server OS"
-msgstr "Server besturingssysteem"
-
-#: classes/Gems/Default/ProjectInformationAction.php:145
-msgid "Time on server"
-msgstr "De tijd op de server"
-
-#: classes/Gems/Default/ProjectInformationAction.php:149
-msgid "Turn Maintenance Mode OFF"
-msgstr "Onderhoudsmodus UITzetten"
-
-#: classes/Gems/Default/ProjectInformationAction.php:151
-msgid "Turn Maintenance Mode ON"
-msgstr "Onderhoudsmodus AANzetten"
-
-#: classes/Gems/Default/ProjectInformationAction.php:161
-msgid "Version information"
-msgstr "Versie informatie"
-
-#: classes/Gems/Default/ProjectInformationAction.php:195
-msgid "Server PHP Info"
-msgstr "Server PHP Info"
-
-#: classes/Gems/Default/ProjectInformationAction.php:212
-msgid "Project settings"
-msgstr "Project instellingen"
-
-#: classes/Gems/Default/ProjectInformationAction.php:219
-msgid "Session content"
-msgstr "Sessie inhoud"
-
-#: classes/Gems/Default/ProjectInformationAction.php:220
-msgid "Session"
-msgstr "Sessie"
-
-#: classes/Gems/Default/ProjectSurveysAction.php:68
-msgid "By"
-msgstr "Door"
-
-#: classes/Gems/Default/ProjectSurveysAction.php:69
-#: classes/Gems/Default/ProjectTracksAction.php:67
-msgid "From"
-msgstr "Van"
-
-#: classes/Gems/Default/ProjectSurveysAction.php:70
-#: classes/Gems/Default/ProjectTracksAction.php:68
-msgid "Until"
-msgstr "Tot"
-
-#: classes/Gems/Default/ProjectSurveysAction.php:93
-msgid "Active surveys"
-msgstr "Beschikbare vragenlijsten"
-
-#: classes/Gems/Default/ProjectTracksAction.php:65
-msgid "Survey #"
-msgstr "Vragenlijsten"
-
-#: classes/Gems/Default/ProjectTracksAction.php:85
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "traject"
-msgstr[1] "trajecten"
-
-#: classes/Gems/Default/ProjectTracksAction.php:90
-msgid "Active tracks"
-msgstr "Beschikbare trajecten"
-
-#: classes/Gems/Default/ProjectTracksAction.php:110
-#, php-format
-msgid "Questions in survey %s"
-msgstr "Vragen in vragenlijsten %s"
-
-#: classes/Gems/Default/ProjectTracksAction.php:118
-#, php-format
-msgid "Survey %s does not exist."
-msgstr "Vragenlijst %s bestaat niet."
-
-#: classes/Gems/Default/ProjectTracksAction.php:121
-msgid "Survey not specified."
-msgstr "Vragenlijst niet opgegeven."
-
-#: classes/Gems/Default/ProjectTracksAction.php:132
-#, php-format
-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"
-
-#: classes/Gems/Default/ReceptionAction.php:80
-msgid "Code"
-msgstr "Code"
-
-#: classes/Gems/Default/ReceptionAction.php:83
-msgid "Is success code"
-msgstr "Is succes code"
-
-#: classes/Gems/Default/ReceptionAction.php:87
-msgid "This reception code is a success code."
-msgstr "Aanzetten als deze ontvangst code positief is."
-
-#: classes/Gems/Default/ReceptionAction.php:91
-msgid "Only active codes can be selected."
-msgstr "Alleen actieve codes kunnen geselecteerd worden."
-
-#: classes/Gems/Default/ReceptionAction.php:92
-msgid "For respondents"
-msgstr "Voor patiënten"
-
-#: classes/Gems/Default/ReceptionAction.php:95
-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
-msgid "For tracks"
-msgstr "Voor trajecten"
-
-#: classes/Gems/Default/ReceptionAction.php:99
-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
-msgid "For surveys"
-msgstr "Voor vragenlijsten"
-
-#: classes/Gems/Default/ReceptionAction.php:102
-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
-msgid "Redo survey"
-msgstr "Vragenlijsten herhalen"
-
-#: classes/Gems/Default/ReceptionAction.php:105
-msgid "Redo a survey on this reception code."
-msgstr "Herhaal vragenlijst bij deze ontvangstcode."
-
-#: classes/Gems/Default/ReceptionAction.php:106
-msgid "Overwrite ansers"
-msgstr "Overschrijf bestaande antwoorden"
-
-#: classes/Gems/Default/ReceptionAction.php:109
-msgid "Remove the consent from already answered surveys."
-msgstr "Verwijder \"informed consent\" van beantwoorde vragenlijsten"
-
-#: classes/Gems/Default/ReceptionAction.php:127
-msgid "reception code"
-msgid_plural "reception codes"
-msgstr[0] "Ontvangst code"
-msgstr[1] "Ontvangst code"
-
-#: classes/Gems/Default/RespondentAction.php:125
-#, php-format
-msgid "Random Example BSN: %s"
-msgstr "Willekeurig voorbeeld BSN: %s"
-
-#: classes/Gems/Default/RespondentAction.php:127
-msgid "Enter a 9-digit SSN number."
-msgstr "Voer een BSN nummer van 9 cijfers in."
-
-#: classes/Gems/Default/RespondentAction.php:134
-msgid "Identification"
-msgstr "Identificatie"
-
-#: classes/Gems/Default/RespondentAction.php:145
-msgid "SSN"
-msgstr "SSN"
-
-#: classes/Gems/Default/RespondentAction.php:149
-msgid "Patient number"
-msgstr "Patiënt nummer"
-
-#: classes/Gems/Default/RespondentAction.php:158
-msgid "Medical data"
-msgstr "Medische gegevens"
-
-#: classes/Gems/Default/RespondentAction.php:165
-msgid "DBC's, etc..."
-msgstr "DBC's, etc..."
-
-#: classes/Gems/Default/RespondentAction.php:168
-msgid "Contact information"
-msgstr "Contact informatie"
-
-#: classes/Gems/Default/RespondentAction.php:173
-msgid "Respondent has no e-mail"
-msgstr "Patiënt zonder email"
-
-#: classes/Gems/Default/RespondentAction.php:174
-msgid "With housenumber"
-msgstr "Met huisnummer"
-
-#: classes/Gems/Default/RespondentAction.php:181
-msgid "Country"
-msgstr "Land"
-
-#: classes/Gems/Default/RespondentAction.php:185
-msgid "Settings"
-msgstr "Instellingen"
-
-#: classes/Gems/Default/RespondentAction.php:187
-msgid "Has the respondent signed the informed consent letter?"
-msgstr "Heeft de patiënt het \"informed consent\" formulier ondertekend?"
-
-#: classes/Gems/Default/RespondentAction.php:217
-msgid "Comments"
-msgstr "Opmerkingen"
-
-#: classes/Gems/Default/RespondentAction.php:218
-msgid "Treatment"
-msgstr "Behandeling"
-
-#: classes/Gems/Default/RespondentAction.php:246
-msgid "Rejection code"
-msgstr "Afkeuringscode"
-
-#: classes/Gems/Default/RespondentAction.php:253
-msgid "Delete respondent"
-msgstr "Verwijder patiënt"
-
-#: classes/Gems/Default/RespondentAction.php:285
-msgid "Respondent deleted."
-msgstr "Patiënt verwijderd"
-
-#: classes/Gems/Default/RespondentAction.php:289
-msgid "Respondent tracks stopped."
-msgstr "Trajecten van patiënt zijn gestopt."
-
-#: classes/Gems/Default/RespondentAction.php:293
-msgid "Choose a reception code to delete."
-msgstr "Kies een ontvangst code om te verwijderen."
-
-#: classes/Gems/Default/RespondentAction.php:387
-msgid "respondent"
-msgid_plural "respondents"
-msgstr[0] "patiënt"
-msgstr[1] "patiënten"
-
-#: classes/Gems/Default/RespondentAction.php:462
-msgid "Please settle the informed consent form for this respondent."
-msgstr "A.u.b. het informed consent formulier doornemen met deze patiënt"
-
-#: classes/Gems/Default/RespondentExportAction.php:54
-msgid "Respondent number"
-msgstr "Patiënt nummer"
-
-#: classes/Gems/Default/RespondentExportAction.php:56
-msgid "Separate multiple respondents with a comma (,)"
-msgstr "Scheid meerdere patienten met een comma (,)"
-
-#: classes/Gems/Default/RespondentPlanAction.php:67
-msgid "Show respondent"
-msgstr "Toon patiënt"
-
-#: classes/Gems/Default/RespondentPlanAction.php:73
-msgid "Show track"
-msgstr "Toon traject"
-
-#: classes/Gems/Default/RespondentPlanAction.php:136
-msgid " of "
-msgstr " van "
-
-#: classes/Gems/Default/RespondentPlanAction.php:137
-msgid "Progress"
-msgstr "Voortgang"
-
-#: classes/Gems/Default/RespondentPlanAction.php:144
-msgid "Respondent planning"
-msgstr "Per patiënt plannen"
-
-#: classes/Gems/Default/RoleAction.php:97
-msgid "child of current role"
-msgstr "afgeleid van huidige rol"
-
-#: classes/Gems/Default/RoleAction.php:105
-#, php-format
-msgid "inherited from %s"
-msgstr "overerfd van %s"
-
-#: classes/Gems/Default/RoleAction.php:113
-msgid "this role"
-msgstr "deze rol"
-
-#: classes/Gems/Default/RoleAction.php:144
-#: classes/Gems/Default/RoleAction.php:302
-msgid "Inherited"
-msgstr "Overerfd"
-
-#: classes/Gems/Default/RoleAction.php:209
-msgid "Illegal name"
-msgstr "Naam niet toegestaan"
-
-#: classes/Gems/Default/RoleAction.php:233
-#: classes/Gems/Default/RoleAction.php:299
-msgid "Parents"
-msgstr "Afgeleid van"
-
-#: classes/Gems/Default/RoleAction.php:255
-msgid "Editing `master` is not allowed"
-msgstr "Het wijzigen van `master` is niet toegestaan"
-
-#: classes/Gems/Default/RoleAction.php:273
-msgid "role"
-msgid_plural "roles"
-msgstr[0] "Rol"
-msgstr[1] "Rollen"
-
-#: classes/Gems/Default/RoleAction.php:278
-msgid "Administrative roles"
-msgstr "Beheer rollen en rechten"
-
-#: classes/Gems/Default/RoleAction.php:300
-#: classes/Gems/Default/RoleAction.php:318
-msgid "Allowed"
-msgstr "Toegestaan"
-
-#: classes/Gems/Default/RoleAction.php:307
-msgid "Project role overview"
-msgstr "Project rollen"
-
-#: classes/Gems/Default/RoleAction.php:317
-msgid "Privilege"
-msgstr "Privilége"
-
-#: classes/Gems/Default/RoleAction.php:319
-msgid "Denied"
-msgstr "Geweigerd"
-
-#: classes/Gems/Default/RoleAction.php:323
-msgid "Project privileges"
-msgstr "Project priviléges"
-
-#: classes/Gems/Default/SourceAction.php:69
-msgid "Leave empty for the Gems database."
-msgstr "Leeglaten bij gebruik van de Gems database."
-
-#: classes/Gems/Default/SourceAction.php:79
-msgid "E.g. the name of the project - for single source projects."
-msgstr "Bijvoorbeeld de project naam - bij projecten met maar één bron."
-
-#: classes/Gems/Default/SourceAction.php:81
-msgid "For creating token-survey url."
-msgstr "Voor kenmerk-vragenlijst url."
-
-#: classes/Gems/Default/SourceAction.php:86
-msgid "The database server used by the source."
-msgstr "Het merk database server gebruikt door deze bron."
-
-#: classes/Gems/Default/SourceAction.php:88
-msgid "Do not forget the underscores."
-msgstr "Vergeet de underscores niet."
-
-#: classes/Gems/Default/SourceAction.php:91
-msgid "Database Username"
-msgstr "Database gebruikersnaam"
-
-#: classes/Gems/Default/SourceAction.php:93
-msgid "Database Password"
-msgstr "Database wachtwoord"
-
-#: classes/Gems/Default/SourceAction.php:116
-#, ph...
 
[truncated message content]

[Gemstracker-svn] SF.net SVN: gemstracker:[855] trunk/library/classes/Gems/Tracker/Source/ LimeSurvey1m9FieldMap.php

From: <gem...@li...> - 2012-07-18 11:53:27

Revision: 855
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=855&view=rev
Author:   michieltcs
Date:     2012-07-18 11:53:21 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
Pass the title of the question as well

Modified Paths:
--------------
    trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php

Modified: trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php	2012-07-18 11:20:43 UTC (rev 854)
+++ trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php	2012-07-18 11:53:21 UTC (rev 855)
@@ -667,6 +667,7 @@
             $tmpres['class'] = 'question';
             $tmpres['group'] = $field['gid'];
             $tmpres['type']  = $field['type'];
+            $tmpres['title'] = $field['title'];
 
             if (! isset($oldfld) || ($oldfld['question'] !== $field['question'])) {
                 $tmpres['question'] = $this->removeMarkup($field['question']);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[854] trunk/library/classes/Gems/User/Form/ LayeredLoginForm.php

From: <gem...@li...> - 2012-07-18 11:20:49

Revision: 854
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=854&view=rev
Author:   mennodekker
Date:     2012-07-18 11:20:43 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
Fixed layered login with only 1 top organization

Modified Paths:
--------------
    trunk/library/classes/Gems/User/Form/LayeredLoginForm.php

Modified: trunk/library/classes/Gems/User/Form/LayeredLoginForm.php
===================================================================
--- trunk/library/classes/Gems/User/Form/LayeredLoginForm.php	2012-07-18 09:34:20 UTC (rev 853)
+++ trunk/library/classes/Gems/User/Form/LayeredLoginForm.php	2012-07-18 11:20:43 UTC (rev 854)
@@ -138,7 +138,7 @@
     {
         $element  = $this->getElement($this->organizationFieldName);
         $orgId    = $this->getCurrentOrganizationId();
-        $parentId = $this->getCurrentTopOrganizationId();
+        $parentId = $this->getElement($this->topOrganizationFieldName)->getValue();
         $childOrgs = $this->getChildOrganisations($parentId);
 
         if (!empty($childOrgs)) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[853] trunk/library

From: <gem...@li...> - 2012-07-18 09:34:30

Revision: 853
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=853&view=rev
Author:   mennodekker
Date:     2012-07-18 09:34:20 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
Fixed #549: Allow a layered login when organizations have children
dev: allow to set label for top and child organization elements from the project's indexController

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/IndexAction.php
    trunk/library/classes/Gems/User/Form/LayeredLoginForm.php
    trunk/library/languages/default-en.mo
    trunk/library/languages/default-en.po
    trunk/library/languages/default-nl.mo
    trunk/library/languages/default-nl.po

Modified: trunk/library/classes/Gems/Default/IndexAction.php
===================================================================
--- trunk/library/classes/Gems/Default/IndexAction.php	2012-07-18 08:01:04 UTC (rev 852)
+++ trunk/library/classes/Gems/Default/IndexAction.php	2012-07-18 09:34:20 UTC (rev 853)
@@ -117,7 +117,12 @@
         Gems_Html::init();
 
         if ($this->layeredLogin === true) {
+            // Allow to set labels without modifying the form by overriding the below methods
+            $args['topOrganizationDescription']   = $this->getTopOrganizationDescription();
+            $args['childOrganizationDescription'] = $this->getChildOrganizationDescription();
+
             return $this->loader->getUserLoader()->getLayeredLoginForm($args);
+
         } else {
             return $this->loader->getUserLoader()->getLoginForm($args);
         }
@@ -203,6 +208,28 @@
     }
 
     /**
+     * Modify this to set a new title for the child organization element
+     * if you use layered login
+     *
+     * @return string
+     */
+    public function getChildOrganizationDescription()
+    {
+        return $this->translate->_('Department');
+    }
+
+    /**
+     * Modify this to set a new title for the top organization element
+     * if you use layered login
+     *
+     * @return string
+     */
+    public function getTopOrganizationDescription()
+    {
+        return $this->translate->_('Organization');
+    }
+
+    /**
      * Dummy: always rerouted by GemsEscort
      */
     public function indexAction() { }

Modified: trunk/library/classes/Gems/User/Form/LayeredLoginForm.php
===================================================================
--- trunk/library/classes/Gems/User/Form/LayeredLoginForm.php	2012-07-18 08:01:04 UTC (rev 852)
+++ trunk/library/classes/Gems/User/Form/LayeredLoginForm.php	2012-07-18 09:34:20 UTC (rev 853)
@@ -62,6 +62,20 @@
     public $topOrganizationFieldName = 'toporganization';
 
     /**
+     * The label for the top-organization element
+     *
+     * @var string
+     */
+    public $topOrganizationDescription = null;
+
+    /**
+     * The label for the child-organization element
+     *
+     * @var string
+     */
+    public $childOrganizationDescription = null;
+
+    /**
      * Return array of organizations that are a child of the given parentId
      * 
      * @param int $parentId
@@ -142,7 +156,7 @@
 
             } else {
                 $element = new Zend_Form_Element_Select($this->organizationFieldName);
-                $element->setLabel($this->translate->_('Organization'));
+                $element->setLabel($this->childOrganizationDescription);
                 $element->setRegisterInArrayValidator(true);
                 $element->setRequired(true);
                 $element->setMultiOptions($childOrgs);
@@ -214,7 +228,7 @@
 
         } elseif (! $element instanceof Zend_Form_Element_Select) {
             $element = new Zend_Form_Element_Select($this->topOrganizationFieldName);
-            $element->setLabel($this->translate->_('Organization'));
+            $element->setLabel($this->topOrganizationDescription);
             $element->setRegisterInArrayValidator(true);
             $element->setRequired(true);
             $element->setMultiOptions($orgs);
@@ -239,10 +253,49 @@
      */
     public function loadDefaultElements()
     {
+        // If not already set, set some defaults for organization elements
+        if (is_null($this->topOrganizationDescription)) {
+            $this->topOrganizationDescription = $this->translate->_('Organization');
+        }
+
+        if (is_null($this->childOrganizationDescription)) {
+            $this->childOrganizationDescription = $this->translate->_('Department');
+        }
+
         $this->getTopOrganizationElement();
 
         parent::loadDefaultElements();
 
         return $this;
     }
+    
+    /**
+     * Set the label for the child organization element
+     *
+     * Enables loading of parameter through Zend_Form::__construct()
+     *
+     * @param string $description
+     * @return Gems_User_Form_LayeredLoginForm (continuation pattern)
+     */
+    public function setChildOrganizationDescription($description = null)
+    {
+        $this->childOrganizationDescription = $description;
+
+        return $this;
+    }
+
+    /**
+     * Set the label for the top organization element
+     *
+     * Enables loading of parameter through Zend_Form::__construct()
+     *
+     * @param string $description
+     * @return Gems_User_Form_LayeredLoginForm (continuation pattern)
+     */
+    public function setTopOrganizationDescription($description = null)
+    {
+        $this->topOrganizationDescription = $description;
+
+        return $this;
+    }
 }
\ No newline at end of file

Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)

Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po	2012-07-18 08:01:04 UTC (rev 852)
+++ trunk/library/languages/default-en.po	2012-07-18 09:34:20 UTC (rev 853)
@@ -2,9 +2,9 @@
 msgstr ""
 "Project-Id-Version: GemsTracker EN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-16 19:30+0100\n"
+"POT-Creation-Date: 2012-07-18 11:33+0100\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Matijs de Jong <mj...@ma...>\n"
+"Last-Translator: Menno Dekker <men...@er...>\n"
 "Language-Team: Erasmus MGZ <mat...@ma...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1026,78 +1026,82 @@
 msgid "Administrative groups"
 msgstr "Administrative groups"
 
-#: classes/Gems/Default/IndexAction.php:157
+#: classes/Gems/Default/IndexAction.php:174
 msgid "Request password reset"
 msgstr "Request password reset"
 
-#: classes/Gems/Default/IndexAction.php:161
+#: classes/Gems/Default/IndexAction.php:178
 msgid "Please enter your organization and your username or e-mail address. "
 msgstr "Please enter your organization and your username or e-mail address. "
 
-#: classes/Gems/Default/IndexAction.php:163
+#: classes/Gems/Default/IndexAction.php:180
 msgid "Please enter your username or e-mail address. "
 msgstr "Please enter your username or e-mail address. "
 
-#: classes/Gems/Default/IndexAction.php:165
+#: 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."
 
-#: classes/Gems/Default/IndexAction.php:171
+#: classes/Gems/Default/IndexAction.php:188
 msgid "Execute password reset"
 msgstr "Execute password reset"
 
-#: classes/Gems/Default/IndexAction.php:172
+#: classes/Gems/Default/IndexAction.php:189
 msgid "We received your password reset request."
 msgstr "We received your password reset request."
 
-#: classes/Gems/Default/IndexAction.php:175
+#: classes/Gems/Default/IndexAction.php:192
 #, php-format
 msgid "Welcome to %s"
 msgstr "Welcome to %s"
 
-#: classes/Gems/Default/IndexAction.php:176
+#: classes/Gems/Default/IndexAction.php:193
 msgid "Welcome to this website."
 msgstr "Welcome to this website."
 
-#: classes/Gems/Default/IndexAction.php:179
+#: classes/Gems/Default/IndexAction.php:196
 msgid "Please enter your password of choice twice."
 msgstr "Please enter your password of choice twice."
 
 #: classes/Gems/Default/IndexAction.php:218
+msgid "Department"
+msgstr "Department"
+
+#: classes/Gems/Default/IndexAction.php:257
 msgid "Your password must be changed."
 msgstr "Your password must be changed."
 
-#: classes/Gems/Default/IndexAction.php:233
+#: classes/Gems/Default/IndexAction.php:272
 #, php-format
 msgid "Login successful, welcome %s."
 msgstr "Login successful, welcome %s."
 
-#: classes/Gems/Default/IndexAction.php:273
+#: classes/Gems/Default/IndexAction.php:316
 #, php-format
 msgid "Good bye: %s."
 msgstr "Good bye: %s."
 
-#: classes/Gems/Default/IndexAction.php:296
+#: 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."
 
-#: classes/Gems/Default/IndexAction.php:298
+#: 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."
 
-#: classes/Gems/Default/IndexAction.php:317
+#: 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."
 
-#: classes/Gems/Default/IndexAction.php:326
+#: classes/Gems/Default/IndexAction.php:369
 msgid "New password is active."
 msgstr "New password is active."
 
-#: classes/Gems/Default/IndexAction.php:347
+#: classes/Gems/Default/IndexAction.php:390
 msgid "Password reset requested"
 msgstr "Password reset requested"
 
-#: classes/Gems/Default/IndexAction.php:350
+#: classes/Gems/Default/IndexAction.php:393
 msgid ""
 "Dear {greeting},\n"
 "\n"
@@ -4227,23 +4231,19 @@
 
 #: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:172
 #: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:143
-#: snippets/DeleteTrackTokenSnippet.php:193
 msgid "Edit token"
 msgstr "Edit token"
 
 #: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:225
-#: snippets/DeleteTrackTokenSnippet.php:245
 #, php-format
 msgid "Redo of token %s."
 msgstr "Redo of token %s."
 
 #: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:228
-#: snippets/DeleteTrackTokenSnippet.php:248
 msgid "Old comment:"
 msgstr "Old comment:"
 
 #: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:249
-#: snippets/DeleteTrackTokenSnippet.php:269
 #, php-format
 msgid "Created replacement token %2$s for token %1$s."
 msgstr "Created replacement token %2$s for token %1$s."
@@ -4258,6 +4258,7 @@
 msgstr "Deleted token %s for survey %s."
 
 #: snippets/DeleteTrackTokenSnippet.php:286
+#: snippets/EditTrackTokenSnippet.php:182
 #, php-format
 msgid "%d token changed by recalculation."
 msgid_plural "%d tokens changed by recalculation."

Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)

Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po	2012-07-18 08:01:04 UTC (rev 852)
+++ trunk/library/languages/default-nl.po	2012-07-18 09:34:20 UTC (rev 853)
@@ -2,9 +2,9 @@
 msgstr ""
 "Project-Id-Version: GemsTracker NL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-16 19:31+0100\n"
+"POT-Creation-Date: 2012-07-18 11:32+0100\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Matijs de Jong <mj...@ma...>\n"
+"Last-Translator: Menno Dekker <men...@er...>\n"
 "Language-Team: Erasmus MGZ <mat...@ma...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1026,78 +1026,82 @@
 msgid "Administrative groups"
 msgstr "Beheer groepen"
 
-#: classes/Gems/Default/IndexAction.php:157
+#: classes/Gems/Default/IndexAction.php:174
 msgid "Request password reset"
 msgstr "Wachtwoord vergeten?"
 
-#: classes/Gems/Default/IndexAction.php:161
+#: classes/Gems/Default/IndexAction.php:178
 msgid "Please enter your organization and your username or e-mail address. "
 msgstr "Geef uw organisatie en uw email adres of de gebruikersnaam op. "
 
-#: classes/Gems/Default/IndexAction.php:163
+#: classes/Gems/Default/IndexAction.php:180
 msgid "Please enter your username or e-mail address. "
 msgstr "Geef uw email adres of gebruikersnaam op. "
 
-#: classes/Gems/Default/IndexAction.php:165
+#: 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 "Vervolgens sturen wij u een email met een link. De link verwijst naar een pagina waar u een zelfgekozen wachtwoord in kan voeren."
 
-#: classes/Gems/Default/IndexAction.php:171
+#: classes/Gems/Default/IndexAction.php:188
 msgid "Execute password reset"
 msgstr "Vervang vergeten passwood"
 
-#: classes/Gems/Default/IndexAction.php:172
+#: classes/Gems/Default/IndexAction.php:189
 msgid "We received your password reset request."
 msgstr "We hebben uw verzoek voor een nieuw wachtwoord ontvangen."
 
-#: classes/Gems/Default/IndexAction.php:175
+#: classes/Gems/Default/IndexAction.php:192
 #, php-format
 msgid "Welcome to %s"
 msgstr "Welkom bij %s"
 
-#: classes/Gems/Default/IndexAction.php:176
+#: classes/Gems/Default/IndexAction.php:193
 msgid "Welcome to this website."
 msgstr "Welkom op deze website."
 
-#: classes/Gems/Default/IndexAction.php:179
+#: classes/Gems/Default/IndexAction.php:196
 msgid "Please enter your password of choice twice."
 msgstr "Geef twee keer een zelfgekozen wachtwoord op."
 
 #: classes/Gems/Default/IndexAction.php:218
+msgid "Department"
+msgstr "Afdeling"
+
+#: classes/Gems/Default/IndexAction.php:257
 msgid "Your password must be changed."
 msgstr "Uw wachtwoord moet veranderd worden."
 
-#: classes/Gems/Default/IndexAction.php:233
+#: classes/Gems/Default/IndexAction.php:272
 #, php-format
 msgid "Login successful, welcome %s."
 msgstr "Login in orde, welkom %s."
 
-#: classes/Gems/Default/IndexAction.php:273
+#: classes/Gems/Default/IndexAction.php:316
 #, php-format
 msgid "Good bye: %s."
 msgstr "Tot ziens: %s."
 
-#: classes/Gems/Default/IndexAction.php:296
+#: classes/Gems/Default/IndexAction.php:339
 msgid "Your password reset request is no longer valid, please request a new link."
 msgstr "Uw verzoek om een nieuw wachtwoord is niet meer geldig, maar u kan hieronder een nieuwe link aanvragen."
 
-#: classes/Gems/Default/IndexAction.php:298
+#: classes/Gems/Default/IndexAction.php:341
 msgid "Your password input request is no longer valid, please request a new link."
 msgstr "Uw link om een wachtwoord in te voeren is niet meer geldig, maar u kan hieronder een nieuwe link aanvragen."
 
-#: classes/Gems/Default/IndexAction.php:317
+#: 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 hebben u een email met reset link gestuurd. Klik op de link in de email."
 
-#: classes/Gems/Default/IndexAction.php:326
+#: classes/Gems/Default/IndexAction.php:369
 msgid "New password is active."
 msgstr "Nieuwe wachtwoord geactiveerd."
 
-#: classes/Gems/Default/IndexAction.php:347
+#: classes/Gems/Default/IndexAction.php:390
 msgid "Password reset requested"
 msgstr "Wachtwoord reset aangevraagd"
 
-#: classes/Gems/Default/IndexAction.php:350
+#: classes/Gems/Default/IndexAction.php:393
 msgid ""
 "Dear {greeting},\n"
 "\n"
@@ -4227,23 +4231,19 @@
 
 #: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:172
 #: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:143
-#: snippets/DeleteTrackTokenSnippet.php:193
 msgid "Edit token"
 msgstr "Kenmerk bewerken"
 
 #: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:225
-#: snippets/DeleteTrackTokenSnippet.php:245
 #, php-format
 msgid "Redo of token %s."
 msgstr "Herkansing voor kenmerk %s."
 
 #: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:228
-#: snippets/DeleteTrackTokenSnippet.php:248
 msgid "Old comment:"
 msgstr "Oude opmerkingen"
 
 #: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:249
-#: snippets/DeleteTrackTokenSnippet.php:269
 #, php-format
 msgid "Created replacement token %2$s for token %1$s."
 msgstr "Kenmerk %s is vervangen door het nieuwe kenmerk %s."
@@ -4258,6 +4258,7 @@
 msgstr "Kenmerk %s voor vragenlijsten %s is verwijderd."
 
 #: snippets/DeleteTrackTokenSnippet.php:286
+#: snippets/EditTrackTokenSnippet.php:182
 #, php-format
 msgid "%d token changed by recalculation."
 msgid_plural "%d tokens changed by recalculation."

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[852] trunk/library/classes/Gems

From: <gem...@li...> - 2012-07-18 08:01:15

Revision: 852
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=852&view=rev
Author:   mennodekker
Date:     2012-07-18 08:01:04 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
Fixed #549: Allow a layered login when organizations have children

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/IndexAction.php
    trunk/library/classes/Gems/User/Form/OrganizationFormAbstract.php
    trunk/library/classes/Gems/User/UserLoader.php

Added Paths:
-----------
    trunk/library/classes/Gems/User/Form/LayeredLoginForm.php

Modified: trunk/library/classes/Gems/Default/IndexAction.php
===================================================================
--- trunk/library/classes/Gems/Default/IndexAction.php	2012-07-17 15:55:22 UTC (rev 851)
+++ trunk/library/classes/Gems/Default/IndexAction.php	2012-07-18 08:01:04 UTC (rev 852)
@@ -56,6 +56,14 @@
     protected $labelWidthFactor = null;
 
     /**
+     * Use a flat login (false = default) or a layered login where you first
+     * select a parent organization and then see a list of child organizations.
+     *
+     * @var boolean
+     */
+    protected $layeredLogin = false;
+
+    /**
      * For small numbers of organizations a multiline selectbox will be nice. This
      * setting handles how many lines will display at once. Use 1 for the normal
      * dropdown selectbox
@@ -108,7 +116,11 @@
 
         Gems_Html::init();
 
-        return $this->loader->getUserLoader()->getLoginForm($args);
+        if ($this->layeredLogin === true) {
+            return $this->loader->getUserLoader()->getLayeredLoginForm($args);
+        } else {
+            return $this->loader->getUserLoader()->getLoginForm($args);
+        }
     }
 
     /**
@@ -208,7 +220,7 @@
         $previousRequestParameters = $staticSession->previousRequestParameters;
         $previousRequestMode = $staticSession->previousRequestMode;
 
-        if ($request->isPost()) {
+        if ($form->wasSubmitted()) {
             if ($form->isValid($request->getPost(), false)) {
                 $user = $form->getUser();
                 $user->setAsCurrentUser();
@@ -258,6 +270,10 @@
                 $log = Gems_AccessLog::getLog();
                 $log->log('loginFail', $this->getRequest(), $msg, null, true);
             } // */
+        } else {
+            if ($request->isPost()) {
+                $form->populate($this->getRequest()->getPost());
+            }
         }
 
         $this->displayLoginForm($form);

Added: trunk/library/classes/Gems/User/Form/LayeredLoginForm.php
===================================================================
--- trunk/library/classes/Gems/User/Form/LayeredLoginForm.php	                        (rev 0)
+++ trunk/library/classes/Gems/User/Form/LayeredLoginForm.php	2012-07-18 08:01:04 UTC (rev 852)
@@ -0,0 +1,248 @@
+<?php
+
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the name of Erasmus MC nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *      
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * Short description of file
+ *
+ * @package    Gems
+ * @subpackage 
+ * @copyright  Copyright (c) 2011 Erasmus MC
+ * @license    New BSD License
+ * @version    $Id: Sample.php 215 2011-07-12 08:52:54Z michiel $
+ */
+
+/**
+ * Short description for LoginForm
+ *
+ * Long description for class LoginForm (if any)...
+ *
+ * @package    Gems
+ * @subpackage Sample
+ * @copyright  Copyright (c) 2011 Erasmus MC
+ * @license    New BSD License
+ * @since      Class available since version 1.0
+ * @deprecated Class deprecated since version 2.0
+ */
+class Gems_User_Form_LayeredLoginForm extends Gems_User_Form_LoginForm
+{
+    /**
+     * @var Zend_Db_Adapter_Abstract
+     */
+    public $db;
+
+    /**
+     * The field name for the top organization element.
+     *
+     * @var string
+     */
+    public $topOrganizationFieldName = 'toporganization';
+
+    /**
+     * Return array of organizations that are a child of the given parentId
+     * 
+     * @param int $parentId
+     * @return array
+     */
+    public function getChildOrganisations($parentId = null)
+    {
+        if (is_null($parentId)) {
+            return array();
+        }
+
+        try {
+            $organizations = $this->db->fetchPairs('SELECT gor_id_organization, gor_name FROM gems__organizations WHERE gor_active=1 AND gor_has_login=1 AND (gor_accessible_by LIKE ' . $this->db->quote(':' . $parentId . ':') . ' OR gor_id_organization = ' . $this->db->quote($parentId) .  ') ORDER BY gor_name');
+        } catch (Exception $e) {
+            try {
+                // 1.4 fallback
+                $organizations = $this->db->fetchPairs('SELECT gor_id_organization, gor_name FROM gems__organizations WHERE gor_active=1 AND (gor_accessible_by LIKE ' . $this->db->quote(':' . $parentId . ':') . ' OR gor_id_organization = ' . $this->db->quote($parentId) .  ') ORDER BY gor_name');
+            } catch (Exception $e) {
+                $organizations = array();
+            }
+        }
+
+        natsort($organizations);
+
+        return $organizations;
+    }
+
+    /**
+     * Returns the top organization id that should currently be used for this form.
+     *
+     * @return int Returns the current organization id, if any
+     */
+    public function getCurrentTopOrganizationId()
+    {
+        $userLoader = $this->loader->getUserLoader();
+
+        // Url determines organization first.
+        if ($orgId = $userLoader->getOrganizationIdByUrl()) {
+            $this->_organizationFromUrl = true;
+            return ' ';
+        }
+
+        $request = $this->getRequest();
+        if ($request->isPost() && ($orgId = $request->getParam($this->topOrganizationFieldName))) {
+            Gems_Cookies::set('gems_toporganization', $orgId);
+            return $orgId;
+        } else {
+            return Gems_Cookies::get($this->getRequest(), 'gems_toporganization', ' ');
+        }
+    }
+
+    /**
+     * Returns/sets an element for determining / selecting the organization.
+     *
+     * Depends on the top-organization
+     *
+     * @return Zend_Form_Element_Xhtml
+     */
+    public function getOrganizationElement()
+    {
+        $element  = $this->getElement($this->organizationFieldName);
+        $orgId    = $this->getCurrentOrganizationId();
+        $parentId = $this->getCurrentTopOrganizationId();
+        $childOrgs = $this->getChildOrganisations($parentId);
+
+        if (!empty($childOrgs)) {
+            if (count($childOrgs) == 1) {
+                $element = new Zend_Form_Element_Hidden($this->organizationFieldName);
+                $this->addElement($element);
+
+                if (! $this->_organizationFromUrl) {
+                    $orgIds = array_keys($childOrgs);
+                    $orgId  = reset($orgIds);
+                }
+
+                $element->setValue($orgId);
+                $this->getRequest()->setPost($this->organizationFieldName, $orgId);
+
+            } else {
+                $element = new Zend_Form_Element_Select($this->organizationFieldName);
+                $element->setLabel($this->translate->_('Organization'));
+                $element->setRegisterInArrayValidator(true);
+                $element->setRequired(true);
+                $element->setMultiOptions($childOrgs);
+
+                if ($this->organizationMaxLines > 1) {
+                    $element->setAttrib('size', min(count($orgs) + 1, $this->organizationMaxLines));
+                }
+                $this->addElement($element);
+                $element->setValue($orgId);
+            }
+        }
+        
+        return $element;
+    }
+
+    /**
+     * Return a list of organizations that are considered top-organizations, in this
+     * case organizations that are not accessible by others as they are considered
+     * the children of the top organizations. Feel free to modify to suit your
+     * needs.
+     *
+     * @return array
+     */
+    public function getTopOrganisations()
+    {
+        try {
+            $organizations = $this->db->fetchPairs('SELECT gor_id_organization, gor_name FROM gems__organizations WHERE gor_active=1 AND gor_has_login=1 AND gor_accessible_by IS NULL ORDER BY gor_name');
+        } catch (Exception $e) {
+            try {
+                // 1.4 fallback
+                $organizations = $this->db->fetchPairs('SELECT gor_id_organization, gor_name FROM gems__organizations WHERE gor_active=1 AND gor_accessible_by IS NULL ORDER BY gor_name');
+            } catch (Exception $e) {
+                $organizations = array();
+            }
+        }
+
+        natsort($organizations);
+
+        return $organizations;
+    }
+
+
+    /**
+     * Returns/sets an element for determining / selecting the top-organization.
+     *
+     * @return null|\Zend_Form_Element_Select
+     */
+    public function getTopOrganizationElement()
+    {
+        $element = $this->getElement($this->topOrganizationFieldName);
+        $orgId   = $this->getCurrentTopOrganizationId();
+        $orgs    = $this->getTopOrganisations();
+        $hidden  = $this->_organizationFromUrl || (count($orgs) < 2);
+
+        if ($this->_organizationFromUrl) {
+            return null;
+        }
+
+        if ($hidden) {
+            if (! $element instanceof Zend_Form_Element_Hidden) {
+                $element = new Zend_Form_Element_Hidden($this->topOrganizationFieldName);
+                $this->addElement($element);
+            }
+
+            $orgIds = array_keys($orgs);
+            $orgId  = reset($orgIds);
+
+            $element->setValue($orgId);
+
+        } elseif (! $element instanceof Zend_Form_Element_Select) {
+            $element = new Zend_Form_Element_Select($this->topOrganizationFieldName);
+            $element->setLabel($this->translate->_('Organization'));
+            $element->setRegisterInArrayValidator(true);
+            $element->setRequired(true);
+            $element->setMultiOptions($orgs);
+            $element->setAttrib('onchange', 'this.form.submit();');
+
+            if ($this->organizationMaxLines > 1) {
+                $element->setAttrib('size', min(count($orgs) + 1, $this->organizationMaxLines));
+            }
+            $this->addElement($element);
+
+            $element->setValue($orgId);
+        }
+
+        return $element;
+    }
+
+    /**
+     * Load the elements, starting with the extra top organization element and
+     * continue with the other elements like in the standard login form
+     *
+     * @return Gems_User_Form_LayeredLoginForm
+     */
+    public function loadDefaultElements()
+    {
+        $this->getTopOrganizationElement();
+
+        parent::loadDefaultElements();
+
+        return $this;
+    }
+}
\ No newline at end of file

Modified: trunk/library/classes/Gems/User/Form/OrganizationFormAbstract.php
===================================================================
--- trunk/library/classes/Gems/User/Form/OrganizationFormAbstract.php	2012-07-17 15:55:22 UTC (rev 851)
+++ trunk/library/classes/Gems/User/Form/OrganizationFormAbstract.php	2012-07-18 08:01:04 UTC (rev 852)
@@ -284,6 +284,12 @@
      */
     public function wasSubmitted()
     {
-        return $this->getSubmitButton()->isChecked();
+        // If form was not (yet) populated, we can not use isChecked() so do this manually
+        $request = $this->getRequest();
+        if ($request->isPost() && $request->getPost($this->_submitFieldName) == $this->getSubmitButtonLabel()) {
+            return true;
+        } else {
+            return false;
+        }
     }
 }

Modified: trunk/library/classes/Gems/User/UserLoader.php
===================================================================
--- trunk/library/classes/Gems/User/UserLoader.php	2012-07-17 15:55:22 UTC (rev 851)
+++ trunk/library/classes/Gems/User/UserLoader.php	2012-07-18 08:01:04 UTC (rev 852)
@@ -305,6 +305,20 @@
     }
 
     /**
+     * Returns a layered login form where user first selects a top organization and then a
+     * child organization
+     *
+     * @param mixed $args_array MUtil_Ra::args array for LoginForm initiation.
+     * @return Gems_User_Form_LayeredLoginForm
+     */
+    public function getLayeredLoginForm($args_array = null)
+    {
+        $args = MUtil_Ra::args(func_get_args());
+
+        return $this->_loadClass('Form_LayeredLoginForm', true, array($args));
+    }
+
+    /**
      * Returns a login form
      *
      * @param mixed $args_array MUtil_Ra::args array for LoginForm initiation.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[851] trunk/library/changelog.txt

From: <gem...@li...> - 2012-07-17 15:55:32

Revision: 851
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=851&view=rev
Author:   matijsdejong
Date:     2012-07-17 15:55:22 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
Updated

Modified Paths:
--------------
    trunk/library/changelog.txt

Modified: trunk/library/changelog.txt
===================================================================
--- trunk/library/changelog.txt	2012-07-17 15:42:09 UTC (rev 850)
+++ trunk/library/changelog.txt	2012-07-17 15:55:22 UTC (rev 851)
@@ -7,6 +7,7 @@
 UPGRADE WARNING: Check all your (snippet) extensions to RespondentAction, TrackAction, SurveyAction and project specific versions of ShowTrackTokenSnippet and ShowSingleSurveySnippet: you may need to specify extra parameters as the menu items need to know the organization id
 New projects start with a basic css template
 In project.ini, export.wkhtmltopdf has been renamed to export.pdfExportCommand, and which now stores the entire command line to the pdf export binary (wkhtmltopdf, Phantom.js or similar).
+The normal time it takes to answer a survey can be added and surveys have a code field
 
 Important changes from 1.5.3 => 1.5.4
 ============================================================

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[850] trunk/library/snippets/Respondent/ MultiOrganizationTab.php

From: <gem...@li...> - 2012-07-17 15:42:20

Revision: 850
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=850&view=rev
Author:   matijsdejong
Date:     2012-07-17 15:42:09 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
Fix for returning ID paramter

Modified Paths:
--------------
    trunk/library/snippets/Respondent/MultiOrganizationTab.php

Modified: trunk/library/snippets/Respondent/MultiOrganizationTab.php
===================================================================
--- trunk/library/snippets/Respondent/MultiOrganizationTab.php	2012-07-17 15:12:32 UTC (rev 849)
+++ trunk/library/snippets/Respondent/MultiOrganizationTab.php	2012-07-17 15:42:09 UTC (rev 850)
@@ -106,7 +106,7 @@
         foreach ($allowedOrgs as $orgId => $name) {
             if (isset($existingOrgs[$orgId])) {
                 $tabs[$orgId] = $name;
-                $this->hrefs[$orgId] = array(MUtil_Model::REQUEST_ID1 => $existingOrgs[$orgId], MUtil_Model::REQUEST_ID2 => $orgId);
+                $this->hrefs[$orgId] = array(MUtil_Model::REQUEST_ID1 => $existingOrgs[$orgId], MUtil_Model::REQUEST_ID2 => $orgId, 'RouteReset' => true);
             }
         }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[849] trunk/library/classes/Gems/Event/ EventCalculations.php

From: <gem...@li...> - 2012-07-17 15:12:43

Revision: 849
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=849&view=rev
Author:   matijsdejong
Date:     2012-07-17 15:12:32 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
Spelling correction

Modified Paths:
--------------
    trunk/library/classes/Gems/Event/EventCalculations.php

Modified: trunk/library/classes/Gems/Event/EventCalculations.php
===================================================================
--- trunk/library/classes/Gems/Event/EventCalculations.php	2012-07-16 17:36:52 UTC (rev 848)
+++ trunk/library/classes/Gems/Event/EventCalculations.php	2012-07-17 15:12:32 UTC (rev 849)
@@ -137,7 +137,7 @@
     }
 
     /**
-     * Checks all $values for a change against $tokenAnswers as intger
+     * Checks all $values for a change against $tokenAnswers as integer
      *
      * @param array $values
      * @param array $tokenAnswers

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[848] trunk/library

From: <gem...@li...> - 2012-07-16 17:37:01

Revision: 848
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=848&view=rev
Author:   matijsdejong
Date:     2012-07-16 17:36:52 +0000 (Mon, 16 Jul 2012)
Log Message:
-----------
Survey duration implemented and used when entered #492

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php
    trunk/library/classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php
    trunk/library/classes/Gems/Tracker/Survey.php
    trunk/library/classes/Gems/Util/Translated.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/Track/Token/ShowAllOpenSnippet.php

Modified: trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php
===================================================================
--- trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php	2012-07-16 07:50:44 UTC (rev 847)
+++ trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php	2012-07-16 17:36:52 UTC (rev 848)
@@ -123,6 +123,7 @@
         $bridge->addSelect(     'gsu_id_primary_group',      'description', $this->_('If empty, survey will never show up!'));
         $bridge->addSelect(     'gsu_result_field',          'multiOptions', $surveyFields);
         $bridge->addText(       'gsu_duration');
+        $bridge->addExhibitor(  'calc_duration', 'label', $this->_('Duration calculated'), 'value', $this->calculateDuration(isset($data['gsu_id_survey']) ? $data['gsu_id_survey'] : null));
         $bridge->addText(       'gsu_code');
         $bridge->addSelect(     'gsu_beforeanswering_event');
         $bridge->addSelect(     'gsu_completed_event');
@@ -269,6 +270,57 @@
     }
 
     /**
+     * Calculates the average duration for answering a survey
+     *
+     * @param $surveyId Id of survey to calculate it for
+     * @return MUtil_Html_HtmlElement
+     */
+    public function calculateDuration($surveyId = null)
+    {
+        if ($surveyId) {
+            $fields['cnt'] = 'COUNT(*)';
+            $fields['avg'] = 'AVG(gto_duration_in_sec)';
+            $fields['std'] = 'STDDEV_POP(gto_duration_in_sec)';
+
+            $select = $this->loader->getTracker()->getTokenSelect($fields);
+            $select->forSurveyId($surveyId)
+                    ->onlyCompleted();
+
+            $row = $select->fetchRow();
+            if ($row) {
+                $trs = $this->util->getTranslated();
+                $seq = new MUtil_Html_Sequence();
+                $seq->setGlue(MUtil_Html::create('br', $this->view));
+
+                $seq->append(sprintf($this->_('Answered surveys: %d.'), $row['cnt']));
+                $seq->append(sprintf($this->_('Average answer time: %s.'), $trs->formatTime($row['avg'])));
+                $seq->append(sprintf($this->_('Standard deviation: %s.'), $trs->formatTime($row['std'])));
+
+                // Picked solution from http://stackoverflow.com/questions/1291152/simple-way-to-calculate-median-with-mysql
+                $sql = "
+SELECT t1.gto_duration_in_sec as median_val
+FROM (SELECT @rownum:=@rownum+1 as `row_number`, gto_duration_in_sec
+        FROM gems__tokens, (SELECT @rownum:=0) r
+        WHERE gto_id_survey = ? AND gto_completion_time IS NOT NULL
+        ORDER BY gto_duration_in_sec
+    ) AS t1,
+    (SELECT count(*) as total_rows
+        FROM gems__tokens
+        WHERE gto_id_survey = ? AND gto_completion_time IS NOT NULL
+    ) as t2
+WHERE t1.row_number=floor(total_rows/2)+1";
+                if ($med = $this->db->fetchOne($sql, array($surveyId, $surveyId))) {
+                    $seq->append(sprintf($this->_('Median value: %s.'), $trs->formatTime($med)));
+                }
+
+                return $seq;
+            }
+        }
+
+        return $this->_('incalculable');
+    }
+
+    /**
      * Check the tokens for a single survey
      */
     public function checkAction()
@@ -354,7 +406,11 @@
 
         $model->set('gsu_survey_name',        'label', $this->_('Name'));
         $model->set('gsu_survey_description', 'label', $this->_('Description'), 'formatFunction', array(__CLASS__, 'formatDescription'));
-        $model->set('gso_source_name',        'label', $this->_('Source'));
+        if ($detailed) {
+            $model->set('gso_source_name',        'label', $this->_('Source'));
+        } else {
+            $model->set('gsu_duration',           'label', $this->_('Duration description'), 'description', $this->_('Text to inform the respondent, e.g. "20 seconds" or "1 minute".'));
+        }
         $model->set('gsu_status_show',        'label', $this->_('Status in source'));
 
         if ($detailed) {
@@ -376,10 +432,10 @@
             $events = $this->loader->getEvents();
 
             $model->set('gsu_result_field',          'label', $this->_('Result field'));
-            $model->set('gsu_duration',              'label', $this->_('Duration description'), 'description', $this->_('Text to inform the respondent.'));
-            
+            $model->set('gsu_duration',              'label', $this->_('Duration description'), 'description', $this->_('Text to inform the respondent, e.g. "20 seconds" or "1 minute".'));
+
             $model->setIfExists('gsu_code', 'label', $this->_('Code name'), 'size', 10, 'description', $this->_('Only for programmers.'));
-            
+
             $model->set('gsu_beforeanswering_event', 'label', $this->_('Before answering'), 'multiOptions', $events->listSurveyBeforeAnsweringEvents());
             $model->set('gsu_completed_event',       'label', $this->_('After completion'), 'multiOptions', $events->listSurveyCompletionEvents());
         }

Modified: trunk/library/classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php	2012-07-16 07:50:44 UTC (rev 847)
+++ trunk/library/classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php	2012-07-16 17:36:52 UTC (rev 848)
@@ -60,6 +60,13 @@
     protected $request;
 
     /**
+     * Switch for showing the duration.
+     *
+     * @var boolean
+     */
+    protected $showDuration = true;
+
+    /**
      * Required, the current token, possibly already answered
      *
      * @var Gems_Tracker_Token
@@ -129,6 +136,19 @@
     }
 
     /**
+     * Returns the duration if it should be displayed.
+     *
+     * @param string $duration
+     * @return string
+     */
+    public function formatDuration($duration)
+    {
+        if ($duration && $this->showDuration) {
+            return sprintf($this->_('Takes about %s to answer.'),  $duration) . ' ';
+        }
+    }
+
+    /**
      * Formats an until date for this display
      *
      * @param MUtil_Date $dateTime
@@ -137,30 +157,30 @@
     public function formatUntil(MUtil_Date $dateTime = null)
     {
         if (null === $dateTime) {
-            return $this->_('This survey has no set time limit.');
+            return $this->_('Survey has no time limit.');
         }
 
         $days = $dateTime->diffDays();
 
         switch ($days) {
             case 0:
-                return array(MUtil_Html::create('strong', $this->_('Warning!!!')), ' ', $this->_('This survey must be answered today!'));
+                return array(MUtil_Html::create('strong', $this->_('Warning!!!')), ' ', $this->_('Survey must be answered today!'));
 
             case 1:
-                return array(MUtil_Html::create('strong', $this->_('Warning!!')), ' ', $this->_('This survey must be answered tomorrow!'));
+                return array(MUtil_Html::create('strong', $this->_('Warning!!')), ' ', $this->_('Survey must be answered tomorrow!'));
 
             case 2:
-                return $this->_('Warning! This survey must be answered over 2 days!');
+                return $this->_('Warning! Survey must be answered over 2 days!');
 
             default:
                 if (abs($days) <= 14) {
                     if ($days >= 0) {
-                        return sprintf($this->_('This survey must be answered in %d days.'), $days);
+                        return sprintf($this->_('Survey must be answered in %d days.'), $days);
                     } else {
-                        return $this->_('This survey can no longer be answered.');
+                        return $this->_('Survey can no longer be answered.');
                     }
                 }
-                return sprintf($this->_('This survey can be answered until %s.'), $dateTime->toString($this->dateFormat));
+                return sprintf($this->_('Survey can be answered until %s.'), $dateTime->toString($this->dateFormat));
         }
     }
 

Modified: trunk/library/classes/Gems/Tracker/Survey.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Survey.php	2012-07-16 07:50:44 UTC (rev 847)
+++ trunk/library/classes/Gems/Tracker/Survey.php	2012-07-16 17:36:52 UTC (rev 848)
@@ -253,7 +253,7 @@
     {
         return $this->_gemsSurvey['gsu_code'];
     }
-    
+
     /**
      * The time the survey was completed according to the source
      *
@@ -289,6 +289,14 @@
         return $this->_gemsSurvey['gsu_survey_description'];
     }
 
+    /**
+     *
+     * @return string The (manually entered) normal duration for taking this survey
+     */
+    public function getDuration()
+    {
+        return $this->_gemsSurvey['gsu_duration'];
+    }
 
     /**
      *

Modified: trunk/library/classes/Gems/Util/Translated.php
===================================================================
--- trunk/library/classes/Gems/Util/Translated.php	2012-07-16 07:50:44 UTC (rev 847)
+++ trunk/library/classes/Gems/Util/Translated.php	2012-07-16 17:36:52 UTC (rev 848)
@@ -167,6 +167,31 @@
     }
 
     /**
+     * Returns the time in seconds as aq display string
+     *
+     * @param int $dateTimeValue
+     * @return string
+     */
+    public function formatTime($dateTimeValue)
+    {
+        $seconds = str_pad($dateTimeValue % 60, 2, '0', STR_PAD_LEFT);
+        $rest    = intval($dateTimeValue / 60);
+        $minutes = str_pad($rest % 60, 2, '0', STR_PAD_LEFT);
+        $hours   = intval($rest / 60);
+        $days    = intval($hours / 24);
+
+        if ($hours > 48) {
+            $hours = $hours % 24;
+
+            return sprintf($this->_('%d days %d:%s:%s'), $days, $hours, $minutes, $seconds);
+        } elseif ($hours) {
+            return sprintf($this->_('%d:%s:%s'), $hours, $minutes, $seconds);
+        } else {
+            return sprintf($this->_('%d:%s'), $minutes, $seconds);
+        }
+    }
+
+    /**
      * The options for bulk mail token processing.
      *
      * @return array

Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)

Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po	2012-07-16 07:50:44 UTC (rev 847)
+++ trunk/library/languages/default-en.po	2012-07-16 17:36:52 UTC (rev 848)
@@ -2,9 +2,9 @@
 msgstr ""
 "Project-Id-Version: GemsTracker EN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-13 14:46+0100\n"
+"POT-Creation-Date: 2012-07-16 19:30+0100\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Menno Dekker <men...@er...>\n"
+"Last-Translator: Matijs de Jong <mj...@ma...>\n"
 "Language-Team: Erasmus MGZ <mat...@ma...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,49 +50,49 @@
 msgid "version"
 msgstr "version"
 
-#: classes/GemsEscort.php:1447
+#: classes/GemsEscort.php:1451
 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:1576
+#: classes/GemsEscort.php:1580
 msgid "Please check back later."
 msgstr "Please check back later."
 
-#: classes/GemsEscort.php:1578
 #: classes/GemsEscort.php:1582
-#: classes/GemsEscort.php:1583
+#: classes/GemsEscort.php:1586
+#: classes/GemsEscort.php:1587
 msgid "System is in maintenance mode"
 msgstr "System is in maintenance mode"
 
-#: classes/GemsEscort.php:1593
+#: classes/GemsEscort.php:1597
 msgid "No access to site."
 msgstr "No access to site."
 
-#: classes/GemsEscort.php:1595
-#: classes/GemsEscort.php:1638
+#: classes/GemsEscort.php:1599
+#: classes/GemsEscort.php:1642
 msgid "You have no access to this site."
 msgstr "You have no access to this site."
 
-#: classes/GemsEscort.php:1611
+#: classes/GemsEscort.php:1615
 msgid "No access to page"
 msgstr "No access to page"
 
-#: classes/GemsEscort.php:1613
+#: classes/GemsEscort.php:1617
 #, 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:1623
-#: classes/GemsEscort.php:1636
+#: classes/GemsEscort.php:1627
+#: classes/GemsEscort.php:1640
 msgid "You are no longer logged in."
 msgstr "You are no longer logged in."
 
-#: classes/GemsEscort.php:1624
+#: classes/GemsEscort.php:1628
 msgid "You must login to access this page."
 msgstr "You must login to access this page."
 
-#: classes/GemsEscort.php:1765
-#: classes/GemsEscort.php:1767
+#: classes/GemsEscort.php:1769
+#: classes/GemsEscort.php:1771
 #, php-format
 msgid "%d survey"
 msgid_plural "%d surveys"
@@ -2206,107 +2206,137 @@
 msgid "If empty, survey will never show up!"
 msgstr "If empty, survey will never show up!"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:130
+#: classes/Gems/Default/SurveyMaintenanceAction.php:126
+msgid "Duration calculated"
+msgstr "Duration calculated"
+
+#: classes/Gems/Default/SurveyMaintenanceAction.php:131
 msgid "Upload new PDF"
 msgstr "Upload new PDF"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:138
+#: classes/Gems/Default/SurveyMaintenanceAction.php:139
 msgid "Usage"
 msgstr "Usage"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:153
+#: classes/Gems/Default/SurveyMaintenanceAction.php:154
 msgid "Single Survey Assignment"
 msgstr "Single Survey Assignment"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:198
+#: classes/Gems/Default/SurveyMaintenanceAction.php:199
 msgid "Assignable since"
 msgstr "Assignable since"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:199
+#: classes/Gems/Default/SurveyMaintenanceAction.php:200
 msgid "Assignable until"
 msgstr "Assignable until"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:205
+#: classes/Gems/Default/SurveyMaintenanceAction.php:206
 msgid "Create Single Survey"
 msgstr "Create Single Survey"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:209
+#: classes/Gems/Default/SurveyMaintenanceAction.php:210
 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:264
+#: classes/Gems/Default/SurveyMaintenanceAction.php:265
 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:281
+#: classes/Gems/Default/SurveyMaintenanceAction.php:295
 #, php-format
+msgid "Answered surveys: %d."
+msgstr "Answered surveys: %d."
+
+#: classes/Gems/Default/SurveyMaintenanceAction.php:296
+#, php-format
+msgid "Average answer time: %s."
+msgstr "Average answer time: %s."
+
+#: classes/Gems/Default/SurveyMaintenanceAction.php:297
+#, php-format
+msgid "Standard deviation: %s."
+msgstr "Standard deviation: %s."
+
+#: classes/Gems/Default/SurveyMaintenanceAction.php:313
+#, php-format
+msgid "Median value: %s."
+msgstr "Median value: %s."
+
+#: classes/Gems/Default/SurveyMaintenanceAction.php:320
+msgid "incalculable"
+msgstr "incalculable"
+
+#: classes/Gems/Default/SurveyMaintenanceAction.php:333
+#, php-format
 msgid "Checking survey results for the %s survey."
 msgstr "Checking survey results for the %s survey."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:293
+#: classes/Gems/Default/SurveyMaintenanceAction.php:345
 msgid "Checking survey results for all surveys."
 msgstr "Checking survey results for all surveys."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:350
+#: classes/Gems/Default/SurveyMaintenanceAction.php:402
 msgid "OK"
 msgstr "OK"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:357
+#: classes/Gems/Default/SurveyMaintenanceAction.php:410
 msgid "Source"
 msgstr "Source"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:358
+#: classes/Gems/Default/SurveyMaintenanceAction.php:412
+#: classes/Gems/Default/SurveyMaintenanceAction.php:435
+msgid "Duration description"
+msgstr "Duration description"
+
+#: classes/Gems/Default/SurveyMaintenanceAction.php:412
+#: classes/Gems/Default/SurveyMaintenanceAction.php:435
+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:414
 msgid "Status in source"
 msgstr "Status in source"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:361
+#: classes/Gems/Default/SurveyMaintenanceAction.php:417
 msgid "Active in source"
 msgstr "Active in source"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:362
+#: classes/Gems/Default/SurveyMaintenanceAction.php:418
 #, php-format
 msgid "Active in %s"
 msgstr "Active in %s"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:369
+#: classes/Gems/Default/SurveyMaintenanceAction.php:425
 msgid "Single"
 msgstr "Single"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:378
+#: classes/Gems/Default/SurveyMaintenanceAction.php:434
 msgid "Result field"
 msgstr "Result field"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:379
-msgid "Duration description"
-msgstr "Duration description"
-
-#: classes/Gems/Default/SurveyMaintenanceAction.php:379
-msgid "Text to inform the respondent."
-msgstr "Text to inform the respondent."
-
-#: classes/Gems/Default/SurveyMaintenanceAction.php:383
+#: classes/Gems/Default/SurveyMaintenanceAction.php:439
 msgid "Before answering"
 msgstr "Before answering"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:384
+#: classes/Gems/Default/SurveyMaintenanceAction.php:440
 msgid "After completion"
 msgstr "After completion"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:414
+#: classes/Gems/Default/SurveyMaintenanceAction.php:470
 #, php-format
 msgid "%d times in track."
 msgstr "%d times in track."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:416
+#: classes/Gems/Default/SurveyMaintenanceAction.php:472
 #, php-format
 msgid "%d times in %d track(s)."
 msgstr "%d times in %d track(s)."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:420
+#: classes/Gems/Default/SurveyMaintenanceAction.php:476
 msgid "Not used in track."
 msgstr "Not used in track."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:422
+#: classes/Gems/Default/SurveyMaintenanceAction.php:478
 msgid "Not used in tracks."
 msgstr "Not used in tracks."
 
@@ -3479,65 +3509,70 @@
 msgid "Next &gt;"
 msgstr "Next &gt;"
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:115
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:122
 msgid "We have received your answers today. Thank you!"
 msgstr "We have received your answers today. Thank you!"
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:118
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:125
 msgid "We have received your answers yesterday. Thank you!"
 msgstr "We have received your answers yesterday. Thank you!"
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:121
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:128
 msgid "We have received your answers 2 days ago. Thank you."
 msgstr "We have received your answers 2 days ago. Thank you."
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:125
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:132
 #, php-format
 msgid "We have received your answers %d days ago. Thank you."
 msgstr "We have received your answers %d days ago. Thank you."
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:127
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:134
 #, php-format
 msgid "We have received your answers on %s. "
 msgstr "We have received your answers on %s. "
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:140
-msgid "This survey has no set time limit."
-msgstr "This survey has no set time limit."
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:147
+#, php-format
+msgid "Takes about %s to answer."
+msgstr "Takes about %s to answer."
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:147
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:160
+msgid "Survey has no time limit."
+msgstr "Survey has no time limit."
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:167
 msgid "Warning!!!"
 msgstr "Warning!!!"
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:147
-msgid "This survey must be answered today!"
-msgstr "This survey must be answered today!"
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:167
+msgid "Survey must be answered today!"
+msgstr "Survey must be answered today!"
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:150
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:170
 msgid "Warning!!"
 msgstr "Warning!!"
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:150
-msgid "This survey must be answered tomorrow!"
-msgstr "This survey must be answered tomorrow!"
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:170
+msgid "Survey must be answered tomorrow!"
+msgstr "Survey must be answered tomorrow!"
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:153
-msgid "Warning! This survey must be answered over 2 days!"
-msgstr "Warning! This survey must be answered over 2 days!"
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:173
+msgid "Warning! Survey must be answered over 2 days!"
+msgstr "Warning! Survey must be answered over 2 days!"
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:158
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:178
 #, php-format
-msgid "This survey must be answered in %d days."
-msgstr "This survey must be answered in %d days."
+msgid "Survey must be answered in %d days."
+msgstr "Survey must be answered in %d days."
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:160
-msgid "This survey can no longer be answered."
-msgstr "This survey can no longer be answered."
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:180
+msgid "Survey can no longer be answered."
+msgstr "Survey can no longer be answered."
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:163
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:183
 #, php-format
-msgid "This survey can be answered until %s."
-msgstr "This survey can be answered until %s."
+msgid "Survey can be answered until %s."
+msgstr "Survey can be answered until %s."
 
 #: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:376
 #: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1162
@@ -3806,12 +3841,12 @@
 msgid "Unable to send e-mail."
 msgstr "Unable to send e-mail."
 
-#: classes/Gems/User/UserLoader.php:234
-#: classes/Gems/User/UserLoader.php:248
+#: classes/Gems/User/UserLoader.php:244
+#: classes/Gems/User/UserLoader.php:258
 msgid "Db storage"
 msgstr "Db storage"
 
-#: classes/Gems/User/UserLoader.php:249
+#: classes/Gems/User/UserLoader.php:259
 msgid "Radius storage"
 msgstr "Radius storage"
 
@@ -3944,43 +3979,58 @@
 msgid "%d days ago"
 msgstr "%d days ago"
 
-#: classes/Gems/Util/Translated.php:177
+#: classes/Gems/Util/Translated.php:186
+#, php-format
+msgid "%d days %d:%s:%s"
+msgstr "%d days %d:%s:%s"
+
+#: classes/Gems/Util/Translated.php:188
+#, php-format
+msgid "%d:%s:%s"
+msgstr "%d:%s:%s"
+
+#: classes/Gems/Util/Translated.php:190
+#, php-format
+msgid "%d:%s"
+msgstr "%d:%s"
+
+#: classes/Gems/Util/Translated.php:202
 msgid "Send multiple mails per respondent, one for each checked token."
 msgstr "Send multiple mails per patient, one for each checked token."
 
-#: classes/Gems/Util/Translated.php:178
+#: classes/Gems/Util/Translated.php:203
 msgid "Send one mail per respondent, mark all checked tokens as send."
 msgstr "Send one mail per patient, mark all checked tokens as send."
 
-#: classes/Gems/Util/Translated.php:179
+#: classes/Gems/Util/Translated.php:204
 msgid "Send one mail per respondent, mark only mailed tokens as send."
 msgstr "Send one mail per patient, mark only mailed tokens as send."
 
-#: classes/Gems/Util/Translated.php:204
+#: classes/Gems/Util/Translated.php:229
 msgid "Unknown"
 msgstr "Unknown"
 
-#: classes/Gems/Util/Translated.php:217
+#: classes/Gems/Util/Translated.php:242
 msgid "mr."
 msgstr "Mr."
 
-#: classes/Gems/Util/Translated.php:217
+#: classes/Gems/Util/Translated.php:242
 msgid "mrs."
 msgstr "Mrs."
 
-#: classes/Gems/Util/Translated.php:217
+#: classes/Gems/Util/Translated.php:242
 msgid "mr./mrs."
 msgstr "Mr./Mrs."
 
-#: classes/Gems/Util/Translated.php:230
+#: classes/Gems/Util/Translated.php:255
 msgid "Mr."
 msgstr "Mr."
 
-#: classes/Gems/Util/Translated.php:230
+#: classes/Gems/Util/Translated.php:255
 msgid "Mrs."
 msgstr "Mrs."
 
-#: classes/Gems/Util/Translated.php:230
+#: classes/Gems/Util/Translated.php:255
 msgid "Mr./Mrs."
 msgstr "Mr./Mrs."
 
@@ -4374,17 +4424,17 @@
 msgid "Round: %s"
 msgstr "Round: %s"
 
-#: snippets/Track/Token/ShowAllOpenSnippet.php:189
+#: snippets/Track/Token/ShowAllOpenSnippet.php:190
 msgid "Please answer the open survey."
 msgid_plural "Please answer the open surveys."
 msgstr[0] "Please answer the open survey."
 msgstr[1] "Please answer the open surveys."
 
-#: snippets/Track/Token/ShowAllOpenSnippet.php:191
+#: snippets/Track/Token/ShowAllOpenSnippet.php:192
 msgid "Thank you for answering all open surveys."
 msgstr "Thank you for answering all open surveys."
 
-#: snippets/Track/Token/ShowAllOpenSnippet.php:194
+#: snippets/Track/Token/ShowAllOpenSnippet.php:195
 msgid "There are no surveys to show for this token."
 msgstr "There are no surveys to show for this token."
 
@@ -4660,9 +4710,6 @@
 #~ msgid "Completion event"
 #~ msgstr "Completion event"
 
-#~ msgid "Do not calculate this date."
-#~ msgstr "Do not calculate this date."
-
 #~ msgid ""
 #~ "Let op: uw sessie is verlopen, uw invoer is niet opgeslagen. Controleer "
 #~ "de gegevens en probeer a.u.b. opnieuw."

Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)

Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po	2012-07-16 07:50:44 UTC (rev 847)
+++ trunk/library/languages/default-nl.po	2012-07-16 17:36:52 UTC (rev 848)
@@ -2,9 +2,9 @@
 msgstr ""
 "Project-Id-Version: GemsTracker NL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-13 14:42+0100\n"
+"POT-Creation-Date: 2012-07-16 19:31+0100\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Menno Dekker <men...@er...>\n"
+"Last-Translator: Matijs de Jong <mj...@ma...>\n"
 "Language-Team: Erasmus MGZ <mat...@ma...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,49 +50,49 @@
 msgid "version"
 msgstr "versie"
 
-#: classes/GemsEscort.php:1447
+#: classes/GemsEscort.php:1451
 msgid "Take note: your session has expired, your inputs were not saved. Please check the input data and try again"
 msgstr "Let op: uw sessie is verlopen, uw invoer is niet opgeslagen. Controleer uw gegevens en probeer a.u.b. opnieuw."
 
-#: classes/GemsEscort.php:1576
+#: classes/GemsEscort.php:1580
 msgid "Please check back later."
 msgstr "Probeer het later opnieuw."
 
-#: classes/GemsEscort.php:1578
 #: classes/GemsEscort.php:1582
-#: classes/GemsEscort.php:1583
+#: classes/GemsEscort.php:1586
+#: classes/GemsEscort.php:1587
 msgid "System is in maintenance mode"
 msgstr "Systeem is in onderhoudsmodus"
 
-#: classes/GemsEscort.php:1593
+#: classes/GemsEscort.php:1597
 msgid "No access to site."
 msgstr "Geen toegang tot website."
 
-#: classes/GemsEscort.php:1595
-#: classes/GemsEscort.php:1638
+#: classes/GemsEscort.php:1599
+#: classes/GemsEscort.php:1642
 msgid "You have no access to this site."
 msgstr "U heeft geen toegang tot deze website."
 
-#: classes/GemsEscort.php:1611
+#: classes/GemsEscort.php:1615
 msgid "No access to page"
 msgstr "Geen toegang tot pagina"
 
-#: classes/GemsEscort.php:1613
+#: classes/GemsEscort.php:1617
 #, php-format
 msgid "Access to this page is not allowed for current role: %s."
 msgstr "U heeft geen toegang tot deze pagina. Uw huidige rol is: %s."
 
-#: classes/GemsEscort.php:1623
-#: classes/GemsEscort.php:1636
+#: classes/GemsEscort.php:1627
+#: classes/GemsEscort.php:1640
 msgid "You are no longer logged in."
 msgstr "U bent niet meer ingelogd."
 
-#: classes/GemsEscort.php:1624
+#: classes/GemsEscort.php:1628
 msgid "You must login to access this page."
 msgstr "U moet ingelogd zijn voor toegang tot deze pagina."
 
-#: classes/GemsEscort.php:1765
-#: classes/GemsEscort.php:1767
+#: classes/GemsEscort.php:1769
+#: classes/GemsEscort.php:1771
 #, php-format
 msgid "%d survey"
 msgid_plural "%d surveys"
@@ -2206,107 +2206,137 @@
 msgid "If empty, survey will never show up!"
 msgstr "Indien leeg zal de vragenlijst niet tevoorschijn komen!"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:130
+#: classes/Gems/Default/SurveyMaintenanceAction.php:126
+msgid "Duration calculated"
+msgstr "Afnametijd berekent"
+
+#: classes/Gems/Default/SurveyMaintenanceAction.php:131
 msgid "Upload new PDF"
 msgstr "Upload nieuwe PDF"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:138
+#: classes/Gems/Default/SurveyMaintenanceAction.php:139
 msgid "Usage"
 msgstr "Gebruik"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:153
+#: classes/Gems/Default/SurveyMaintenanceAction.php:154
 msgid "Single Survey Assignment"
 msgstr "Losse vragenlijst toewijzing"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:198
+#: classes/Gems/Default/SurveyMaintenanceAction.php:199
 msgid "Assignable since"
 msgstr "Toewijsbaar sinds"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:199
+#: classes/Gems/Default/SurveyMaintenanceAction.php:200
 msgid "Assignable until"
 msgstr "Toewijsbaar tot"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:205
+#: classes/Gems/Default/SurveyMaintenanceAction.php:206
 msgid "Create Single Survey"
 msgstr "Maak losse vragenlijst"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:209
+#: classes/Gems/Default/SurveyMaintenanceAction.php:210
 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:264
+#: classes/Gems/Default/SurveyMaintenanceAction.php:265
 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:281
+#: classes/Gems/Default/SurveyMaintenanceAction.php:295
 #, php-format
+msgid "Answered surveys: %d."
+msgstr "Beantwoorde vragenlijsten: %d."
+
+#: classes/Gems/Default/SurveyMaintenanceAction.php:296
+#, php-format
+msgid "Average answer time: %s."
+msgstr "Gemiddelde antwoordtijd: %s."
+
+#: classes/Gems/Default/SurveyMaintenanceAction.php:297
+#, php-format
+msgid "Standard deviation: %s."
+msgstr "Standaard deviatie: %s."
+
+#: classes/Gems/Default/SurveyMaintenanceAction.php:313
+#, php-format
+msgid "Median value: %s."
+msgstr "Median waarde: %s."
+
+#: classes/Gems/Default/SurveyMaintenanceAction.php:320
+msgid "incalculable"
+msgstr "onberekenbaar"
+
+#: classes/Gems/Default/SurveyMaintenanceAction.php:333
+#, php-format
 msgid "Checking survey results for the %s survey."
 msgstr "Controle op vragenlijstresultaten voor de vragenlijst '%s'."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:293
+#: classes/Gems/Default/SurveyMaintenanceAction.php:345
 msgid "Checking survey results for all surveys."
 msgstr "Controle op vragenlijstresultaten voor alle vragenlijsten."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:350
+#: classes/Gems/Default/SurveyMaintenanceAction.php:402
 msgid "OK"
 msgstr "OK"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:357
+#: classes/Gems/Default/SurveyMaintenanceAction.php:410
 msgid "Source"
 msgstr "Bron"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:358
+#: classes/Gems/Default/SurveyMaintenanceAction.php:412
+#: classes/Gems/Default/SurveyMaintenanceAction.php:435
+msgid "Duration description"
+msgstr "Beschrijving afnametijd"
+
+#: classes/Gems/Default/SurveyMaintenanceAction.php:412
+#: classes/Gems/Default/SurveyMaintenanceAction.php:435
+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:414
 msgid "Status in source"
 msgstr "Status in bron"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:361
+#: classes/Gems/Default/SurveyMaintenanceAction.php:417
 msgid "Active in source"
 msgstr "Actief in bron"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:362
+#: classes/Gems/Default/SurveyMaintenanceAction.php:418
 #, php-format
 msgid "Active in %s"
 msgstr "Actief in %s"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:369
+#: classes/Gems/Default/SurveyMaintenanceAction.php:425
 msgid "Single"
 msgstr "Los"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:378
+#: classes/Gems/Default/SurveyMaintenanceAction.php:434
 msgid "Result field"
 msgstr "Resultaat veld"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:379
-msgid "Duration description"
-msgstr "Beschrijving afnametijd"
-
-#: classes/Gems/Default/SurveyMaintenanceAction.php:379
-msgid "Text to inform the respondent."
-msgstr "tekst er informatie van de patiënt."
-
-#: classes/Gems/Default/SurveyMaintenanceAction.php:383
+#: classes/Gems/Default/SurveyMaintenanceAction.php:439
 msgid "Before answering"
 msgstr "Voor beantwoording"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:384
+#: classes/Gems/Default/SurveyMaintenanceAction.php:440
 msgid "After completion"
 msgstr "Na afronding"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:414
+#: classes/Gems/Default/SurveyMaintenanceAction.php:470
 #, php-format
 msgid "%d times in track."
 msgstr "%d keer in traject."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:416
+#: classes/Gems/Default/SurveyMaintenanceAction.php:472
 #, php-format
 msgid "%d times in %d track(s)."
 msgstr "%d keer in %d traject(en)."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:420
+#: classes/Gems/Default/SurveyMaintenanceAction.php:476
 msgid "Not used in track."
 msgstr "Niet in traject gebruikt."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:422
+#: classes/Gems/Default/SurveyMaintenanceAction.php:478
 msgid "Not used in tracks."
 msgstr "Niet in trajecten gebruikt."
 
@@ -3479,65 +3509,70 @@
 msgid "Next &gt;"
 msgstr "Verder &gt;"
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:115
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:122
 msgid "We have received your answers today. Thank you!"
 msgstr "We hebben uw vragenlijst vandaag ingevuld ontvangen. Dank u wel!"
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:118
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:125
 msgid "We have received your answers yesterday. Thank you!"
 msgstr "We hebben uw vragenlijst gisteren ingevuld ontvangen. Dank u wel!"
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:121
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:128
 msgid "We have received your answers 2 days ago. Thank you."
 msgstr "We hebben uw vragenlijst eergisteren ingevuld ontvangen. Dank u wel."
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:125
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:132
 #, php-format
 msgid "We have received your answers %d days ago. Thank you."
 msgstr "We hebben uw vragenlijst %d dagen geleden ingevuld ontvangen. Dank u wel."
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:127
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:134
 #, php-format
 msgid "We have received your answers on %s. "
 msgstr "We hebben uw vragenlijst op %s ingevuld ontvangen."
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:140
-msgid "This survey has no set time limit."
-msgstr "Deze vragenlijst heeft geen eindtijd."
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:147
+#, php-format
+msgid "Takes about %s to answer."
+msgstr "Duurt meestal ongeveer %s."
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:147
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:160
+msgid "Survey has no time limit."
+msgstr "Vragenlijst zonder eindtijd."
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:167
 msgid "Warning!!!"
 msgstr "Let op!!!"
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:147
-msgid "This survey must be answered today!"
-msgstr "Deze vragenlijst moet vandaag ingevuld zijn!"
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:167
+msgid "Survey must be answered today!"
+msgstr "Vragenlijst moet vandaag ingevuld zijn!"
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:150
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:170
 msgid "Warning!!"
 msgstr "Let op!!"
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:150
-msgid "This survey must be answered tomorrow!"
-msgstr "Deze vragenlijst moet morgen ingevuld zijn!"
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:170
+msgid "Survey must be answered tomorrow!"
+msgstr "Vragenlijst moet morgen ingevuld zijn!"
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:153
-msgid "Warning! This survey must be answered over 2 days!"
-msgstr "Let op! Deze vragenlijst moet overmorgen ingevuld zijn!"
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:173
+msgid "Warning! Survey must be answered over 2 days!"
+msgstr "Let op! Vragenlijst moet overmorgen ingevuld zijn!"
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:158
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:178
 #, php-format
-msgid "This survey must be answered in %d days."
-msgstr "Deze vragenlijst moet binnen %d dagen  ingevuld zijn!"
+msgid "Survey must be answered in %d days."
+msgstr "Vragenlijst moet binnen %d dagen  ingevuld zijn!"
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:160
-msgid "This survey can no longer be answered."
-msgstr "Deze vragenlijst kan niet langer worden ingevuld!"
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:180
+msgid "Survey can no longer be answered."
+msgstr "Vragenlijst kan niet langer worden ingevuld!"
 
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:163
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:183
 #, php-format
-msgid "This survey can be answered until %s."
-msgstr "Deze vragenlijst moet ingevuld worden voor %s."
+msgid "Survey can be answered until %s."
+msgstr "Moet ingevuld worden voor %s."
 
 #: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:376
 #: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1162
@@ -3806,12 +3841,12 @@
 msgid "Unable to send e-mail."
 msgstr "Verzenden email mislukt."
 
-#: classes/Gems/User/UserLoader.php:234
-#: classes/Gems/User/UserLoader.php:248
+#: classes/Gems/User/UserLoader.php:244
+#: classes/Gems/User/UserLoader.php:258
 msgid "Db storage"
 msgstr "Database opslag"
 
-#: classes/Gems/User/UserLoader.php:249
+#: classes/Gems/User/UserLoader.php:259
 msgid "Radius storage"
 msgstr "Radius authenticatie"
 
@@ -3944,43 +3979,58 @@
 msgid "%d days ago"
 msgstr "%d dagen terug"
 
-#: classes/Gems/Util/Translated.php:177
+#: classes/Gems/Util/Translated.php:186
+#, php-format
+msgid "%d days %d:%s:%s"
+msgstr "%d dagen %d:%s:%s"
+
+#: classes/Gems/Util/Translated.php:188
+#, php-format
+msgid "%d:%s:%s"
+msgstr "%d:%s:%s"
+
+#: classes/Gems/Util/Translated.php:190
+#, php-format
+msgid "%d:%s"
+msgstr "%d:%s"
+
+#: classes/Gems/Util/Translated.php:202
 msgid "Send multiple mails per respondent, one for each checked token."
 msgstr "Verstuur meerdere emails per patiënt, één per gekozen kenmerk."
 
-#: classes/Gems/Util/Translated.php:178
+#: classes/Gems/Util/Translated.php:203
 msgid "Send one mail per respondent, mark all checked tokens as send."
 msgstr "Verstuur één email per patiënt, zet alle gekozen kenmerken op verzonden."
 
-#: classes/Gems/Util/Translated.php:179
+#: classes/Gems/Util/Translated.php:204
 msgid "Send one mail per respondent, mark only mailed tokens as send."
 msgstr "Verstuur één email per patiënt, zet alleen de verzonden kenmerken op verzonden."
 
-#: classes/Gems/Util/Translated.php:204
+#: classes/Gems/Util/Translated.php:229
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: classes/Gems/Util/Translated.php:217
+#: classes/Gems/Util/Translated.php:242
 msgid "mr."
 msgstr "meneer"
 
-#: classes/Gems/Util/Translated.php:217
+#: classes/Gems/Util/Translated.php:242
 msgid "mrs."
 msgstr "mevrouw"
 
-#: classes/Gems/Util/Translated.php:217
+#: classes/Gems/Util/Translated.php:242
 msgid "mr./mrs."
 msgstr "heer/mevrouw"
 
-#: classes/Gems/Util/Translated.php:230
+#: classes/Gems/Util/Translated.php:255
 msgid "Mr."
 msgstr "De heer"
 
-#: classes/Gems/Util/Translated.php:230
+#: classes/Gems/Util/Translated.php:255
 msgid "Mrs."
 msgstr "Mevrouw"
 
-#: classes/Gems/Util/Translated.php:230
+#: classes/Gems/Util/Translated.php:255
 msgid "Mr./Mrs."
 msgstr "De heer/Mevrouw"
 
@@ -4374,17 +4424,17 @@
 msgid "Round: %s"
 msgstr "Ronde: %s"
 
-#: snippets/Track/Token/ShowAllOpenSnippet.php:189
+#: snippets/Track/Token/ShowAllOpenSnippet.php:190
 msgid "Please answer the open survey."
 msgid_plural "Please answer the open surveys."
 msgstr[0] "Wij verzoeken u de openstaande vragenlijst nu in te vullen."
 msgstr[1] "Wij verzoeken u de openstaande vragenlijsten nu in te vullen."
 
-#: snippets/Track/Token/ShowAllOpenSnippet.php:191
+#: snippets/Track/Token/ShowAllOpenSnippet.php:192
 msgid "Thank you for answering all open surveys."
 msgstr "Dank u voor het beantwoorden van alle openstaande vragenlijsten."
 
-#: snippets/Track/Token/ShowAllOpenSnippet.php:194
+#: snippets/Track/Token/ShowAllOpenSnippet.php:195
 msgid "There are no surveys to show for this token."
 msgstr "U heeft geen open vragenlijsten voor dit kenmerk."
 
@@ -4675,9 +4725,6 @@
 #~ msgid "Completion event"
 #~ msgstr "Afrondingscode"
 
-#~ msgid "Do not calculate this date."
-#~ msgstr "Laat deze datum leeg."
-
 #~ msgid ""
 #~ "Let op: uw sessie is verlopen, uw invoer is niet opgeslagen. Controleer "
 #~ "de gegevens en probeer a.u.b. opnieuw."

Modified: trunk/library/snippets/Track/Token/ShowAllOpenSnippet.php
===================================================================
--- trunk/library/snippets/Track/Token/ShowAllOpenSnippet.php	2012-07-16 07:50:44 UTC (rev 847)
+++ trunk/library/snippets/Track/Token/ShowAllOpenSnippet.php	2012-07-16 17:36:52 UTC (rev 848)
@@ -174,6 +174,7 @@
 
                     $a = $div->actionLink($this->getTokenHref($token), $token->getSurveyName());
                     $div->append(' ');
+                    $div->append($this->formatDuration($token->getSurvey()->getDuration()));
                     $div->append($this->formatUntil($token->getValidUntil()));
 
                     /*

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[847] trunk/library/changelog.txt

From: <gem...@li...> - 2012-07-16 07:50:50

Revision: 847
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=847&view=rev
Author:   mennodekker
Date:     2012-07-16 07:50:44 +0000 (Mon, 16 Jul 2012)
Log Message:
-----------
Added changelog text for #544

Modified Paths:
--------------
    trunk/library/changelog.txt

Modified: trunk/library/changelog.txt
===================================================================
--- trunk/library/changelog.txt	2012-07-13 14:39:56 UTC (rev 846)
+++ trunk/library/changelog.txt	2012-07-16 07:50:44 UTC (rev 847)
@@ -1,5 +1,6 @@
 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
 Role editing has become more interactive and safer to use
 Internally code no longer uses the 'Hidden Organization' but expects both an id1/patientNr plus an id2/organizationId to be specified
 Externally the organization id is still left out of the url when not needed

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[846] trunk/library/classes/Gems/User/UserLoader. php

From: <gem...@li...> - 2012-07-13 14:40:02

Revision: 846
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=846&view=rev
Author:   mennodekker
Date:     2012-07-13 14:39:56 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Fixed #544: Duplicate logins could lead to problems when logging in to other organization
dev: debug statement

Modified Paths:
--------------
    trunk/library/classes/Gems/User/UserLoader.php

Modified: trunk/library/classes/Gems/User/UserLoader.php
===================================================================
--- trunk/library/classes/Gems/User/UserLoader.php	2012-07-13 14:30:28 UTC (rev 845)
+++ trunk/library/classes/Gems/User/UserLoader.php	2012-07-13 14:39:56 UTC (rev 846)
@@ -512,7 +512,6 @@
             $select = $this->getUserClassSelect($login_name, $organization);
 
             if ($row = $this->db->fetchRow($select, null, Zend_Db::FETCH_NUM)) {
-                MUtil_Echo::track($row);
                 if ($row[3] == 1 || $this->allowLoginOnOtherOrganization === true) {
                     // MUtil_Echo::track($row);
                     return $this->loadUser($row[0], $row[1], $row[2]);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[845] trunk/library/classes/Gems/User/UserLoader. php

From: <gem...@li...> - 2012-07-13 14:30:35

Revision: 845
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=845&view=rev
Author:   mennodekker
Date:     2012-07-13 14:30:28 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Fixed #544: Duplicate logins could lead to problems when logging in to other organization
dev: needs a message in changelog.txt

Modified Paths:
--------------
    trunk/library/classes/Gems/User/UserLoader.php

Modified: trunk/library/classes/Gems/User/UserLoader.php
===================================================================
--- trunk/library/classes/Gems/User/UserLoader.php	2012-07-13 13:43:15 UTC (rev 844)
+++ trunk/library/classes/Gems/User/UserLoader.php	2012-07-13 14:30:28 UTC (rev 845)
@@ -56,6 +56,16 @@
     const USER_STAFF      = 'StaffUser';
 
     /**
+     * When true a user is allowed to login to a different organization then the
+     * one that provides an account. See GetUserClassSelect for the possible options
+     * but be aware that duplicate accounts could lead to problems. To avoid
+     * problems you can always use the organization switch AFTER login.
+     *
+     * @var boolean
+     */
+    public $allowLoginOnOtherOrganization = false;
+
+    /**
      * When true Respondent members can use their e-mail address as login name
      * @var boolean
      */
@@ -502,8 +512,11 @@
             $select = $this->getUserClassSelect($login_name, $organization);
 
             if ($row = $this->db->fetchRow($select, null, Zend_Db::FETCH_NUM)) {
-                // MUtil_Echo::track($row);
-                return $this->loadUser($row[0], $row[1], $row[2]);
+                MUtil_Echo::track($row);
+                if ($row[3] == 1 || $this->allowLoginOnOtherOrganization === true) {
+                    // MUtil_Echo::track($row);
+                    return $this->loadUser($row[0], $row[1], $row[2]);
+                }
             }
 
         } catch (Zend_Db_Exception $e) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[844] trunk/library

From: <gem...@li...> - 2012-07-13 13:43:23

Revision: 844
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=844&view=rev
Author:   mennodekker
Date:     2012-07-13 13:43:15 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Updated translations
Only do _layout when we use the layout
Use only get instead of get and post variables for org switch return url

Modified Paths:
--------------
    trunk/library/classes/GemsEscort.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/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php	2012-07-13 11:32:36 UTC (rev 843)
+++ trunk/library/classes/GemsEscort.php	2012-07-13 13:43:15 UTC (rev 844)
@@ -887,7 +887,7 @@
                 // Organization switcher
                 $orgSwitch  = MUtil_Html::create('div', array('id' => 'organizations'));
                 $currentId  = $user->getCurrentOrganizationId();
-                $params     = $this->request->getParams();
+                $params     = $this->request->getQuery();   //Use only get params, not post
                 unset($params['error_handler']);    // If present, this is an object and causes a warning
                 unset($params[Gems_Util_RequestCache::RESET_PARAM]);
                 $currentUri = $this->view->url($params, null, true);
@@ -1382,31 +1382,35 @@
     {
         if ($request->isDispatched()) {
 
-            // Per project layout preparation
-            if (isset($this->project->layoutPrepare)) {
-                foreach ($this->project->layoutPrepare as $prepare => $type) {
-                    if ($type) {
-                        $function = '_layout' . ucfirst($prepare);
+            // Only when we need to render the layout, we run the layout prepare
+            if (Zend_Controller_Action_HelperBroker::hasHelper('layout') && Zend_Controller_Action_HelperBroker::getExistingHelper('layout')->isEnabled()) {
 
-                        if (isset($this->project->layoutPrepareArgs, $this->project->layoutPrepareArgs[$prepare])) {
-                            $args = $this->project->layoutPrepareArgs[$prepare];
-                        } else {
-                            $args = array();
-                        }
+                // Per project layout preparation
+                if (isset($this->project->layoutPrepare)) {
+                    foreach ($this->project->layoutPrepare as $prepare => $type) {
+                        if ($type) {
+                            $function = '_layout' . ucfirst($prepare);
 
-                        $result = $this->$function($args);
+                            if (isset($this->project->layoutPrepareArgs, $this->project->layoutPrepareArgs[$prepare])) {
+                                $args = $this->project->layoutPrepareArgs[$prepare];
+                            } else {
+                                $args = array();
+                            }
 
-                        // When a result is returned, add it to the view,
-                        // according to the type method
-                        if (null !== $result) {
-                            if (is_numeric($type)) {
-                                $this->view->$prepare = $result;
-                            } else {
-                                if (! isset($this->view->$type)) {
-                                    $this->view->$type = new MUtil_Html_Sequence();
+                            $result = $this->$function($args);
+
+                            // When a result is returned, add it to the view,
+                            // according to the type method
+                            if (null !== $result) {
+                                if (is_numeric($type)) {
+                                    $this->view->$prepare = $result;
+                                } else {
+                                    if (!isset($this->view->$type)) {
+                                        $this->view->$type  = new MUtil_Html_Sequence();
+                                    }
+                                    $sequence           = $this->view->$type;
+                                    $sequence[$prepare] = $result;
                                 }
-                                $sequence = $this->view->$type;
-                                $sequence[$prepare] = $result;
                             }
                         }
                     }

Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)

Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po	2012-07-13 11:32:36 UTC (rev 843)
+++ trunk/library/languages/default-en.po	2012-07-13 13:43:15 UTC (rev 844)
@@ -2,9 +2,9 @@
 msgstr ""
 "Project-Id-Version: GemsTracker EN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-28 12:06+0100\n"
+"POT-Creation-Date: 2012-07-13 14:46+0100\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Matijs de Jong <mj...@ma...>\n"
+"Last-Translator: Menno Dekker <men...@er...>\n"
 "Language-Team: Erasmus MGZ <mat...@ma...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,77 +18,81 @@
 "X-Poedit-KeywordsList: plural:1,2\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: classes/GemsEscort.php:214
+#: classes/GemsEscort.php:215
 #, php-format
 msgid "Path %s not writable"
 msgstr "Path %s not writable"
 
-#: classes/GemsEscort.php:776
+#: classes/GemsEscort.php:597
+msgid " > "
+msgstr " > "
+
+#: classes/GemsEscort.php:788
 #, php-format
 msgid "You are logged in as %s"
 msgstr "You are logged in as %s"
 
-#: classes/GemsEscort.php:778
+#: classes/GemsEscort.php:790
 #: classes/Gems/Menu.php:249
 msgid "Logoff"
 msgstr "Logoff"
 
-#: classes/GemsEscort.php:781
+#: classes/GemsEscort.php:793
 msgid "You are not logged in"
 msgstr "You are not logged in"
 
-#: classes/GemsEscort.php:968
+#: classes/GemsEscort.php:980
 #, php-format
 msgid "User: %s"
 msgstr "User: %s"
 
-#: classes/GemsEscort.php:993
+#: classes/GemsEscort.php:1005
 msgid "version"
 msgstr "version"
 
-#: classes/GemsEscort.php:1435
+#: classes/GemsEscort.php:1447
 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:1564
+#: classes/GemsEscort.php:1576
 msgid "Please check back later."
 msgstr "Please check back later."
 
-#: classes/GemsEscort.php:1566
-#: classes/GemsEscort.php:1570
-#: classes/GemsEscort.php:1571
+#: classes/GemsEscort.php:1578
+#: classes/GemsEscort.php:1582
+#: classes/GemsEscort.php:1583
 msgid "System is in maintenance mode"
 msgstr "System is in maintenance mode"
 
-#: classes/GemsEscort.php:1581
+#: classes/GemsEscort.php:1593
 msgid "No access to site."
 msgstr "No access to site."
 
-#: classes/GemsEscort.php:1583
-#: classes/GemsEscort.php:1626
+#: classes/GemsEscort.php:1595
+#: classes/GemsEscort.php:1638
 msgid "You have no access to this site."
 msgstr "You have no access to this site."
 
-#: classes/GemsEscort.php:1599
+#: classes/GemsEscort.php:1611
 msgid "No access to page"
 msgstr "No access to page"
 
-#: classes/GemsEscort.php:1601
+#: classes/GemsEscort.php:1613
 #, 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:1611
-#: classes/GemsEscort.php:1624
+#: classes/GemsEscort.php:1623
+#: classes/GemsEscort.php:1636
 msgid "You are no longer logged in."
 msgstr "You are no longer logged in."
 
-#: classes/GemsEscort.php:1612
+#: classes/GemsEscort.php:1624
 msgid "You must login to access this page."
 msgstr "You must login to access this page."
 
-#: classes/GemsEscort.php:1753
-#: classes/GemsEscort.php:1755
+#: classes/GemsEscort.php:1765
+#: classes/GemsEscort.php:1767
 #, php-format
 msgid "%d survey"
 msgid_plural "%d surveys"
@@ -453,94 +457,94 @@
 msgid "Trying upgrade for %s to level %s: %s"
 msgstr "Trying upgrade for %s to level %s: %s"
 
-#: classes/Gems/Controller/BrowseEditAction.php:355
+#: classes/Gems/Controller/BrowseEditAction.php:356
 #, php-format
 msgid "New %s..."
 msgstr "New %s..."
 
-#: classes/Gems/Controller/BrowseEditAction.php:388
+#: classes/Gems/Controller/BrowseEditAction.php:389
 #, php-format
 msgid "Delete %s"
 msgstr "Delete %s"
 
-#: classes/Gems/Controller/BrowseEditAction.php:392
+#: classes/Gems/Controller/BrowseEditAction.php:393
 #, php-format
 msgid "%2$u %1$s deleted"
 msgstr "%2$u %1$s deleted"
 
-#: classes/Gems/Controller/BrowseEditAction.php:409
+#: classes/Gems/Controller/BrowseEditAction.php:410
 #, php-format
 msgid "Edit %s %s"
 msgstr "Edit %s %s"
 
-#: classes/Gems/Controller/BrowseEditAction.php:411
+#: classes/Gems/Controller/BrowseEditAction.php:412
 #, php-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: classes/Gems/Controller/BrowseEditAction.php:509
+#: classes/Gems/Controller/BrowseEditAction.php:513
 msgid "Free search text"
 msgstr "Free search text"
 
-#: classes/Gems/Controller/BrowseEditAction.php:580
+#: classes/Gems/Controller/BrowseEditAction.php:584
 msgid "Search"
 msgstr "Search"
 
-#: classes/Gems/Controller/BrowseEditAction.php:596
+#: classes/Gems/Controller/BrowseEditAction.php:600
 #, php-format
 msgid "No %s found"
 msgstr "No %s found"
 
-#: classes/Gems/Controller/BrowseEditAction.php:680
+#: classes/Gems/Controller/BrowseEditAction.php:684
 #, php-format
 msgid "No %s found."
 msgstr "No %s found."
 
-#: classes/Gems/Controller/BrowseEditAction.php:798
+#: classes/Gems/Controller/BrowseEditAction.php:802
 msgid "Are you sure?"
 msgstr "Are you sure?"
 
-#: classes/Gems/Controller/BrowseEditAction.php:814
+#: classes/Gems/Controller/BrowseEditAction.php:818
 msgid "Yes"
 msgstr "Yes"
 
-#: classes/Gems/Controller/BrowseEditAction.php:815
+#: classes/Gems/Controller/BrowseEditAction.php:819
 msgid "No"
 msgstr "No"
 
-#: classes/Gems/Controller/BrowseEditAction.php:868
+#: classes/Gems/Controller/BrowseEditAction.php:872
 #, php-format
 msgid "Unknown %s requested"
 msgstr "Unknown %s requested"
 
-#: classes/Gems/Controller/BrowseEditAction.php:891
+#: classes/Gems/Controller/BrowseEditAction.php:895
 #, php-format
 msgid "New %1$s..."
 msgstr "New %1$s..."
 
-#: classes/Gems/Controller/BrowseEditAction.php:899
+#: classes/Gems/Controller/BrowseEditAction.php:903
 msgid "Save"
 msgstr "Save"
 
-#: classes/Gems/Controller/BrowseEditAction.php:935
+#: classes/Gems/Controller/BrowseEditAction.php:939
 #, php-format
 msgid "%2$u %1$s saved"
 msgstr "%2$u %1$s saved"
 
-#: classes/Gems/Controller/BrowseEditAction.php:938
+#: classes/Gems/Controller/BrowseEditAction.php:942
 msgid "No changes to save."
 msgstr "No changes to save."
 
-#: classes/Gems/Controller/BrowseEditAction.php:947
+#: classes/Gems/Controller/BrowseEditAction.php:951
 msgid "Input error! No changes saved!"
 msgstr "Input error! No changes saved!"
 
-#: classes/Gems/Controller/BrowseEditAction.php:975
+#: classes/Gems/Controller/BrowseEditAction.php:979
 #, php-format
 msgid "Show %s"
 msgstr "Show %s"
 
-#: classes/Gems/Controller/BrowseEditAction.php:982
+#: classes/Gems/Controller/BrowseEditAction.php:986
 #, php-format
 msgid "Unknown %s."
 msgstr "Unknown %s."
@@ -550,26 +554,26 @@
 msgid "Cancel"
 msgstr "Cancel"
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:238
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:249
 #, php-format
 msgid "Do you want to delete this %s?"
 msgstr "Do you want to delete this %s?"
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:271
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:282
 msgid "No data found."
 msgstr "No data found."
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:333
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:344
 #, php-format
 msgid "No %s found..."
 msgstr "No %s found..."
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:343
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:354
 #, php-format
 msgid "Showing %s"
 msgstr "Showing %s"
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:379
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:390
 msgid "item"
 msgid_plural "items"
 msgstr[0] "item"
@@ -982,16 +986,16 @@
 msgid "Export data"
 msgstr "Export data"
 
-#: classes/Gems/Default/ExportAction.php:153
+#: classes/Gems/Default/ExportAction.php:152
 msgid "Survey"
 msgstr "Survey"
 
-#: classes/Gems/Default/ExportAction.php:168
+#: classes/Gems/Default/ExportAction.php:167
 #, php-format
 msgid "%s records found."
 msgstr "%s records found."
 
-#: classes/Gems/Default/ExportAction.php:181
+#: classes/Gems/Default/ExportAction.php:180
 msgid "Export to"
 msgstr "Export to"
 
@@ -1419,7 +1423,7 @@
 msgstr "Email servers"
 
 #: classes/Gems/Default/MailTemplateAction.php:76
-#: classes/Gems/Default/RespondentAction.php:372
+#: classes/Gems/Default/RespondentAction.php:338
 msgid "(all organizations)"
 msgstr "(all organizations)"
 
@@ -1443,7 +1447,7 @@
 
 #: classes/Gems/Default/OptionAction.php:136
 #: classes/Gems/Default/OrganizationAction.php:135
-#: classes/Gems/Default/RespondentAction.php:220
+#: classes/Gems/Default/RespondentAction.php:186
 msgid "Language"
 msgstr "Language"
 
@@ -1820,112 +1824,102 @@
 msgstr[0] "reception code"
 msgstr[1] "reception codes"
 
-#: classes/Gems/Default/RespondentAction.php:76
-#: classes/Gems/Default/RespondentExportAction.php:71
-msgid "Group surveys"
-msgstr "Group surveys"
-
-#: classes/Gems/Default/RespondentAction.php:81
-#: classes/Gems/Default/RespondentExportAction.php:76
-msgid "Output format"
-msgstr "Output format"
-
-#: classes/Gems/Default/RespondentAction.php:159
+#: classes/Gems/Default/RespondentAction.php:125
 #, php-format
 msgid "Random Example BSN: %s"
 msgstr "Random Example BSN: %s"
 
-#: classes/Gems/Default/RespondentAction.php:161
+#: classes/Gems/Default/RespondentAction.php:127
 msgid "Enter a 9-digit SSN number."
 msgstr "Enter a 9-digit BSN number."
 
-#: classes/Gems/Default/RespondentAction.php:168
+#: classes/Gems/Default/RespondentAction.php:134
 msgid "Identification"
 msgstr "Identification"
 
-#: classes/Gems/Default/RespondentAction.php:179
+#: classes/Gems/Default/RespondentAction.php:145
 msgid "SSN"
 msgstr "BSN"
 
-#: classes/Gems/Default/RespondentAction.php:183
+#: classes/Gems/Default/RespondentAction.php:149
 msgid "Patient number"
 msgstr "Patient number"
 
-#: classes/Gems/Default/RespondentAction.php:192
+#: classes/Gems/Default/RespondentAction.php:158
 msgid "Medical data"
 msgstr "Medical data"
 
-#: classes/Gems/Default/RespondentAction.php:199
+#: classes/Gems/Default/RespondentAction.php:165
 msgid "DBC's, etc..."
 msgstr "DBC's, etc..."
 
-#: classes/Gems/Default/RespondentAction.php:202
+#: classes/Gems/Default/RespondentAction.php:168
 msgid "Contact information"
 msgstr "Contact information"
 
-#: classes/Gems/Default/RespondentAction.php:207
+#: classes/Gems/Default/RespondentAction.php:173
 msgid "Respondent has no e-mail"
 msgstr "Patient has no e-mail"
 
-#: classes/Gems/Default/RespondentAction.php:208
+#: classes/Gems/Default/RespondentAction.php:174
 msgid "With housenumber"
 msgstr "With housenumber"
 
-#: classes/Gems/Default/RespondentAction.php:215
+#: classes/Gems/Default/RespondentAction.php:181
 msgid "Country"
 msgstr "Country"
 
-#: classes/Gems/Default/RespondentAction.php:219
+#: classes/Gems/Default/RespondentAction.php:185
 msgid "Settings"
 msgstr "Settings"
 
-#: classes/Gems/Default/RespondentAction.php:221
+#: classes/Gems/Default/RespondentAction.php:187
 msgid "Has the respondent signed the informed consent letter?"
 msgstr "Has the patient signed the informed consent letter?"
 
-#: classes/Gems/Default/RespondentAction.php:251
+#: classes/Gems/Default/RespondentAction.php:217
 msgid "Comments"
 msgstr "Comments"
 
-#: classes/Gems/Default/RespondentAction.php:252
+#: classes/Gems/Default/RespondentAction.php:218
 msgid "Treatment"
 msgstr "Treatment"
 
-#: classes/Gems/Default/RespondentAction.php:280
+#: classes/Gems/Default/RespondentAction.php:246
 msgid "Rejection code"
 msgstr "Rejection code"
 
-#: classes/Gems/Default/RespondentAction.php:287
+#: classes/Gems/Default/RespondentAction.php:253
 msgid "Delete respondent"
 msgstr "Delete patient"
 
-#: classes/Gems/Default/RespondentAction.php:319
+#: classes/Gems/Default/RespondentAction.php:285
 msgid "Respondent deleted."
 msgstr "Patient deleted"
 
-#: classes/Gems/Default/RespondentAction.php:323
+#: classes/Gems/Default/RespondentAction.php:289
 msgid "Respondent tracks stopped."
 msgstr "Patient tracks stopped."
 
-#: classes/Gems/Default/RespondentAction.php:327
+#: classes/Gems/Default/RespondentAction.php:293
 msgid "Choose a reception code to delete."
 msgstr "Choose a reception code to delete."
 
-#: classes/Gems/Default/RespondentAction.php:421
+#: classes/Gems/Default/RespondentAction.php:387
 msgid "respondent"
 msgid_plural "respondents"
 msgstr[0] "patient"
 msgstr[1] "patients"
 
-#: classes/Gems/Default/RespondentAction.php:496
+#: classes/Gems/Default/RespondentAction.php:462
 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:61
+#: classes/Gems/Default/RespondentExportAction.php:54
 msgid "Respondent number"
 msgstr "Patient number"
 
-#: classes/Gems/Default/RespondentExportAction.php:65
+#: classes/Gems/Default/RespondentExportAction.php:56
 msgid "Separate multiple respondents with a comma (,)"
 msgstr "Separate multiple respondents with a comma (,)"
 
@@ -1949,52 +1943,65 @@
 msgid "Respondent planning"
 msgstr "Patient planning"
 
-#: classes/Gems/Default/RoleAction.php:94
-#: classes/Gems/Default/RoleAction.php:242
+#: classes/Gems/Default/RoleAction.php:97
+msgid "child of current role"
+msgstr "child of current role"
+
+#: classes/Gems/Default/RoleAction.php:105
+#, php-format
+msgid "inherited from %s"
+msgstr "inherited from %s"
+
+#: classes/Gems/Default/RoleAction.php:113
+msgid "this role"
+msgstr "this role"
+
+#: classes/Gems/Default/RoleAction.php:144
+#: classes/Gems/Default/RoleAction.php:302
 msgid "Inherited"
 msgstr "Inherited"
 
-#: classes/Gems/Default/RoleAction.php:156
+#: classes/Gems/Default/RoleAction.php:209
 msgid "Illegal name"
 msgstr "Illegal name"
 
-#: classes/Gems/Default/RoleAction.php:180
-#: classes/Gems/Default/RoleAction.php:239
+#: classes/Gems/Default/RoleAction.php:233
+#: classes/Gems/Default/RoleAction.php:299
 msgid "Parents"
 msgstr "Parents"
 
-#: classes/Gems/Default/RoleAction.php:195
+#: classes/Gems/Default/RoleAction.php:255
 msgid "Editing `master` is not allowed"
 msgstr "Editing `master` is not allowed"
 
-#: classes/Gems/Default/RoleAction.php:213
+#: classes/Gems/Default/RoleAction.php:273
 msgid "role"
 msgid_plural "roles"
 msgstr[0] "role"
 msgstr[1] "roles"
 
-#: classes/Gems/Default/RoleAction.php:218
+#: classes/Gems/Default/RoleAction.php:278
 msgid "Administrative roles"
 msgstr "Administrative roles"
 
-#: classes/Gems/Default/RoleAction.php:240
-#: classes/Gems/Default/RoleAction.php:258
+#: classes/Gems/Default/RoleAction.php:300
+#: classes/Gems/Default/RoleAction.php:318
 msgid "Allowed"
 msgstr "Allowed"
 
-#: classes/Gems/Default/RoleAction.php:247
+#: classes/Gems/Default/RoleAction.php:307
 msgid "Project role overview"
 msgstr "Project role overview"
 
-#: classes/Gems/Default/RoleAction.php:257
+#: classes/Gems/Default/RoleAction.php:317
 msgid "Privilege"
 msgstr "Privilege"
 
-#: classes/Gems/Default/RoleAction.php:259
+#: classes/Gems/Default/RoleAction.php:319
 msgid "Denied"
 msgstr "Denied"
 
-#: classes/Gems/Default/RoleAction.php:263
+#: classes/Gems/Default/RoleAction.php:323
 msgid "Project privileges"
 msgstr "Project privileges"
 
@@ -2199,107 +2206,107 @@
 msgid "If empty, survey will never show up!"
 msgstr "If empty, survey will never show up!"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:129
+#: classes/Gems/Default/SurveyMaintenanceAction.php:130
 msgid "Upload new PDF"
 msgstr "Upload new PDF"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:137
+#: classes/Gems/Default/SurveyMaintenanceAction.php:138
 msgid "Usage"
 msgstr "Usage"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:152
+#: classes/Gems/Default/SurveyMaintenanceAction.php:153
 msgid "Single Survey Assignment"
 msgstr "Single Survey Assignment"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:197
+#: classes/Gems/Default/SurveyMaintenanceAction.php:198
 msgid "Assignable since"
 msgstr "Assignable since"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:198
+#: classes/Gems/Default/SurveyMaintenanceAction.php:199
 msgid "Assignable until"
 msgstr "Assignable until"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:204
+#: classes/Gems/Default/SurveyMaintenanceAction.php:205
 msgid "Create Single Survey"
 msgstr "Create Single Survey"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:208
+#: classes/Gems/Default/SurveyMaintenanceAction.php:209
 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:263
+#: classes/Gems/Default/SurveyMaintenanceAction.php:264
 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:280
+#: classes/Gems/Default/SurveyMaintenanceAction.php:281
 #, php-format
 msgid "Checking survey results for the %s survey."
 msgstr "Checking survey results for the %s survey."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:292
+#: classes/Gems/Default/SurveyMaintenanceAction.php:293
 msgid "Checking survey results for all surveys."
 msgstr "Checking survey results for all surveys."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:349
+#: classes/Gems/Default/SurveyMaintenanceAction.php:350
 msgid "OK"
 msgstr "OK"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:356
+#: classes/Gems/Default/SurveyMaintenanceAction.php:357
 msgid "Source"
 msgstr "Source"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:357
+#: classes/Gems/Default/SurveyMaintenanceAction.php:358
 msgid "Status in source"
 msgstr "Status in source"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:360
+#: classes/Gems/Default/SurveyMaintenanceAction.php:361
 msgid "Active in source"
 msgstr "Active in source"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:361
+#: classes/Gems/Default/SurveyMaintenanceAction.php:362
 #, php-format
 msgid "Active in %s"
 msgstr "Active in %s"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:368
+#: classes/Gems/Default/SurveyMaintenanceAction.php:369
 msgid "Single"
 msgstr "Single"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:377
+#: classes/Gems/Default/SurveyMaintenanceAction.php:378
 msgid "Result field"
 msgstr "Result field"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:378
+#: classes/Gems/Default/SurveyMaintenanceAction.php:379
 msgid "Duration description"
 msgstr "Duration description"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:378
+#: classes/Gems/Default/SurveyMaintenanceAction.php:379
 msgid "Text to inform the respondent."
 msgstr "Text to inform the respondent."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:379
+#: classes/Gems/Default/SurveyMaintenanceAction.php:383
 msgid "Before answering"
 msgstr "Before answering"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:380
+#: classes/Gems/Default/SurveyMaintenanceAction.php:384
 msgid "After completion"
 msgstr "After completion"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:410
+#: classes/Gems/Default/SurveyMaintenanceAction.php:414
 #, php-format
 msgid "%d times in track."
 msgstr "%d times in track."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:412
+#: classes/Gems/Default/SurveyMaintenanceAction.php:416
 #, php-format
 msgid "%d times in %d track(s)."
 msgstr "%d times in %d track(s)."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:416
+#: classes/Gems/Default/SurveyMaintenanceAction.php:420
 msgid "Not used in track."
 msgstr "Not used in track."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:418
+#: classes/Gems/Default/SurveyMaintenanceAction.php:422
 msgid "Not used in tracks."
 msgstr "Not used in tracks."
 
@@ -2781,138 +2788,146 @@
 msgid "Format answers"
 msgstr "Format answers"
 
-#: classes/Gems/Export/RespondentExport.php:128
+#: classes/Gems/Export/RespondentExport.php:130
 #, php-format
-msgid "Unable to run PDF conversion: \"%s\""
-msgstr "Unable to run PDF conversion: \"%s\""
+msgid "Unable to run PDF conversion (%s): \"%s\""
+msgstr "Unable to run PDF conversion (%s): \"%s\""
 
-#: classes/Gems/Export/RespondentExport.php:193
+#: classes/Gems/Export/RespondentExport.php:200
 msgid "Single Survey"
 msgstr "Single Survey"
 
-#: classes/Gems/Export/RespondentExport.php:254
+#: classes/Gems/Export/RespondentExport.php:261
 msgid "Track information"
 msgstr "Track information"
 
-#: classes/Gems/Export/Spss.php:59
+#: classes/Gems/Export/RespondentExport.php:324
+msgid "Group surveys"
+msgstr "Group surveys"
+
+#: classes/Gems/Export/RespondentExport.php:329
+msgid "Output format"
+msgstr "Output format"
+
+#: classes/Gems/Export/Spss.php:80
 msgid "Which file"
 msgstr "Which file"
 
-#: classes/Gems/Export/Spss.php:60
+#: classes/Gems/Export/Spss.php:81
 msgid "syntax"
 msgstr "syntax"
 
-#: classes/Gems/Export/Spss.php:61
+#: classes/Gems/Export/Spss.php:82
 msgid "data"
 msgstr "data"
 
-#: classes/Gems/Export/Spss.php:66
+#: classes/Gems/Export/Spss.php:86
 msgid "Some help for this export"
 msgstr "Some help for this export"
 
-#: classes/Gems/Menu/MenuAbstract.php:250
+#: classes/Gems/Menu/MenuAbstract.php:267
 msgid "Activity log"
 msgstr "Activity Log"
 
-#: classes/Gems/Menu/MenuAbstract.php:256
+#: classes/Gems/Menu/MenuAbstract.php:273
 msgid "Automatic mail"
 msgstr "Automatic mail"
 
-#: classes/Gems/Menu/MenuAbstract.php:257
+#: classes/Gems/Menu/MenuAbstract.php:274
 msgid "Turn Automatic Mail Jobs OFF"
 msgstr "Turn Automatic Mail Jobs OFF"
 
-#: classes/Gems/Menu/MenuAbstract.php:261
+#: classes/Gems/Menu/MenuAbstract.php:278
 msgid "Servers"
 msgstr "Servers"
 
-#: classes/Gems/Menu/MenuAbstract.php:265
+#: classes/Gems/Menu/MenuAbstract.php:282
 msgid "Templates"
 msgstr "Templates"
 
-#: classes/Gems/Menu/MenuAbstract.php:297
+#: classes/Gems/Menu/MenuAbstract.php:314
 msgid "By period"
 msgstr "By period"
 
-#: classes/Gems/Menu/MenuAbstract.php:298
+#: classes/Gems/Menu/MenuAbstract.php:315
 msgid "By token"
 msgstr "By token"
 
-#: classes/Gems/Menu/MenuAbstract.php:299
+#: classes/Gems/Menu/MenuAbstract.php:316
 msgid "By respondent"
 msgstr "By patient"
 
-#: classes/Gems/Menu/MenuAbstract.php:303
+#: classes/Gems/Menu/MenuAbstract.php:320
 msgid "Bulk mail"
 msgstr "Bulk mail"
 
-#: classes/Gems/Menu/MenuAbstract.php:321
+#: classes/Gems/Menu/MenuAbstract.php:338
 msgid "Errors"
 msgstr "Errors"
 
-#: classes/Gems/Menu/MenuAbstract.php:322
+#: classes/Gems/Menu/MenuAbstract.php:339
 msgid "PHP"
 msgstr "PHP"
 
-#: classes/Gems/Menu/MenuAbstract.php:325
+#: classes/Gems/Menu/MenuAbstract.php:342
 msgid "Maintenance mode"
 msgstr "Maintenance mode"
 
-#: classes/Gems/Menu/MenuAbstract.php:326
+#: classes/Gems/Menu/MenuAbstract.php:343
 msgid "Clean cache"
 msgstr "Clean cache"
 
-#: classes/Gems/Menu/MenuAbstract.php:393
+#: classes/Gems/Menu/MenuAbstract.php:410
 msgid "Reset password"
 msgstr "Reset password"
 
-#: classes/Gems/Menu/MenuAbstract.php:419
+#: classes/Gems/Menu/MenuAbstract.php:437
 msgid "Check status"
 msgstr "Check status"
 
-#: classes/Gems/Menu/MenuAbstract.php:420
+#: classes/Gems/Menu/MenuAbstract.php:438
 msgid "Synchronize surveys"
 msgstr "Synchronize surveys"
 
-#: classes/Gems/Menu/MenuAbstract.php:421
-#: classes/Gems/Menu/MenuAbstract.php:433
+#: classes/Gems/Menu/MenuAbstract.php:439
+#: classes/Gems/Menu/MenuAbstract.php:451
 msgid "Check is answered"
 msgstr "Check is answered"
 
-#: classes/Gems/Menu/MenuAbstract.php:422
+#: classes/Gems/Menu/MenuAbstract.php:440
 msgid "Check attributes"
 msgstr "Check attributes"
 
-#: classes/Gems/Menu/MenuAbstract.php:423
+#: classes/Gems/Menu/MenuAbstract.php:441
 msgid "Synchronize all surveys"
 msgstr "Synchronize all surveys"
 
-#: classes/Gems/Menu/MenuAbstract.php:424
-#: classes/Gems/Menu/MenuAbstract.php:434
+#: classes/Gems/Menu/MenuAbstract.php:442
+#: classes/Gems/Menu/MenuAbstract.php:452
 msgid "Check all is answered"
 msgstr "Check all is answered"
 
-#: classes/Gems/Menu/MenuAbstract.php:430
+#: classes/Gems/Menu/MenuAbstract.php:448
 msgid "PDF"
 msgstr "PDF"
 
-#: classes/Gems/Menu/MenuAbstract.php:464
+#: classes/Gems/Menu/MenuAbstract.php:482
 msgid "Check assignments"
 msgstr "Check assignments"
 
-#: classes/Gems/Menu/MenuAbstract.php:467
+#: classes/Gems/Menu/MenuAbstract.php:485
 msgid "Check all assignments"
 msgstr "Check all assignments"
 
-#: classes/Gems/Menu/SubMenuItem.php:410
+#: classes/Gems/Menu/SubMenuItem.php:382
 msgid "New"
 msgstr "New"
 
-#: classes/Gems/Menu/SubMenuItem.php:464
+#: classes/Gems/Menu/SubMenuItem.php:436
 msgid "Export the current data set to Excel"
 msgstr "Export the current data set to Excel"
 
-#: classes/Gems/Menu/SubMenuItem.php:468
+#: classes/Gems/Menu/SubMenuItem.php:440
 msgid "Excel export"
 msgstr "Excel export"
 
@@ -3859,6 +3874,14 @@
 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:370
+msgid "inactive"
+msgstr "inactive"
+
+#: classes/Gems/Util/DbLookup.php:371
+msgid "source inactive"
+msgstr "source inactive"
+
 #: classes/Gems/Util/ReceptionCodeLibrary.php:100
 msgid "Yes (forget answers)"
 msgstr "Yes (forget answers)"
@@ -4196,6 +4219,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-07-13 11:32:36 UTC (rev 843)
+++ trunk/library/languages/default-nl.po	2012-07-13 13:43:15 UTC (rev 844)
@@ -2,9 +2,9 @@
 msgstr ""
 "Project-Id-Version: GemsTracker NL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-28 12:07+0100\n"
+"POT-Creation-Date: 2012-07-13 14:42+0100\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Matijs de Jong <mj...@ma...>\n"
+"Last-Translator: Menno Dekker <men...@er...>\n"
 "Language-Team: Erasmus MGZ <mat...@ma...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,77 +18,81 @@
 "X-Poedit-KeywordsList: plural:1,2\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: classes/GemsEscort.php:214
+#: classes/GemsEscort.php:215
 #, php-format
 msgid "Path %s not writable"
 msgstr "Path %s niet schrijfbaar"
 
-#: classes/GemsEscort.php:776
+#: classes/GemsEscort.php:597
+msgid " > "
+msgstr " | "
+
+#: classes/GemsEscort.php:788
 #, php-format
 msgid "You are logged in as %s"
 msgstr "Ingelogd als %s"
 
-#: classes/GemsEscort.php:778
+#: classes/GemsEscort.php:790
 #: classes/Gems/Menu.php:249
 msgid "Logoff"
 msgstr "Uitloggen"
 
-#: classes/GemsEscort.php:781
+#: classes/GemsEscort.php:793
 msgid "You are not logged in"
 msgstr "U bent niet ingelogd"
 
-#: classes/GemsEscort.php:968
+#: classes/GemsEscort.php:980
 #, php-format
 msgid "User: %s"
 msgstr "Login: %s"
 
-#: classes/GemsEscort.php:993
+#: classes/GemsEscort.php:1005
 msgid "version"
 msgstr "versie"
 
-#: classes/GemsEscort.php:1435
+#: classes/GemsEscort.php:1447
 msgid "Take note: your session has expired, your inputs were not saved. Please check the input data and try again"
 msgstr "Let op: uw sessie is verlopen, uw invoer is niet opgeslagen. Controleer uw gegevens en probeer a.u.b. opnieuw."
 
-#: classes/GemsEscort.php:1564
+#: classes/GemsEscort.php:1576
 msgid "Please check back later."
 msgstr "Probeer het later opnieuw."
 
-#: classes/GemsEscort.php:1566
-#: classes/GemsEscort.php:1570
-#: classes/GemsEscort.php:1571
+#: classes/GemsEscort.php:1578
+#: classes/GemsEscort.php:1582
+#: classes/GemsEscort.php:1583
 msgid "System is in maintenance mode"
 msgstr "Systeem is in onderhoudsmodus"
 
-#: classes/GemsEscort.php:1581
+#: classes/GemsEscort.php:1593
 msgid "No access to site."
 msgstr "Geen toegang tot website."
 
-#: classes/GemsEscort.php:1583
-#: classes/GemsEscort.php:1626
+#: classes/GemsEscort.php:1595
+#: classes/GemsEscort.php:1638
 msgid "You have no access to this site."
 msgstr "U heeft geen toegang tot deze website."
 
-#: classes/GemsEscort.php:1599
+#: classes/GemsEscort.php:1611
 msgid "No access to page"
 msgstr "Geen toegang tot pagina"
 
-#: classes/GemsEscort.php:1601
+#: classes/GemsEscort.php:1613
 #, php-format
 msgid "Access to this page is not allowed for current role: %s."
 msgstr "U heeft geen toegang tot deze pagina. Uw huidige rol is: %s."
 
-#: classes/GemsEscort.php:1611
-#: classes/GemsEscort.php:1624
+#: classes/GemsEscort.php:1623
+#: classes/GemsEscort.php:1636
 msgid "You are no longer logged in."
 msgstr "U bent niet meer ingelogd."
 
-#: classes/GemsEscort.php:1612
+#: classes/GemsEscort.php:1624
 msgid "You must login to access this page."
 msgstr "U moet ingelogd zijn voor toegang tot deze pagina."
 
-#: classes/GemsEscort.php:1753
-#: classes/GemsEscort.php:1755
+#: classes/GemsEscort.php:1765
+#: classes/GemsEscort.php:1767
 #, php-format
 msgid "%d survey"
 msgid_plural "%d surveys"
@@ -453,94 +457,94 @@
 msgid "Trying upgrade for %s to level %s: %s"
 msgstr "Probeert upgrade voor %s naar niveau %s: %s"
 
-#: classes/Gems/Controller/BrowseEditAction.php:355
+#: classes/Gems/Controller/BrowseEditAction.php:356
 #, php-format
 msgid "New %s..."
 msgstr "Nieuwe %s..."
 
-#: classes/Gems/Controller/BrowseEditAction.php:388
+#: classes/Gems/Controller/BrowseEditAction.php:389
 #, php-format
 msgid "Delete %s"
 msgstr "Verwijder %s"
 
-#: classes/Gems/Controller/BrowseEditAction.php:392
+#: classes/Gems/Controller/BrowseEditAction.php:393
 #, php-format
 msgid "%2$u %1$s deleted"
 msgstr "%2$u %1$s verwijderd"
 
-#: classes/Gems/Controller/BrowseEditAction.php:409
+#: classes/Gems/Controller/BrowseEditAction.php:410
 #, php-format
 msgid "Edit %s %s"
 msgstr "Bewerk %s %s"
 
-#: classes/Gems/Controller/BrowseEditAction.php:411
+#: classes/Gems/Controller/BrowseEditAction.php:412
 #, php-format
 msgid "Edit %s"
 msgstr "Bewerk %s"
 
-#: classes/Gems/Controller/BrowseEditAction.php:509
+#: classes/Gems/Controller/BrowseEditAction.php:513
 msgid "Free search text"
 msgstr "Vrije zoek tekst"
 
-#: classes/Gems/Controller/BrowseEditAction.php:580
+#: classes/Gems/Controller/BrowseEditAction.php:584
 msgid "Search"
 msgstr "Zoeken"
 
-#: classes/Gems/Controller/BrowseEditAction.php:596
+#: classes/Gems/Controller/BrowseEditAction.php:600
 #, php-format
 msgid "No %s found"
 msgstr "Geen %s gevonden"
 
-#: classes/Gems/Controller/BrowseEditAction.php:680
+#: classes/Gems/Controller/BrowseEditAction.php:684
 #, php-format
 msgid "No %s found."
 msgstr "Geen %s gevonden."
 
-#: classes/Gems/Controller/BrowseEditAction.php:798
+#: classes/Gems/Controller/BrowseEditAction.php:802
 msgid "Are you sure?"
 msgstr "Weet u het zeker?"
 
-#: classes/Gems/Controller/BrowseEditAction.php:814
+#: classes/Gems/Controller/BrowseEditAction.php:818
 msgid "Yes"
 msgstr "Ja"
 
-#: classes/Gems/Controller/BrowseEditAction.php:815
+#: classes/Gems/Controller/BrowseEditAction.php:819
 msgid "No"
 msgstr "Nee"
 
-#: classes/Gems/Controller/BrowseEditAction.php:868
+#: classes/Gems/Controller/BrowseEditAction.php:872
 #, php-format
 msgid "Unknown %s requested"
 msgstr "Onjuist %s verzoek"
 
-#: classes/Gems/Controller/BrowseEditAction.php:891
+#: classes/Gems/Controller/BrowseEditAction.php:895
 #, php-format
 msgid "New %1$s..."
 msgstr "Nieuwe %1$s..."
 
-#: classes/Gems/Controller/BrowseEditAction.php:899
+#: classes/Gems/Controller/BrowseEditAction.php:903
 msgid "Save"
 msgstr "Opslaan"
 
-#: classes/Gems/Controller/BrowseEditAction.php:935
+#: classes/Gems/Controller/BrowseEditAction.php:939
 #, php-format
 msgid "%2$u %1$s saved"
 msgstr "%2$u %1$s opgeslagen"
 
-#: classes/Gems/Controller/BrowseEditAction.php:938
+#: classes/Gems/Controller/BrowseEditAction.php:942
 msgid "No changes to save."
 msgstr "Geen verandering om op te slaan."
 
-#: classes/Gems/Controller/BrowseEditAction.php:947
+#: classes/Gems/Controller/BrowseEditAction.php:951
 msgid "Input error! No changes saved!"
 msgstr "Invoer fout! Veranderingen niet opgeslagen!"
 
-#: classes/Gems/Controller/BrowseEditAction.php:975
+#: classes/Gems/Controller/BrowseEditAction.php:979
 #, php-format
 msgid "Show %s"
 msgstr "Toon %s"
 
-#: classes/Gems/Controller/BrowseEditAction.php:982
+#: classes/Gems/Controller/BrowseEditAction.php:986
 #, php-format
 msgid "Unknown %s."
 msgstr "%s is onbekend."
@@ -550,26 +554,26 @@
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:238
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:249
 #, php-format
 msgid "Do you want to delete this %s?"
 msgstr "Weet u zeker dat deze %s verwijderd moet worden?"
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:271
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:282
 msgid "No data found."
 msgstr "Geen gegevens gevonden."
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:333
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:344
 #, php-format
 msgid "No %s found..."
 msgstr "Geen %s gevonden..."
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:343
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:354
 #, php-format
 msgid "Showing %s"
 msgstr "Toon %s"
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:379
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:390
 msgid "item"
 msgid_plural "items"
 msgstr[0] "item"
@@ -908,7 +912,7 @@
 #: classes/Gems/Default/DatabaseAction.php:474
 #, php-format
 msgid "Finished %s creation script for object %d of %d"
-msgstr "Klaar %s met aanmaak script voor object %d van %d"
+msgstr "Klaar met %s aanmaak script voor object %d van %d"
 
 #: classes/Gems/Default/DatabaseAction.php:479
 msgid "All objects exist. Nothing was executed."
@@ -982,16 +986,16 @@
 msgid "Export data"
 msgstr "Exporteer gegevens"
 
-#: classes/Gems/Default/ExportAction.php:153
+#: classes/Gems/Default/ExportAction.php:152
 msgid "Survey"
 msgstr "Vragenlijst"
 
-#: classes/Gems/Default/ExportAction.php:168
+#: classes/Gems/Default/ExportAction.php:167
 #, php-format
 msgid "%s records found."
 msgstr "%s records gevonden."
 
-#: classes/Gems/Default/ExportAction.php:181
+#: classes/Gems/Default/ExportAction.php:180
 msgid "Export to"
 msgstr "Exporteer naar"
 
@@ -1419,7 +1423,7 @@
 msgstr "Email servers"
 
 #: classes/Gems/Default/MailTemplateAction.php:76
-#: classes/Gems/Default/RespondentAction.php:372
+#: classes/Gems/Default/RespondentAction.php:338
 msgid "(all organizations)"
 msgstr "(alle organisaties)"
 
@@ -1443,7 +1447,7 @@
 
 #: classes/Gems/Default/OptionAction.php:136
 #: classes/Gems/Default/OrganizationAction.php:135
-#: classes/Gems/Default/RespondentAction.php:220
+#: classes/Gems/Default/RespondentAction.php:186
 msgid "Language"
 msgstr "Taal"
 
@@ -1820,112 +1824,102 @@
 msgstr[0] "Ontvangst code"
 msgstr[1] "Ontvangst code"
 
-#: classes/Gems/Default/RespondentAction.php:76
-#: classes/Gems/Default/RespondentExportAction.php:71
-msgid "Group surveys"
-msgstr "Groepeer vragenlijsten"
-
-#: classes/Gems/Default/RespondentAction.php:81
-#: classes/Gems/Default/RespondentExportAction.php:76
-msgid "Output format"
-msgstr "Uitvoerformaat"
-
-#: classes/Gems/Default/RespondentAction.php:159
+#: classes/Gems/Default/RespondentAction.php:125
 #, php-format
 msgid "Random Example BSN: %s"
 msgstr "Willekeurig voorbeeld BSN: %s"
 
-#: classes/Gems/Default/RespondentAction.php:161
+#: classes/Gems/Default/RespondentAction.php:127
 msgid "Enter a 9-digit SSN number."
 msgstr "Voer een BSN nummer van 9 cijfers in."
 
-#: classes/Gems/Default/RespondentAction.php:168
+#: classes/Gems/Default/RespondentAction.php:134
 msgid "Identification"
 msgstr "Identificatie"
 
-#: classes/Gems/Default/RespondentAction.php:179
+#: classes/Gems/Default/RespondentAction.php:145
 msgid "SSN"
 msgstr "SSN"
 
-#: classes/Gems/Default/RespondentAction.php:183
+#: classes/Gems/Default/RespondentAction.php:149
 msgid "Patient number"
 msgstr "Patiënt nummer"
 
-#: classes/Gems/Default/RespondentAction.php:192
+#: classes/Gems/Default/RespondentAction.php:158
 msgid "Medical data"
 msgstr "Medische gegevens"
 
-#: classes/Gems/Default/RespondentAction.php:199
+#: classes/Gems/Default/RespondentAction.php:165
 msgid "DBC's, etc..."
 msgstr "DBC's, etc..."
 
-#: classes/Gems/Default/RespondentAction.php:202
+#: classes/Gems/Default/RespondentAction.php:168
 msgid "Contact information"
 msgstr "Contact informatie"
 
-#: classes/Gems/Default/RespondentAction.php:207
+#: classes/Gems/Default/RespondentAction.php:173
 msgid "Respondent has no e-mail"
 msgstr "Patiënt zonder email"
 
-#: classes/Gems/Default/RespondentAction.php:208
+#: classes/Gems/Default/RespondentAction.php:174
 msgid "With housenumber"
 msgstr "Met huisnummer"
 
-#: classes/Gems/Default/RespondentAction.php:215
+#: classes/Gems/Default/RespondentAction.php:181
 msgid "Country"
 msgstr "Land"
 
-#: classes/Gems/Default/RespondentAction.php:219
+#: classes/Gems/Default/RespondentAction.php:185
 msgid "Settings"
 msgstr "Instellingen"
 
-#: classes/Gems/Default/RespondentAction.php:221
+#: classes/Gems/Default/RespondentAction.php:187
 msgid "Has the respondent signed the informed consent letter?"
 msgstr "Heeft de patiënt het \"informed consent\" formulier ondertekend?"
 
-#: classes/Gems/Default/RespondentAction.php:251
+#: classes/Gems/Default/RespondentAction.php:217
 msgid "Comments"
 msgstr "Opmerkingen"
 
-#: classes/Gems/Default/RespondentAction.php:252
+#: classes/Gems/Default/RespondentAction.php:218
 msgid "Treatment"
 msgstr "Behandeling"
 
-#: classes/Gems/Default/RespondentAction.php:280
+#: classes/Gems/Default/RespondentAction.php:246
 msgid "Rejection code"
 msgstr "Afkeuringscode"
 
-#: classes/Gems/Default/RespondentAction.php:287
+#: classes/Gems/Default/RespondentAction.php:253
 msgid "Delete respondent"
 msgstr "Verwijder patiënt"
 
-#: classes/Gems/Default/RespondentAction.php:319
+#: classes/Gems/Default/RespondentAction.php:285
 msgid "Respondent deleted."
 msgstr "Patiënt verwijderd"
 
-#: classes/Gems/Default/RespondentAction.php:323
+#: classes/Gems/Default/RespondentAction.php:289
 msgid "Respondent tracks stopped."
 msgstr "Trajecten van patiënt zijn gestopt."
 
-#: classes/Gems/Default/RespondentAction.php:327
+#: classes/Gems/Default/RespondentAction.php:293
 msgid "Choose a reception code to delete."
 msgstr "Kies een ontvangst code om te verwijderen."
 
-#: classes/Gems/Default/RespondentAction.php:421
+#: classes/Gems/Default/RespondentAction.php:387
 msgid "respondent"
 msgid_plural "respondents"
 msgstr[0] "patiënt"
 msgstr[1] "patiënten"
 
-#: classes/Gems/Default/RespondentAction.php:496
+#: classes/Gems/Default/RespondentAction.php:462
 msgid "Please settle the informed consent form for this respondent."
 msgstr "A.u.b. het informed consent formulier doornemen met deze patiënt"
 
-#: classes/Gems/Default/RespondentExportAction.php:61
+#: classes/Gems/Default/RespondentExportAction.php:54
 msgid "Respondent number"
 msgstr "Patiënt nummer"
 
-#: classes/Gems/Default/RespondentExportAction.php:65
+#: classes/Gems/Default/RespondentExportAction.php:56
 msgid "Separate multiple respondents with a comma (,)"
 msgstr "Scheid meerdere patienten met een comma (,)"
 
@@ -1949,52 +1943,65 @@
 msgid "Respondent planning"
 msgstr "Per patiënt plannen"
 
-#: classes/Gems/Default/RoleAction.php:94
-#: classes/Gems/Default/RoleAction.php:242
+#: classes/Gems/Default/RoleAction.php:97
+msgid "child of current role"
+msgstr "afgeleid van huidige rol"
+
+#: classes/Gems/Default/RoleAction.php:105
+#, php-format
+msgid "inherited from %s"
+msgstr "overerfd van %s"
+
+#: classes/Gems/Default/RoleAction.php:113
+msgid "this role"
+msgstr "deze rol"
+
+#: classes/Gems/Default/RoleAction.php:144
+#: classes/Gems/Default/RoleAction.php:302
 msgid "Inherited"
 msgstr "Overerfd"
 
-#: classes/Gems/Default/RoleAction.php:156
+#: classes/Gems/Default/RoleAction.php:209
 msgid "Illegal name"
 msgstr "Naam niet toegestaan"
 
-#: classes/Gems/Default/RoleAction.php:180
-#: classes/Gems/Default/RoleAction.php:239
+#: classes/Gems/Default/RoleAction.php:233
+#: classes/Gems/Default/RoleAction.php:299
 msgid "Parents"
 msgstr "Afgeleid van"
 
-#: classes/Gems/Default/RoleAction.php:195
+#: classes/Gems/Default/RoleAction.php:255
 msgid "Editing `master` is not allowed"
 msgstr "Het wijzigen van `master` is niet toegestaan"
 
-#: classes/Gems/Default/RoleAction.php:213
+#: classes/Gems/Default/RoleAction.php:273
 msgid "role"
 msgid_plural "roles"
 msgstr[0] "Rol"
 msgstr[1] "Rollen"
 
-#: classes/Gems/Default/RoleAction.php:218
+#: classes/Gems/Default/RoleAction.php:278
 msgid "Administrative roles"
 msgstr "Beheer rollen en rechten"
 
-#: classes/Gems/Default/RoleAction.php:240
-#: classes/Gems/Default/RoleAction.php:258
+#: classes/Gems/Default/RoleAction.php:300
+#: classes/Gems/Default/RoleAction.php:318
 msgid "Allowed"
 msgstr "Toegestaan"
 
-#: classes/Gems/Default/RoleAction.php:247
+#: classes/Gems/Default/RoleAction.php:307
 msgid "Project role overview"
 msgstr "Project rollen"
 
-#: classes/Gems/Default/RoleAction.php:257
+#: classes/Gems/Default/RoleAction.php:317
 msgid "Privilege"
 msgstr "Privilége"
 
-#: classes/Gems/Default/RoleAction.php:259
+#: classes/Gems/Default/RoleAction.php:319
 msgid "Denied"
 msgstr "Geweigerd"
 
-#: classes/Gems/Default/RoleAction.php:263
+#: classes/Gems/Default/RoleAction.php:323
 msgid "Project privileges"
 msgstr "Project priviléges"
 
@@ -2199,107 +2206,107 @@
 msgid "If empty, survey will never show up!"
 msgstr "Indien leeg zal de vragenlijst niet tevoorschijn komen!"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:129
+#: classes/Gems/Default/SurveyMaintenanceAction.php:130
 msgid "Upload new PDF"
 msgstr "Upload nieuwe PDF"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:137
+#: classes/Gems/Default/SurveyMaintenanceAction.php:138
 msgid "Usage"
 msgstr "Gebruik"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:152
+#: classes/Gems/Default/SurveyMaintenanceAction.php:153
 msgid "Single Survey Assignment"
 msgstr "Losse vragenlijst toewijzing"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:197
+#: classes/Gems/Default/SurveyMaintenanceAction.php:198
 msgid "Assignable since"
 msgstr "Toewijsbaar sinds"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:198
+#: classes/Gems/Default/SurveyMaintenanceAction.php:199
 msgid "Assignable until"
 msgstr "Toewijsbaar tot"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:204
+#: classes/Gems/Default/SurveyMaintenanceAction.php:205
 msgid "Create Single Survey"
 msgstr "Maak losse vragenlijst"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:208
+#: classes/Gems/Default/SurveyMaintenanceAction.php:209
 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:263
+#: classes/Gems/Default/SurveyMaintenanceAction.php:264
 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:280
+#: classes/Gems/Default/SurveyMaintenanceAction.php:281
 #, php-format
 msgid "Checking survey results for the %s survey."
 msgstr "Controle op vragenlijstresultaten voor de vragenlijst '%s'."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:292
+#: classes/Gems/Default/SurveyMaintenanceAction.php:293
 msgid "Checking survey results for all surveys."
 msgstr "Controle op vragenlijstresultaten voor alle vragenlijsten."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:349
+#: classes/Gems/Default/SurveyMaintenanceAction.php:350
 msgid "OK"
 msgstr "OK"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:356
+#: classes/Gems/Default/SurveyMaintenanceAction.php:357
 msgid "Source"
 msgstr "Bron"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:357
+#: classes/Gems/Default/SurveyMaintenanceAction.php:358
 msgid "Status in source"
 msgstr "Status in bron"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:360
+#: classes/Gems/Default/SurveyMaintenanceAction.php:361
 msgid "Active in source"
 msgstr "Actief in bron"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:361
+#: classes/Gems/Default/SurveyMaintenanceAction.php:362
 #, php-format
 msgid "Active in %s"
 msgstr "Actief in %s"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:368
+#: classes/Gems/Default/SurveyMaintenanceAction.php:369
 msgid "Single"
 msgstr "Los"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:377
+#: classes/Gems/Default/SurveyMaintenanceAction.php:378
 msgid "Result field"
 msgstr "Resultaat veld"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:378
+#: classes/Gems/Default/SurveyMaintenanceAction.php:379
 msgid "Duration description"
 msgstr "Beschrijving afnametijd"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:378
+#: classes/Gems/Default/SurveyMaintenanceAction.php:379
 msgid "Text to inform the respondent."
 msgstr "tekst er informatie van de patiënt."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:379
+#: classes/Gems/Default/SurveyMaintenanceAction.php:383
 msgid "Before answering"
 msgstr "Voor beantwoording"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:380
+#: classes/Gems/Default/SurveyMaintenanceAction.php:384
 msgid "After completion"
 msgstr "Na afronding"
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:410
+#: classes/Gems/Default/SurveyMaintenanceAction.php:414
 #, php-format
 msgid "%d times in track."
 msgstr "%d keer in traject."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:412
+#: classes/Gems/Default/SurveyMaintenanceAction.php:416
 #, php-format
 msgid "%d times in %d track(s)."
 msgstr "%d keer in %d traject(en)."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:416
+#: classes/Gems/Default/SurveyMaintenanceAction.php:420
 msgid "Not used in track."
 msgstr "Niet in traject gebruikt."
 
-#: classes/Gems/Default/SurveyMaintenanceAction.php:418
+#: classes/Gems/Default/SurveyMaintenanceAction.php:422
 msgid "Not used in tracks."
 msgstr "Niet in trajecten gebruikt."
 
@@ -2781,138 +2788,146 @@
 msgid "Format answers"
 msgstr "Antwoorden opmaken"
 
-#: classes/Gems/Export/RespondentExport.php:128
+#: classes/Gems/Export/RespondentExport.php:130
 #, php-format
-msgid "Unable to run PDF conversion: \"%s\""
-msgstr "Kan PDF conversie niet starten: \"%s\""
+msgid "Unable to run PDF conversion (%s): \"%s\""
+msgstr "Kan PDF conversie (%s) niet starten: \"%s\""
 
-#: classes/Gems/Export/RespondentExport.php:193
+#: classes/Gems/Export/RespondentExport.php:200
 msgid "Single Survey"
 msgstr "Losse vragenlijst"
 
-#: classes/Gems/Export/RespondentExport.php:254
+#: classes/Gems/Export/RespondentExport.php:261
 msgid "Track information"
 msgstr "Traject informatie"
 
-#: classes/Gems/Export/Spss.php:59
+#: classes/Gems/Export/RespondentExport.php:324
+msgid "Group surveys"
+msgstr "Groepeer vragenlijsten"
+
+#: classes/Gems/Export/RespondentExport.php:329
+msgid "Output format"
+msgstr "Uitvoerformaat"
+
+#: classes/Gems/Export/Spss.php:80
 msgid "Which file"
 msgstr "Kies bestand"
 
-#: classes/Gems/Export/Spss.php:60
+#: classes/Gems/Export/Spss.php:81
 msgid "syntax"
 msgstr "syntax"
 
-#: classes/Gems/Export/Spss.php:61
+#: classes/Gems/Export/Spss.php:82
 msgid "data"
 msgstr "data"
 
-#: classes/Gems/Export/Spss.php:66
+#: classes/Gems/Export/Spss.php:86
 msgid "Some help for this export"
 msgstr "Uitleg over deze export mogelijkheid"
 
-#: classes/Gems/Menu/MenuAbstract.php:250
+#: classes/Gems/Menu/MenuAbstract.php:267
 msgid "Activity log"
 msgstr "Activiteit"
 
-#: classes/Gems/Menu/MenuAbstract.php:256
+#: classes/Gems/Menu/MenuAbstract.php:273
 msgid "Automatic mail"
 msgstr "Automatische mail"
 
-#: classes/Gems/Menu/MenuAbstract.php:257
+#: classes/Gems/Menu/MenuAbstract.php:274
 msgid "Turn Automatic Mail Jobs OFF"
 msgstr "Automatische mail opdrachten UITzetten"
 
-#: classes/Gems/Menu/MenuAbstract.php:261
+#: classes/Gems/Menu/MenuAbstract.php:278
 msgid "Servers"
 msgstr "Servers"
 
-#: classes/Gems/Menu/MenuAbstract.php:265
+#: classes/Gems/Menu/MenuAbstract.php:282
 msgid "Templates"
 msgstr "Sjablonen"
 
-#: classes/Gems/Menu/MenuAbstract.php:297
+#: classes/Gems/Menu/MenuAbstract.php:314
 msgid "By period"
 msgstr "Per periode"
 
-#: classes/Gems/Menu/MenuAbstract.php:298
+#: classes/Gems/Menu/MenuAbstract.php:315
 msgid "By token"
 msgstr "Per kenmerk"
 
-#: classes/Gems/Menu/MenuAbstract.php:299
+#: classes/Gems/Menu/MenuAbstract.php:316
 msgid "By respondent"
 msgstr "Per patiënt"
 
-#: classes/Gems/Menu/MenuAbstract.php:303
+#: classes/Gems/Menu/MenuAbstract.php:320
 msgid "Bulk mail"
 msgstr "Bulk mail"
 
-#: classes/Gems/Menu/MenuAbstract.php:321
+#: classes/Gems/Menu/MenuAbstract.php:338
 msgid "Errors"
 msgstr "Foutmeldingen"
 
-#: classes/Gems/Menu/MenuAbstract.php:322
+#: classes/Gems/Menu/MenuAbstract.php:339
 msgid "PHP"
 msgstr "PHP"
 
-#: classes/Gems/Menu/MenuAbstract.php:325
+#: classes/Gems/Menu/MenuAbstract.php:342
 msgid "Maintenance mode"
 msgstr "Onderhoudsmodus"
 
-#: classes/Gems/Menu/MenuAbstract.php:326
+#: classes/Gems/Menu/MenuAbstract.php:343
 msgid "Clean cache"
 msgstr "Cache opruimen"
 
-#: classes/Gems/Menu/MenuAbstract.php:393
+#: classes/Gems/Menu/MenuAbstract.php:410
 msgid "Reset password"
 msgstr "Reset wachtwoord"
 
-#: classes/Gems/Menu/MenuAbstract.php:419
+#: classes/Gems/Menu/MenuAbstract.php:437
 msgid "Check status"
 msgstr "Status controle"
 
-#: classes/Gems/Menu/MenuAbstract.php:420
+#: classes/Gems/Menu/MenuAbstract.php:438
 msgid "Synchronize surveys"
 msgstr "Synchroniseer vragenlijsten"
 
-#: classes/Gems/Menu/MenuAbstract.php:421
-#: classes/Gems/Menu/MenuAbstract.php:433
+#: classes/Gems/Menu/MenuAbstract.php:439
+#: classes/Gems/Menu/MenuAbstract.php:451
 msgid "Check is answered"
 msgstr "Controleer op antwoorden"
 
-#: classes/Gems/Menu/MenuAbstract.php:422
+#: classes/Gems/Menu/MenuAbstract.php:440
 msgid "Check attributes"
 msgstr "Controleer attributen"
 
-#: classes/Gems/Menu/MenuAbstract.php:423
+#: classes/Gems/Menu/MenuAbstract.php:441
 msgid "Synchronize all surveys"
 msgstr "Synchroniseer alle vragenlijsten"
 
-#: classes/Gems/Menu/MenuAbstract.php:424
-#: classes/Gems/Menu/MenuAbstract.php:434
+#: classes/Gems/Menu/MenuAbstract.php:442
+#: classes/Gems/Menu/MenuAbstract.php:452
 msgid "Check all is answered"
 msgstr "Controleer alles op antwoorden"
 
-#: classes/Gems/Menu/MenuAbstract.php:430
+#: classes/Gems/Menu/MenuAbstract.php:448
 msgid "PDF"
 msgstr "PDF"
 
-#: classes/Gems/Menu/MenuAbstract.php:464
+#: classes/Gems/Menu/MenuAbstract.php:482
 msgid "Check assignments"
 msgstr "Controleer toewijzingen"
 
-#: classes/Gems/Menu/MenuAbstract.php:467
+#: classes/Gems/Menu/MenuAbstract.php:485
 msgid "Check all assignments"
 msgstr "Controleer alle toewijzingen"
 
-#: classes/Gems/Menu/SubMenuItem.php:410
+#: classes/Gems/Menu/SubMenuItem.php:382
 msgid "New"
 msgstr "Nieuw"
 
-#: classes/Gems/Menu/SubMenuItem.php:464
+#: classes/Gems/Menu/SubMenuItem.php:436
 msgid "Export the current data set to Excel"
 msgstr "Exporteer de huidige gegevens naar Excel"
 
-#: classes/Gems/Menu/SubMenuItem.php:468
+#: classes/Gems/Menu/SubMenuItem.php:440
 msgid "Excel export"
 msgstr "Excel export"
 
@@ -3859,6 +3874,14 @@
 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:370
+msgid "inactive"
+msgstr "inactief"
+
+#: classes/Gems/Util/DbLookup.php:371
+msgid "source inactive"
+msgstr "bron inactief"
+
 #: classes/Gems/Util/ReceptionCodeLibrary.php:100
 msgid "Yes (forget answers)"
 msgstr "Ja (vergeet antwoorden)"
@@ -4196,6 +4219,7 @@
 msgstr "Keuzelijst is veranderd."
 
 #: snippets/EditSingleSurveyTokenSnippet.php:132
+#: snippets/ShowSingleSurveyTokenSnippet.php:153
 msgid "Show survey"
 msgstr "Toon vragenlijst"
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[843] trunk/library/classes/Gems/User/UserLoader. php

From: <gem...@li...> - 2012-07-13 11:32:42

Revision: 843
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=843&view=rev
Author:   mennodekker
Date:     2012-07-13 11:32:36 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Add some documentation about the way the userclass is selected and modified select to include the order by field

Modified Paths:
--------------
    trunk/library/classes/Gems/User/UserLoader.php

Modified: trunk/library/classes/Gems/User/UserLoader.php
===================================================================
--- trunk/library/classes/Gems/User/UserLoader.php	2012-07-13 10:27:56 UTC (rev 842)
+++ trunk/library/classes/Gems/User/UserLoader.php	2012-07-13 11:32:36 UTC (rev 843)
@@ -556,12 +556,20 @@
     {
         $select = $this->db->select();
 
+        /**
+         * tolerance field:
+         * 1 - login and organization match
+         * 2 - login found in an organization with access to the requested organization
+         * 3 - login found in another organization without rights to the requested organiation
+         *     (could be allowed due to privilege with rights to ALL organizations)
+         */
         $select->from('gems__user_logins', array("gul_user_class", 'gul_id_organization', 'gul_login'))
                 ->from('gems__organizations', array())
+                ->columns(new Zend_Db_Expr("CASE WHEN gor_id_organization = gul_id_organization THEN 1 WHEN gor_accessible_by LIKE CONCAT('%:', gul_id_organization, ':%') THEN 2 ELSE 3 END AS tolerance"))
                 ->where('gor_active = 1')
                 ->where('gul_can_login = 1')
                 ->where('gor_id_organization = ?', $organization)
-                ->order("CASE WHEN gor_id_organization = gul_id_organization THEN 1 WHEN gor_accessible_by LIKE CONCAT('%:', gul_id_organization, ':%') THEN 2 ELSE 3 END");
+                ->order('tolerance');
 
         $ids[] = 'gul_login';
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[842] trunk/library/classes/Gems/FormattedData.php

From: <gem...@li...> - 2012-07-13 10:28:05

Revision: 842
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=842&view=rev
Author:   mennodekker
Date:     2012-07-13 10:27:56 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Somehow we could have lazy elements, fixed that too. Was no problem for Exhibitor

Modified Paths:
--------------
    trunk/library/classes/Gems/FormattedData.php

Modified: trunk/library/classes/Gems/FormattedData.php
===================================================================
--- trunk/library/classes/Gems/FormattedData.php	2012-07-13 10:04:47 UTC (rev 841)
+++ trunk/library/classes/Gems/FormattedData.php	2012-07-13 10:27:56 UTC (rev 842)
@@ -144,7 +144,16 @@
             }
         }
 
-        if ($result instanceof MUtil_Html_HtmlInterface) {
+        // If it is Lazy, execute it
+        if ($result instanceof MUtil_Lazy_LazyInterface) {
+            if ($result instanceof MUtil_Lazy_LazyInterface) {
+                $result = MUtil_Lazy::rise($result);
+            }
+        }
+
+        // If it is Html, render it
+        if ($result instanceof MUtil_Html_HtmlInterface || $result instanceof MUtil_Lazy_LazyInterface) {
+
             $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
             if (null === $viewRenderer->view) {
                 $viewRenderer->initView();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[841] trunk/library/classes

From: <gem...@li...> - 2012-07-13 10:04:58

Revision: 841
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=841&view=rev
Author:   mennodekker
Date:     2012-07-13 10:04:47 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Allow to export staff to excel + in detailed view roles won't be cut off

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/RoleAction.php
    trunk/library/classes/Gems/Menu/MenuAbstract.php
    trunk/library/classes/GemsEscort.php

Modified: trunk/library/classes/Gems/Default/RoleAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RoleAction.php	2012-07-13 10:02:53 UTC (rev 840)
+++ trunk/library/classes/Gems/Default/RoleAction.php	2012-07-13 10:04:47 UTC (rev 841)
@@ -235,7 +235,10 @@
         $tp = new MUtil_Model_Type_ConcatenatedRow(',', ', ');
         $tp->apply($model, 'grl_parents');
 
-        $model->set('grl_privileges', 'label', $this->_('Privileges'), 'formatFunction', array($this, 'formatLongLine'));
+        $model->set('grl_privileges', 'label', $this->_('Privileges'));
+        if (!$detailed) {
+            $model->set('grl_privileges', 'formatFunction', array($this, 'formatLongLine'));
+        }
 
         Gems_Model::setChangeFieldsByPrefix($model, 'grl');
 

Modified: trunk/library/classes/Gems/Menu/MenuAbstract.php
===================================================================
--- trunk/library/classes/Gems/Menu/MenuAbstract.php	2012-07-13 10:02:53 UTC (rev 840)
+++ trunk/library/classes/Gems/Menu/MenuAbstract.php	2012-07-13 10:04:47 UTC (rev 841)
@@ -409,6 +409,7 @@
         $pages[] = $page->addEditAction();
         $pages[] = $page->addAction($this->_('Reset password'), 'pr.staff.edit', 'reset')->setModelParameters(1);
         $pages[] = $page->addDeleteAction();
+        $pages[] = $page->addExcelAction();
         if (! $this->escort->hasPrivilege('pr.staff.edit.all')) {
             $filter = array_keys($this->escort->loader->getCurrentUser()->getAllowedOrganizations());
             foreach ($pages as $sub_page) {

Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php	2012-07-13 10:02:53 UTC (rev 840)
+++ trunk/library/classes/GemsEscort.php	2012-07-13 10:04:47 UTC (rev 841)
@@ -430,7 +430,7 @@
      */
     protected function _initTranslate()
     {
-        $this->bootstrap('locale');
+        $this->bootstrap('locale');      
 
         $language = $this->locale->getLanguage();
 
@@ -516,9 +516,8 @@
         return $view;
     }
 
-    protected function _initZFDebug()
-    {
-        /*
+    /*protected function _initZFDebug()
+    {        
         // if ((APPLICATION_ENV === 'development') &&
         if ((APPLICATION_ENV !== 'production') &&
             (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 6.') === FALSE)) {
@@ -546,8 +545,8 @@
             $this->bootstrap('frontController');
             $frontController = $this->getResource('frontController');
             $frontController->registerPlugin($debug);
-        } // */
-    }
+        } 
+    }// */
 
     /**
      * Function called if specified in the Project.ini layoutPrepare section before

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[840] trunk/library/classes/Gems/Controller

From: <gem...@li...> - 2012-07-13 10:03:00

Revision: 840
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=840&view=rev
Author:   mennodekker
Date:     2012-07-13 10:02:53 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Excel data is formatted by default, use formatExcelData to change

Modified Paths:
--------------
    trunk/library/classes/Gems/Controller/BrowseEditAction.php
    trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php

Modified: trunk/library/classes/Gems/Controller/BrowseEditAction.php
===================================================================
--- trunk/library/classes/Gems/Controller/BrowseEditAction.php	2012-07-13 10:01:36 UTC (rev 839)
+++ trunk/library/classes/Gems/Controller/BrowseEditAction.php	2012-07-13 10:02:53 UTC (rev 840)
@@ -64,7 +64,14 @@
     public $filterStandard;
 
     /**
+     * Should Excel output contain formatted data (date fields, select lists)
      *
+     * @var boolean
+     */
+    public $formatExcelData = true;
+
+    /**
+     *
      * @var Gems_Util_RequestCache
      */
     public $requestCache;
@@ -430,7 +437,10 @@
 
         $this->addExcelColumns($model);     // Hook to modify the model
 
-        $this->view->result   = $this->getExcelData($model->load(), $model);
+        // Use $this->formatExcelData to switch between formatted and unformatted data
+        $excelData = new Gems_FormattedData($this->getExcelData($model->load(), $model), $model, $this->formatExcelData);
+
+        $this->view->result   = $excelData;
         $this->view->filename = $this->getRequest()->getControllerName() . '.xls';
         $this->view->setScriptPath(GEMS_LIBRARY_DIR . '/views/scripts' );
 

Modified: trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php
===================================================================
--- trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php	2012-07-13 10:01:36 UTC (rev 839)
+++ trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php	2012-07-13 10:02:53 UTC (rev 840)
@@ -87,7 +87,14 @@
     public $escort;
 
     /**
+     * Should Excel output contain formatted data (date fields, select lists)
      *
+     * @var boolean
+     */
+    public $formatExcelData = true;
+
+    /**
+     *
      * @var Gems_Menu
      */
     public $menu;
@@ -190,7 +197,11 @@
 
         // $this->addExcelColumns($model);     // Hook to modify the model
 
-        $this->view->result   = $this->getExcelData($model->load(), $model);
+        // Use $this->formatExcelData to switch between formatted and unformatted data
+        $excelData = new Gems_FormattedData($this->getExcelData($model->load(), $model), $model, $this->formatExcelData);
+
+        $this->view->result   = $excelData;
+
         $this->view->filename = $this->getRequest()->getControllerName() . '.xls';
         $this->view->setScriptPath(GEMS_LIBRARY_DIR . '/views/scripts' );
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[839] trunk/library/classes

From: <gem...@li...> - 2012-07-13 10:01:46

Revision: 839
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=839&view=rev
Author:   mennodekker
Date:     2012-07-13 10:01:36 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Fixing concatenated row in exhibitor and formatted data

Modified Paths:
--------------
    trunk/library/classes/Gems/FormattedData.php
    trunk/library/classes/MUtil/View/Helper/Exhibitor.php

Modified: trunk/library/classes/Gems/FormattedData.php
===================================================================
--- trunk/library/classes/Gems/FormattedData.php	2012-07-13 09:51:02 UTC (rev 838)
+++ trunk/library/classes/Gems/FormattedData.php	2012-07-13 10:01:36 UTC (rev 839)
@@ -103,8 +103,20 @@
 
         if ($multiOptions = $model->get($name, 'multiOptions')) {
             if (is_array($multiOptions)) {
-                if (array_key_exists($result, $multiOptions)) {
-                    $result = $multiOptions[$result];
+                /*
+                 *  Sometimes a field is an array and will be formatted later on using the
+                 *  formatFunction -> handle each element in the array.
+                 */
+                if (is_array($result)) {
+                    foreach($result as $key => $value) {
+                        if (array_key_exists($value, $multiOptions)) {
+                            $result[$key] = $multiOptions[$value];
+                        }
+                    }
+                } else {
+                    if (array_key_exists($result, $multiOptions)) {
+                        $result = $multiOptions[$result];
+                    }
                 }
             }
         }

Modified: trunk/library/classes/MUtil/View/Helper/Exhibitor.php
===================================================================
--- trunk/library/classes/MUtil/View/Helper/Exhibitor.php	2012-07-13 09:51:02 UTC (rev 838)
+++ trunk/library/classes/MUtil/View/Helper/Exhibitor.php	2012-07-13 10:01:36 UTC (rev 839)
@@ -74,8 +74,20 @@
             $multiOptions = $attribs['multiOptions'];
 
             if (is_array($multiOptions)) {
-                if (array_key_exists($value, $multiOptions)) {
-                    $result = $multiOptions[$value];
+                /*
+                 *  Sometimes a field is an array and will be formatted later on using the
+                 *  formatFunction -> handle each element in the array.
+                 */
+                if (is_array($result)) {
+                    foreach($result as $key => $arrayValue) {
+                        if (array_key_exists($arrayValue, $multiOptions)) {
+                            $result[$key] = $multiOptions[$arrayValue];
+                        }
+                    }
+                } else {
+                    if (array_key_exists($result, $multiOptions)) {
+                        $result = $multiOptions[$result];
+                    }
                 }
             }
         }
@@ -123,7 +135,7 @@
             $result = $callback($result);
         } */
 
-        if (isset($attribs['nohidden']) && $attribs['nohidden']) {
+        if (isset($attribs['nohidden']) && $attribs['nohidden'] || is_array($value)) {
             return $result;
         } else {
             return $this->_hidden($name, $value) . $result;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[838] trunk/library/classes/Gems/Default/ SurveyMaintenanceAction.php

From: <gem...@li...> - 2012-07-13 09:51:13

Revision: 838
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=838&view=rev
Author:   michieltcs
Date:     2012-07-13 09:51:02 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Add missing gsu_code form element

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-07-13 09:43:23 UTC (rev 837)
+++ trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php	2012-07-13 09:51:02 UTC (rev 838)
@@ -123,6 +123,7 @@
         $bridge->addSelect(     'gsu_id_primary_group',      'description', $this->_('If empty, survey will never show up!'));
         $bridge->addSelect(     'gsu_result_field',          'multiOptions', $surveyFields);
         $bridge->addText(       'gsu_duration');
+        $bridge->addText(       'gsu_code');
         $bridge->addSelect(     'gsu_beforeanswering_event');
         $bridge->addSelect(     'gsu_completed_event');
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[837] trunk/library/classes/Gems/Tracker/Survey.php

From: <gem...@li...> - 2012-07-13 09:43:33

Revision: 837
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=837&view=rev
Author:   michieltcs
Date:     2012-07-13 09:43:23 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Add convenience method getCode()

Modified Paths:
--------------
    trunk/library/classes/Gems/Tracker/Survey.php

Modified: trunk/library/classes/Gems/Tracker/Survey.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Survey.php	2012-07-13 09:36:33 UTC (rev 836)
+++ trunk/library/classes/Gems/Tracker/Survey.php	2012-07-13 09:43:23 UTC (rev 837)
@@ -246,6 +246,15 @@
     }
 
     /**
+     *
+     * @return string Internal code of the survey
+     */
+    public function getCode()
+    {
+        return $this->_gemsSurvey['gsu_code'];
+    }
+    
+    /**
      * The time the survey was completed according to the source
      *
      * @param Gems_Tracker_Token $token Gems token object

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[836] trunk/library

From: <gem...@li...> - 2012-07-13 09:36:42

Revision: 836
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=836&view=rev
Author:   michieltcs
Date:     2012-07-13 09:36:33 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Add gsu_code field to surveys

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php
    trunk/library/configs/db/patches.sql
    trunk/library/configs/db/tables/gems__surveys.30.sql

Modified: trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php
===================================================================
--- trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php	2012-07-12 14:13:16 UTC (rev 835)
+++ trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php	2012-07-13 09:36:33 UTC (rev 836)
@@ -376,6 +376,9 @@
 
             $model->set('gsu_result_field',          'label', $this->_('Result field'));
             $model->set('gsu_duration',              'label', $this->_('Duration description'), 'description', $this->_('Text to inform the respondent.'));
+            
+            $model->setIfExists('gsu_code', 'label', $this->_('Code name'), 'size', 10, 'description', $this->_('Only for programmers.'));
+            
             $model->set('gsu_beforeanswering_event', 'label', $this->_('Before answering'), 'multiOptions', $events->listSurveyBeforeAnsweringEvents());
             $model->set('gsu_completed_event',       'label', $this->_('After completion'), 'multiOptions', $events->listSurveyCompletionEvents());
         }

Modified: trunk/library/configs/db/patches.sql
===================================================================
--- trunk/library/configs/db/patches.sql	2012-07-12 14:13:16 UTC (rev 835)
+++ trunk/library/configs/db/patches.sql	2012-07-13 09:36:33 UTC (rev 836)
@@ -414,3 +414,6 @@
 
 -- PATCH: Allow multi org view for supers
 UPDATE gems__roles SET grl_privileges = CONCAT(grl_privileges, ',pr.respondent.multiorg') WHERE grl_name = 'super' AND grl_privileges NOT LIKE '%pr.respondent.multiorg%';
+
+-- PATCH: Add code field to surveys
+ALTER TABLE `gems__surveys` ADD gsu_code varchar(64)  CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' NULL AFTER gsu_duration;

Modified: trunk/library/configs/db/tables/gems__surveys.30.sql
===================================================================
--- trunk/library/configs/db/tables/gems__surveys.30.sql	2012-07-12 14:13:16 UTC (rev 835)
+++ trunk/library/configs/db/tables/gems__surveys.30.sql	2012-07-13 09:36:33 UTC (rev 836)
@@ -37,13 +37,16 @@
         gsu_result_field   varchar(20) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
         gsu_duration       varchar(50) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
 
+        gsu_code           varchar(64) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
+        
         gsu_changed timestamp not null default current_timestamp on update current_timestamp,
         gsu_changed_by bigint unsigned not null,
         gsu_created timestamp not null,
         gsu_created_by bigint unsigned not null,
 
         PRIMARY KEY(gsu_id_survey),
-        INDEX (gsu_active)
+        INDEX (gsu_active),
+        INDEX (gsu_code)
     )
     ENGINE=InnoDB
     auto_increment = 500

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[835] trunk/library/classes/Gems/Export/Spss.php

From: <gem...@li...> - 2012-07-12 14:13:26

Revision: 835
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=835&view=rev
Author:   mennodekker
Date:     2012-07-12 14:13:16 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
Fixed #543: IE will not download spss export
dev: needed $replace=true in setHeader method to get the headers right

Modified Paths:
--------------
    trunk/library/classes/Gems/Export/Spss.php

Modified: trunk/library/classes/Gems/Export/Spss.php
===================================================================
--- trunk/library/classes/Gems/Export/Spss.php	2012-07-12 13:10:26 UTC (rev 834)
+++ trunk/library/classes/Gems/Export/Spss.php	2012-07-12 14:13:16 UTC (rev 835)
@@ -61,10 +61,10 @@
         $response   = $controller->getResponse();
         $response->clearAllHeaders();
 
-        $response->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"')
-            ->setHeader('Content-type', 'text/plain; charset=UTF-8')
-            ->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
-            ->setHeader('Pragma', 'public');
+        $response->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"', true)
+            ->setHeader('Content-type', 'text/plain; charset=UTF-8', true)
+            ->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0', true)
+            ->setHeader('Pragma', 'public', true);
 
         return $response;
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[834] trunk

From: <gem...@li...> - 2012-07-12 13:10:32

Revision: 834
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=834&view=rev
Author:   michieltcs
Date:     2012-07-12 13:10:26 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
Add some more clarification about export.pdfExportCommand

Modified Paths:
--------------
    trunk/library/changelog.txt
    trunk/new_project/application/configs/project.ini

Modified: trunk/library/changelog.txt
===================================================================
--- trunk/library/changelog.txt	2012-07-12 12:50:23 UTC (rev 833)
+++ trunk/library/changelog.txt	2012-07-12 13:10:26 UTC (rev 834)
@@ -5,6 +5,7 @@
 Externally the organization id is still left out of the url when not needed
 UPGRADE WARNING: Check all your (snippet) extensions to RespondentAction, TrackAction, SurveyAction and project specific versions of ShowTrackTokenSnippet and ShowSingleSurveySnippet: you may need to specify extra parameters as the menu items need to know the organization id
 New projects start with a basic css template
+In project.ini, export.wkhtmltopdf has been renamed to export.pdfExportCommand, and which now stores the entire command line to the pdf export binary (wkhtmltopdf, Phantom.js or similar).
 
 Important changes from 1.5.3 => 1.5.4
 ============================================================

Modified: trunk/new_project/application/configs/project.ini
===================================================================
--- trunk/new_project/application/configs/project.ini	2012-07-12 12:50:23 UTC (rev 833)
+++ trunk/new_project/application/configs/project.ini	2012-07-12 13:10:26 UTC (rev 834)
@@ -293,6 +293,12 @@
 ;---------------------------------------------------------
 ; Command line to the pdf export binary (such as
 ; wkhtmltopdf, Phantom.js or similar)
+;
+; Use as follows:
+;   export.pdfExportCommand = '/bin/wkhtmltopdf %s %s'
+;
+; where %s %s is respecitively the input (url) and
+; the output (file)
 export.pdfExportCommand = 
 
 [testing : production]

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[833] trunk/new_project/application/configs/project .ini

From: <gem...@li...> - 2012-07-12 12:50:33

Revision: 833
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=833&view=rev
Author:   michieltcs
Date:     2012-07-12 12:50:23 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
Rename to export.pdfExportCommand (see r832)

Revision Links:
--------------
    http://gemstracker.svn.sourceforge.net/gemstracker/?rev=832&view=rev

Modified Paths:
--------------
    trunk/new_project/application/configs/project.ini

Modified: trunk/new_project/application/configs/project.ini
===================================================================
--- trunk/new_project/application/configs/project.ini	2012-07-12 12:46:26 UTC (rev 832)
+++ trunk/new_project/application/configs/project.ini	2012-07-12 12:50:23 UTC (rev 833)
@@ -291,9 +291,9 @@
 ;---------------------------------------------------------
 ; EXPORT SECTION
 ;---------------------------------------------------------
-; Location of the 'wkhtmltopdf' binary, be sure to use the latest
-; binary from http://code.google.com/p/wkhtmltopdf/
-export.wkhtmltopdf =
+; Command line to the pdf export binary (such as
+; wkhtmltopdf, Phantom.js or similar)
+export.pdfExportCommand = 
 
 [testing : production]
 admin.user = superadmin

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.

Flat | Threaded

<< < 1 .. 14 15 16 17 18 .. 50 > >> (Page 16 of 50)

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