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

[<gem...@li...>]

Revision: 1112
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1112&view=rev
Author:   matijsdejong
Date:     2013-01-18 17:26:18 +0000 (Fri, 18 Jan 2013)
Log Message:
-----------
TokenPlanAction and it's sub classes use the new date period selection mechanism 
TokenPlanAction and it's sub classes have the new status selections 'Open' and 'Removed'
ComplianceAction.php and SummaryAction.php are finished unless Harm wants more
Updated translations

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/ComplianceAction.php
    trunk/library/classes/Gems/Default/RespondentPlanAction.php
    trunk/library/classes/Gems/Default/SummaryAction.php
    trunk/library/classes/Gems/Default/TokenPlanAction.php
    trunk/library/classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php
    trunk/library/classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.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/ComplianceAction.php
===================================================================
--- trunk/library/classes/Gems/Default/ComplianceAction.php	2013-01-17 17:34:35 UTC (rev 1111)
+++ trunk/library/classes/Gems/Default/ComplianceAction.php	2013-01-18 17:26:18 UTC (rev 1112)
@@ -88,7 +88,6 @@
         $model->set('gr2t_end_date',   'label', $this->_('End date'), 'dateFormat', 'dd-MM-yyyy');
 
         $filter = $this->util->getRequestCache('index')->getProgramParams();
-        MUtil_Echo::track($filter);
         if (! (isset($filter['gr2t_id_track']) && $filter['gr2t_id_track'])) {
             $model->setFilter(array('1=0'));
             $this->autofilterParameters['onEmpty'] = $this->_('No track selected...');

Modified: trunk/library/classes/Gems/Default/RespondentPlanAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RespondentPlanAction.php	2013-01-17 17:34:35 UTC (rev 1111)
+++ trunk/library/classes/Gems/Default/RespondentPlanAction.php	2013-01-18 17:26:18 UTC (rev 1112)
@@ -100,14 +100,14 @@
             $td->renderWithoutContent = false; // Do not display this cell and thus this row if there is not content
         }
 
-        $bridge->tr(array('class' => 'odd'));
+        $bridge->tr(array('class' => array('odd', $bridge->row_class)));
         $bridge->addColumn($this->getTokenLinks($bridge))->class = 'rightAlign';
         $bridge->addSortable('gto_valid_from');
         $bridge->addSortable('gto_valid_until');
         $model->set('calc_round_description', 'tableDisplay', 'smallData');
         $bridge->addMultiSort('gsu_survey_name', 'calc_round_description')->colspan = 2;
 
-        $bridge->tr(array('class' => 'odd'));
+        $bridge->tr(array('class' => array('odd', $bridge->row_class)));
         $bridge->addColumn();
         $bridge->addSortable('gto_mail_sent_date');
         $bridge->addSortable('gto_completion_time');

Modified: trunk/library/classes/Gems/Default/SummaryAction.php
===================================================================
--- trunk/library/classes/Gems/Default/SummaryAction.php	2013-01-17 17:34:35 UTC (rev 1111)
+++ trunk/library/classes/Gems/Default/SummaryAction.php	2013-01-18 17:26:18 UTC (rev 1112)
@@ -94,6 +94,66 @@
      */
     public function createModel($detailed, $action)
     {
+        $select = $this->getSelect();
+        
+        // MUtil_Model::$verbose = true;
+        $model = new MUtil_Model_SelectModel($select, 'summary');
+
+        // Make sure of filter and sort for these fields
+        $model->set('gro_id_order');
+        $model->set('gsu_id_primary_group');
+        $model->set('gto_id_track');
+        $model->set('gto_id_organization');
+
+        $model->resetOrder();
+        $model->set('gro_round_description', 'label', $this->_('Round'));
+        $model->set('gsu_survey_name',       'label', $this->_('Survey'));
+        $model->set('answered', 'label', $this->_('Answered'), 'tdClass', 'centerAlign', 'thClass', 'centerAlign');
+        $model->set('missed',   'label', $this->_('Missed'),   'tdClass', 'centerAlign', 'thClass', 'centerAlign');
+        $model->set('open',     'label', $this->_('Open'),     'tdClass', 'centerAlign', 'thClass', 'centerAlign');
+        $model->set('total',    'label', $this->_('Total'),    'tdClass', 'centerAlign', 'thClass', 'centerAlign');
+        // $model->set('future',   'label', $this->_('Future'),   'tdClass', 'centerAlign', 'thClass', 'centerAlign');
+        // $model->set('unknown',  'label', $this->_('Unknown'),  'tdClass', 'centerAlign', 'thClass', 'centerAlign');
+        // $model->set('is',       'label', ' ',                  'tdClass', 'centerAlign', 'thClass', 'centerAlign');
+        // $model->set('success',  'label', $this->_('Success'),    'tdClass', 'centerAlign', 'thClass', 'centerAlign');
+        // $model->set('removed',  'label', $this->_('Removed'),  'tdClass', 'deleted centerAlign',
+        //         'thClass', 'centerAlign');
+
+        $model->set('gsu_id_primary_group',  'label', $this->_('Filler'),
+                'multiOptions', $this->util->getDbLookup()->getGroups());
+
+        $data = $this->util->getRequestCache('index')->getProgramParams();
+        if (isset($data['gto_id_track']) &&$data['gto_id_track']) {
+            // Add the period filter
+            if ($where = Gems_Snippets_AutosearchFormSnippet::getPeriodFilter($data, $this->db)) {
+                $select->joinInner('gems__respondent2track', 'gto_id_respondent_track = gr2t_id_respondent_track', array());
+                $model->addFilter(array($where));
+            }
+        } else {
+            $model->setFilter(array('1=0'));
+            $this->autofilterParameters['onEmpty'] = $this->_('No track selected...');
+        }
+
+        return $model;
+    }
+
+    /**
+     * Helper function to get the title for the index action.
+     *
+     * @return $string
+     */
+    public function getIndexTitle()
+    {
+        return $this->_('Summary');
+    }
+
+    /**
+     * Select creation function, allowes overruling in child classes
+     *
+     * @return Zend_Db_Select
+     */
+    public function getSelect()
+    {
         $select = $this->db->select();
 
         $fields['answered'] = new Zend_Db_Expr("SUM(
@@ -154,58 +214,10 @@
                         array('gsu_survey_name', 'gsu_id_primary_group'))
                 ->group(array('gro_id_order', 'gro_round_description', 'gsu_survey_name', 'gsu_id_primary_group'));
 
-        // MUtil_Model::$verbose = true;
-        $model = new MUtil_Model_SelectModel($select, 'summary');
-
-        // Make sure of filter and sort for these fields
-        $model->set('gro_id_order');
-        $model->set('gsu_id_primary_group');
-        $model->set('gto_id_track');
-        $model->set('gto_id_organization');
-
-        $model->resetOrder();
-        $model->set('gro_round_description', 'label', $this->_('Round'));
-        $model->set('gsu_survey_name',       'label', $this->_('Survey'));
-        $model->set('answered', 'label', $this->_('Answered'), 'tdClass', 'centerAlign', 'thClass', 'centerAlign');
-        $model->set('missed',   'label', $this->_('Missed'),   'tdClass', 'centerAlign', 'thClass', 'centerAlign');
-        $model->set('open',     'label', $this->_('Open'),     'tdClass', 'centerAlign', 'thClass', 'centerAlign');
-        $model->set('total',    'label', $this->_('Total'),    'tdClass', 'centerAlign', 'thClass', 'centerAlign');
-        // $model->set('future',   'label', $this->_('Future'),   'tdClass', 'centerAlign', 'thClass', 'centerAlign');
-        // $model->set('unknown',  'label', $this->_('Unknown'),  'tdClass', 'centerAlign', 'thClass', 'centerAlign');
-        // $model->set('is',       'label', ' ',                  'tdClass', 'centerAlign', 'thClass', 'centerAlign');
-        // $model->set('success',  'label', $this->_('Success'),    'tdClass', 'centerAlign', 'thClass', 'centerAlign');
-        // $model->set('removed',  'label', $this->_('Removed'),  'tdClass', 'deleted centerAlign',
-        //         'thClass', 'centerAlign');
-
-        $model->set('gsu_id_primary_group',  'label', $this->_('Filler'),
-                'multiOptions', $this->util->getDbLookup()->getGroups());
-
-        $data = $this->util->getRequestCache('index')->getProgramParams();
-        if (isset($data['gto_id_track'])) {
-            // Add the period filter
-            if ($where = Gems_Snippets_AutosearchFormSnippet::getPeriodFilter($data, $this->db)) {
-                $select->joinInner('gems__respondent2track', 'gto_id_respondent_track = gr2t_id_respondent_track', array());
-                $model->addFilter(array($where));
-            }
-        } else {
-            $model->setFilter(array('1=0'));
-            $this->autofilterParameters['onEmpty'] = $this->_('No track selected...');
-        }
-
-        return $model;
+        return $select;
     }
 
     /**
-     * Helper function to get the title for the index action.
-     *
-     * @return $string
-     */
-    public function getIndexTitle()
-    {
-        return $this->_('Summary');
-    }
-
-    /**
      * Helper function to allow generalized statements about the items in the model.
      *
      * @param int $count

Modified: trunk/library/classes/Gems/Default/TokenPlanAction.php
===================================================================
--- trunk/library/classes/Gems/Default/TokenPlanAction.php	2013-01-17 17:34:35 UTC (rev 1111)
+++ trunk/library/classes/Gems/Default/TokenPlanAction.php	2013-01-18 17:26:18 UTC (rev 1112)
@@ -45,13 +45,6 @@
  */
 class Gems_Default_TokenPlanAction extends Gems_Controller_BrowseEditAction
 {
-    public $defaultPeriodEnd   = 2;
-    public $defaultPeriodStart = -4;
-    public $defaultPeriodType  = 'W';
-
-    public $maxPeriod = 15;
-    public $minPeriod = -15;
-
     public $sortKey = array(
         'gto_valid_from'          => SORT_ASC,
         'gto_mail_sent_date'      => SORT_ASC,
@@ -69,6 +62,8 @@
 
         // Row with dates and patient data
         $bridge->gtr_track_type; // Data needed for buttons
+        
+        $bridge->tr()->appendAttrib('class', $bridge->row_class);
 
         $bridge->setDefaultRowClass(MUtil_Html_TableElement::createAlternateRowClass('even', 'even', 'odd', 'odd'));
         $bridge->addColumn($this->getTokenLinks($bridge), ' ')->rowspan = 2; // Space needed because TableElement does not look at rowspans
@@ -224,55 +219,25 @@
             $elements[] = null; // break into separate spans
         }
 
-        // Create date range elements
-        $min  = $this->minPeriod;
-        $max  = $this->maxPeriod;
-        $size = max(strlen($min), strlen($max));
-
-        $options = array(
+        $dates = array(
             'gto_valid_from'      => $this->_('Valid from'),
             'gto_valid_until'     => $this->_('Valid until'),
             'gto_mail_sent_date'  => $this->_('E-Mailed on'),
             'gto_completion_time' => $this->_('Completion date'),
             );
-        $element = $this->_createSelectElement('date_used', $options);
-        $element->class = 'minimal';
+
+        $element = $this->_createSelectElement('dateused', $dates);
         $element->setLabel($this->_('For date'));
         $elements[] = $element;
 
-        $element = new Zend_Form_Element_Text('period_start', array('label' => $this->_('from'), 'size' => $size - 1, 'maxlength' => $size, 'class' => 'rightAlign'));
-        $element->addValidator(new Zend_Validate_Int());
-        $element->addValidator(new Zend_Validate_Between($min, $max));
-        $elements[] = $element;
+        $options = array();
+        $options['label'] = $this->_('from');
+        MUtil_Model_FormBridge::applyFixedOptions('date', $options);
+        $elements[] = new Gems_JQuery_Form_Element_DatePicker('datefrom', $options);
 
-        $element = new Zend_Form_Element_Text('period_end', array('label' => $this->_('until'), 'size' => $size - 1, 'maxlength' => $size, 'class' => 'rightAlign'));
-        $element->addValidator(new Zend_Validate_Int());
-        $element->addValidator(new Zend_Validate_Between($min, $max));
-        $elements[] = $element;
+        $options['label'] = ' ' . $this->_('until');
+        $elements[] = new Gems_JQuery_Form_Element_DatePicker('dateuntil', $options);
 
-        $options = array(
-            'D' => $this->_('days'),
-            'W' => $this->_('weeks'),
-            'M' => $this->_('months'),
-            'Y' => $this->_('years'),
-            );
-        $element = $this->_createSelectElement('date_type', $options);
-        $element->class = 'minimal';
-        $elements[] = $element;
-
-        $joptions['change'] = new Zend_Json_Expr('function(e, ui) {
-jQuery("#period_start").attr("value", ui.values[0]);
-jQuery("#period_end"  ).attr("value", ui.values[1]).trigger("keyup");
-
-}');
-        $joptions['min']    = $this->minPeriod;
-        $joptions['max']    = $this->maxPeriod;
-        $joptions['range']  = true;
-        $joptions['values'] = new Zend_Json_Expr('[jQuery("#period_start").attr("value"), jQuery("#period_end").attr("value")]');
-
-        $element = new ZendX_JQuery_Form_Element_Slider('period', array('class' => 'periodSlider', 'jQueryParams' => $joptions));
-        $elements[] = $element;
-
         $elements[] = null; // break into separate spans
 
 
@@ -319,12 +284,14 @@
 
         $options = array(
             'all'       => $this->_('(all actions)'),
+            'open'      => $this->_('Open'),
             'notmailed' => $this->_('Not emailed'),
             'tomail'    => $this->_('To email'),
             'toremind'  => $this->_('Needs reminder'),
             'toanswer'  => $this->_('Yet to Answer'),
             'answered'  => $this->_('Answered'),
             'missed'    => $this->_('Missed'),
+            'removed'   => $this->_('Removed'),
             );
         $elements[] = $this->_createSelectElement('main_filter', $options);
 
@@ -368,6 +335,9 @@
 
         //Add default filter
         $filter = array();
+        if ($where = Gems_Snippets_AutosearchFormSnippet::getPeriodFilter($data, $this->db)) {
+            $filter[] = $where;
+        }
         $filter['gto_id_organization'] = isset($data['gto_id_organization']) ? $data['gto_id_organization'] : $this->escort->getCurrentOrganization(); // Is overruled when set in param
         $filter['gtr_active']  = 1;
         $filter['gsu_active']  = 1;
@@ -375,24 +345,26 @@
 
         if (isset($data['main_filter'])) {
             switch ($data['main_filter']) {
-                case 'notmailed':
-                    $filter['gto_mail_sent_date'] = null;
-                    $filter[] = '(gto_valid_until IS NULL OR gto_valid_until >= CURRENT_TIMESTAMP)';
+                case 'answered':
+                    $filter[] = 'gto_completion_time IS NOT NULL';
+                    break;
+
+                case 'missed':
+                    $filter[] = 'gto_valid_from <= CURRENT_TIMESTAMP';
+                    $filter[] = 'gto_valid_until < CURRENT_TIMESTAMP';
                     $filter['gto_completion_time'] = null;
                     break;
 
-                case 'tomail':
-                    $filter[] = "grs_email IS NOT NULL AND grs_email != '' AND ggp_respondent_members = 1";
+                case 'notmailed':
                     $filter['gto_mail_sent_date'] = null;
                     $filter[] = '(gto_valid_until IS NULL OR gto_valid_until >= CURRENT_TIMESTAMP)';
                     $filter['gto_completion_time'] = null;
                     break;
 
-                case 'toremind':
-                    // $filter['can_email'] = 1;
-                    $filter[] = 'gto_mail_sent_date < CURRENT_TIMESTAMP';
-                    $filter[] = '(gto_valid_until IS NULL OR gto_valid_until >= CURRENT_TIMESTAMP)';
+                case 'open':
                     $filter['gto_completion_time'] = null;
+                    $filter[] = 'gto_valid_from <= CURRENT_TIMESTAMP';
+                    $filter[] = '(gto_valid_until >= CURRENT_TIMESTAMP OR gto_valid_until IS NULL)';
                     break;
 
                 // case 'other':
@@ -401,20 +373,28 @@
                 //    $filter[] = '(gto_valid_until IS NULL OR gto_valid_until >= CURRENT_TIMESTAMP)';
                 //    break;
 
-                case 'missed':
-                    $filter[] = 'gto_valid_from <= CURRENT_TIMESTAMP';
-                    $filter[] = 'gto_valid_until < CURRENT_TIMESTAMP';
-                    $filter['gto_completion_time'] = null;
+                case 'removed':
+                    $filter['grc_success'] = 0;
                     break;
 
-                case 'answered':
-                    $filter[] = 'gto_completion_time IS NOT NULL';
-                    break;
-
                 case 'toanswer':
                     $filter[] = 'gto_completion_time IS NULL';
                     break;
 
+                case 'tomail':
+                    $filter[] = "grs_email IS NOT NULL AND grs_email != '' AND ggp_respondent_members = 1";
+                    $filter['gto_mail_sent_date'] = null;
+                    $filter[] = '(gto_valid_until IS NULL OR gto_valid_until >= CURRENT_TIMESTAMP)';
+                    $filter['gto_completion_time'] = null;
+                    break;
+
+                case 'toremind':
+                    // $filter['can_email'] = 1;
+                    $filter[] = 'gto_mail_sent_date < CURRENT_TIMESTAMP';
+                    $filter[] = '(gto_valid_until IS NULL OR gto_valid_until >= CURRENT_TIMESTAMP)';
+                    $filter['gto_completion_time'] = null;
+                    break;
+
                 default:
                     break;
 
@@ -454,12 +434,15 @@
 
     public function getDefaultSearchData()
     {
+        $options  = array();
+        MUtil_Model_FormBridge::applyFixedOptions('date', $options);
+        $inFormat = isset($options['dateFormat']) ? $options['dateFormat'] : null;
+        $now      = new MUtil_Date();
+
         return array(
-            'date_used'           => 'gto_valid_from',
-            'date_type'           => $this->defaultPeriodType,
+            'datefrom'            => $now->toString($inFormat),
+            'dateused'            => 'gto_valid_from',
             'gto_id_organization' => $this->escort->getCurrentOrganization(),
-            'period_start'        => $this->defaultPeriodStart,
-            'period_end'          => $this->defaultPeriodEnd,
             'main_filter'         => 'all',
         );
     }

Modified: trunk/library/classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php	2013-01-17 17:34:35 UTC (rev 1111)
+++ trunk/library/classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php	2013-01-18 17:26:18 UTC (rev 1112)
@@ -58,7 +58,7 @@
     protected function getAutoSearchElements(array $data)
     {
         $elements[] = $this->_createSelectElement('gr2t_id_track',
-                $this->util->getTrackData()->getAllTracks(),
+                $this->util->getTrackData()->getSteppedTracks(),
                 $this->_('(select a track)'));
 
         $elements[] = $this->_createSelectElement('gr2t_id_organization',

Modified: trunk/library/classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php	2013-01-17 17:34:35 UTC (rev 1111)
+++ trunk/library/classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php	2013-01-18 17:26:18 UTC (rev 1112)
@@ -58,7 +58,7 @@
     protected function getAutoSearchElements(array $data)
     {
         $elements[] = $this->_createSelectElement('gto_id_track',
-                $this->util->getTrackData()->getAllTracks(),
+                $this->util->getTrackData()->getSteppedTracks(),
                 $this->_('(select a track)'));
 
         $elements[] = $this->_createSelectElement('gto_id_organization',

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

Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po	2013-01-17 17:34:35 UTC (rev 1111)
+++ trunk/library/languages/default-en.po	2013-01-18 17:26:18 UTC (rev 1112)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: GemsTracker EN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-16 19:26+0100\n"
+"POT-Creation-Date: 2013-01-18 17:59+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Matijs de Jong <mj...@ma...>\n"
 "Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -329,15 +329,15 @@
 #: classes/Gems/Menu.php:323 classes/Gems/Menu.php:423
 #: classes/Gems/Email/EmailFormAbstract.php:280
 #: classes/Gems/Email/EmailFormAbstract.php:291
-#: classes/Gems/Menu/MenuAbstract.php:383
-#: classes/Gems/Menu/MenuAbstract.php:396
+#: classes/Gems/Menu/MenuAbstract.php:386
+#: classes/Gems/Menu/MenuAbstract.php:399
 msgid "Preview"
 msgstr "Preview"
 
 #: classes/Gems/Menu.php:332 classes/Gems/Default/ExportAction.php:149
 #: classes/Gems/Default/TrackMaintenanceAction.php:336
-#: classes/Gems/Menu/MenuAbstract.php:392
-#: classes/Gems/Menu/MenuAbstract.php:474 snippets/AddTracksSnippet.php:238
+#: classes/Gems/Menu/MenuAbstract.php:395
+#: classes/Gems/Menu/MenuAbstract.php:477 snippets/AddTracksSnippet.php:238
 msgid "Tracks"
 msgstr "Tracks"
 
@@ -355,8 +355,8 @@
 
 #: classes/Gems/Menu.php:377
 #: classes/Gems/Default/SurveyMaintenanceAction.php:586
-#: classes/Gems/Menu/MenuAbstract.php:399
-#: classes/Gems/Menu/MenuAbstract.php:461
+#: classes/Gems/Menu/MenuAbstract.php:402
+#: classes/Gems/Menu/MenuAbstract.php:464
 #: classes/Gems/Tracker/Model/TrackModel.php:100
 msgid "Surveys"
 msgstr "Surveys"
@@ -388,7 +388,7 @@
 msgid "Overview"
 msgstr "Overview"
 
-#: classes/Gems/Menu.php:593 classes/Gems/Menu/MenuAbstract.php:356
+#: classes/Gems/Menu.php:593 classes/Gems/Menu/MenuAbstract.php:359
 msgid "Project"
 msgstr "Project"
 
@@ -418,7 +418,7 @@
 msgid "Changelog"
 msgstr "Changelog"
 
-#: classes/Gems/Model.php:212 classes/Gems/Default/ComplianceAction.php:84
+#: classes/Gems/Model.php:212 classes/Gems/Default/ComplianceAction.php:86
 #: classes/Gems/Tracker/Model/StandardTokenModel.php:213
 msgid "Respondent nr"
 msgstr "Patient nr"
@@ -476,7 +476,7 @@
 #: classes/Gems/Default/SourceAction.php:195
 #: classes/Gems/Default/StaffAction.php:328
 #: classes/Gems/Default/SurveyMaintenanceAction.php:435
-#: classes/Gems/Default/TokenPlanAction.php:121
+#: classes/Gems/Default/TokenPlanAction.php:116
 #: classes/Gems/Default/TrackFieldsAction.php:98
 #: classes/Gems/Default/TrackMaintenanceAction.php:249
 #: classes/Gems/Snippets/TokenPlanTableSnippet.php:60
@@ -549,7 +549,7 @@
 msgstr "Trying upgrade for %s to level %s: %s"
 
 #: classes/Gems/Controller/BrowseEditAction.php:357
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:239
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:261
 #: classes/Gems/Default/StaffAction.php:228
 #: classes/Gems/Snippets/ModelFormSnippetAbstract.php:186
 #, php-format
@@ -557,7 +557,7 @@
 msgstr "New %s..."
 
 #: classes/Gems/Controller/BrowseEditAction.php:390
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:259
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:281
 #: classes/Gems/Default/TrackFieldsAction.php:130
 #: classes/Gems/Default/TrackRoundsAction.php:171
 #, php-format
@@ -580,19 +580,19 @@
 msgstr "Edit %s %s"
 
 #: classes/Gems/Controller/BrowseEditAction.php:413
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:269
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:291
 #: classes/Gems/Snippets/ModelFormSnippetAbstract.php:188
 #, php-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
 #: classes/Gems/Controller/BrowseEditAction.php:516
-#: classes/Gems/Snippets/AutosearchFormSnippet.php:166
+#: classes/Gems/Snippets/AutosearchFormSnippet.php:249
 msgid "Free search text"
 msgstr "Free search text"
 
 #: classes/Gems/Controller/BrowseEditAction.php:587
-#: classes/Gems/Snippets/AutosearchFormSnippet.php:241
+#: classes/Gems/Snippets/AutosearchFormSnippet.php:324
 msgid "Search"
 msgstr "Search"
 
@@ -709,26 +709,26 @@
 msgid "Cancel"
 msgstr "Cancel"
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:249
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:271
 #, php-format
 msgid "Do you want to delete this %s?"
 msgstr "Do you want to delete this %s?"
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:282
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:304
 msgid "No data found."
 msgstr "No data found."
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:344
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:366
 #, php-format
 msgid "No %s found..."
 msgstr "No %s found..."
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:354
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:376
 #, php-format
 msgid "Showing %s"
 msgstr "Showing %s"
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:390
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:412
 #: classes/Gems/Default/OptionAction.php:181
 #: classes/MUtil/Snippets/ModelFormSnippetAbstract.php:341
 msgid "item"
@@ -808,19 +808,24 @@
 msgid "The survey for token %s is no longer active."
 msgstr "The survey for token %s is no longer active."
 
-#: classes/Gems/Default/ComplianceAction.php:85
+#: classes/Gems/Default/ComplianceAction.php:87
 msgid "Start date"
 msgstr "Start date"
 
-#: classes/Gems/Default/ComplianceAction.php:86
+#: classes/Gems/Default/ComplianceAction.php:88
 msgid "End date"
 msgstr "End date"
 
-#: classes/Gems/Default/ComplianceAction.php:98
+#: classes/Gems/Default/ComplianceAction.php:93
+#: classes/Gems/Default/SummaryAction.php:192
+msgid "No track selected..."
+msgstr "No track selected..."
+
+#: classes/Gems/Default/ComplianceAction.php:173
 msgid "Compliance"
 msgstr "Compliance"
 
-#: classes/Gems/Default/ComplianceAction.php:109
+#: classes/Gems/Default/ComplianceAction.php:184
 #: classes/Gems/Default/ProjectTracksAction.php:85
 #: classes/Gems/Default/TrackAction.php:452
 #: classes/Gems/Default/TrackMaintenanceAction.php:331
@@ -1221,7 +1226,7 @@
 #: classes/Gems/Default/ExportAction.php:154
 #: classes/Gems/Default/MailJobAction.php:100
 #: classes/Gems/Default/ProjectSurveysAction.php:67
-#: classes/Gems/Default/SummaryAction.php:155
+#: classes/Gems/Default/SummaryAction.php:168
 #: classes/Gems/Default/SurveyAction.php:201
 #: classes/Gems/Email/OneMailForm.php:57
 #: classes/Gems/Export/RespondentExport.php:156
@@ -1429,32 +1434,30 @@
 msgstr "Invalid language setting."
 
 #: classes/Gems/Default/LogAction.php:78
-#: classes/Gems/Default/TokenPlanAction.php:243
+#: classes/Gems/Default/TokenPlanAction.php:234
+#: classes/Gems/Snippets/AutosearchFormSnippet.php:125
 msgid "from"
 msgstr "from"
 
 #: classes/Gems/Default/LogAction.php:83
-#: classes/Gems/Default/TokenPlanAction.php:248
+#: classes/Gems/Default/TokenPlanAction.php:238
+#: classes/Gems/Snippets/AutosearchFormSnippet.php:141
 msgid "until"
 msgstr "until"
 
 #: classes/Gems/Default/LogAction.php:89
-#: classes/Gems/Default/TokenPlanAction.php:254
 msgid "days"
 msgstr "days"
 
 #: classes/Gems/Default/LogAction.php:90
-#: classes/Gems/Default/TokenPlanAction.php:255
 msgid "weeks"
 msgstr "weeks"
 
 #: classes/Gems/Default/LogAction.php:91
-#: classes/Gems/Default/TokenPlanAction.php:256
 msgid "months"
 msgstr "months"
 
 #: classes/Gems/Default/LogAction.php:92
-#: classes/Gems/Default/TokenPlanAction.php:257
 msgid "years"
 msgstr "years"
 
@@ -1509,7 +1512,7 @@
 msgstr "Message"
 
 #: classes/Gems/Default/LogAction.php:198
-#: classes/Gems/Default/TokenPlanAction.php:116
+#: classes/Gems/Default/TokenPlanAction.php:111
 #: classes/Gems/Snippets/TokenPlanTableSnippet.php:55
 #: snippets/RespondentDetailsSnippet.php:74
 #: snippets/RespondentDetailsWithAssignmentsSnippet.php:148
@@ -2055,7 +2058,7 @@
 msgstr "Session content"
 
 #: classes/Gems/Default/ProjectInformationAction.php:226
-#: classes/Gems/Menu/MenuAbstract.php:357
+#: classes/Gems/Menu/MenuAbstract.php:360
 msgid "Session"
 msgstr "Session"
 
@@ -2072,6 +2075,7 @@
 #: classes/Gems/Email/EmailFormAbstract.php:193
 #: classes/Gems/Email/EmailFormAbstract.php:251
 #: classes/Gems/Email/MailTemplateForm.php:81
+#: classes/Gems/Snippets/AutosearchFormSnippet.php:112
 #: classes/Gems/Tracker/Model/TrackModel.php:103
 msgid "From"
 msgstr "From"
@@ -2525,7 +2529,7 @@
 msgstr[1] "sources"
 
 #: classes/Gems/Default/SourceAction.php:249
-#: classes/Gems/Menu/MenuAbstract.php:452
+#: classes/Gems/Menu/MenuAbstract.php:455
 msgid "Survey Sources"
 msgstr "Survey Sources"
 
@@ -2607,61 +2611,49 @@
 msgid "You are not allowed to change this password."
 msgstr "You are not allowed to change this password."
 
-#: classes/Gems/Default/SummaryAction.php:154
+#: classes/Gems/Default/SummaryAction.php:167
 #: classes/Gems/Email/OneMailForm.php:55
 #: classes/Gems/Export/RespondentExport.php:157
-#: classes/Gems/Menu/MenuAbstract.php:497
+#: classes/Gems/Menu/MenuAbstract.php:500
 #: classes/Gems/Tracker/Model/StandardTokenModel.php:196
 msgid "Round"
 msgstr "Round"
 
-#: classes/Gems/Default/SummaryAction.php:156
-msgid "Filler"
-msgstr "Filler"
-
-#: classes/Gems/Default/SummaryAction.php:159
-#: classes/Gems/Default/TokenPlanAction.php:326
+#: classes/Gems/Default/SummaryAction.php:169
+#: classes/Gems/Default/TokenPlanAction.php:292
 #: classes/Gems/Selector/TokenByGroupDateSelector.php:139
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceTableSnippet.php:149
 msgid "Answered"
 msgstr "Answered"
 
-#: classes/Gems/Default/SummaryAction.php:160
-#: classes/Gems/Default/TokenPlanAction.php:327
+#: classes/Gems/Default/SummaryAction.php:170
+#: classes/Gems/Default/TokenPlanAction.php:293
 #: classes/Gems/Selector/TokenByGroupDateSelector.php:129
 #: classes/Gems/Tracker/Token.php:1038
 #: snippets/RespondentTokenTabsSnippet.php:68
 msgid "Missed"
 msgstr "Missed"
 
-#: classes/Gems/Default/SummaryAction.php:161
+#: classes/Gems/Default/SummaryAction.php:171
+#: classes/Gems/Default/TokenPlanAction.php:287
 #: classes/Gems/Tracker/Token.php:1044
 msgid "Open"
 msgstr "Open"
 
-#: classes/Gems/Default/SummaryAction.php:162
-#: classes/Gems/Tracker/Token.php:1040 classes/Gems/Tracker/Token.php:1042
-msgid "Future"
-msgstr "Future"
+#: classes/Gems/Default/SummaryAction.php:172
+msgid "Total"
+msgstr "Total"
 
-#: classes/Gems/Default/SummaryAction.php:163
-#: classes/Gems/Util/Translated.php:233
-msgid "Unknown"
-msgstr "Unknown"
+#: classes/Gems/Default/SummaryAction.php:180
+msgid "Filler"
+msgstr "Filler"
 
-#: classes/Gems/Default/SummaryAction.php:165
-msgid "Success"
-msgstr "Success"
-
-#: classes/Gems/Default/SummaryAction.php:166
-msgid "Removed"
-msgstr "Removed"
-
-#: classes/Gems/Default/SummaryAction.php:179
+#: classes/Gems/Default/SummaryAction.php:205
 msgid "Summary"
 msgstr "Summary"
 
-#: classes/Gems/Default/SummaryAction.php:190
-#: classes/Gems/Default/TokenPlanAction.php:480
+#: classes/Gems/Default/SummaryAction.php:216
+#: classes/Gems/Default/TokenPlanAction.php:463
 #: classes/Gems/Default/TrackAction.php:450
 #: classes/Gems/Tracker/Snippets/EditTokenSnippetAbstract.php:141
 msgid "token"
@@ -2893,98 +2885,106 @@
 msgid "Not used in tracks."
 msgstr "Not used in tracks."
 
-#: classes/Gems/Default/TokenPlanAction.php:117
+#: classes/Gems/Default/TokenPlanAction.php:112
 #: classes/Gems/Snippets/TokenPlanTableSnippet.php:56
 msgid "Round / Details"
 msgstr "Round / Details"
 
-#: classes/Gems/Default/TokenPlanAction.php:118
-#: classes/Gems/Default/TokenPlanAction.php:233
+#: classes/Gems/Default/TokenPlanAction.php:113
+#: classes/Gems/Default/TokenPlanAction.php:223
 #: classes/Gems/Snippets/TokenPlanTableSnippet.php:57
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:73
 #: classes/Gems/Tracker/Engine/StepEngineAbstract.php:385
 msgid "Valid from"
 msgstr "Valid from"
 
-#: classes/Gems/Default/TokenPlanAction.php:119
-#: classes/Gems/Default/TokenPlanAction.php:234
+#: classes/Gems/Default/TokenPlanAction.php:114
+#: classes/Gems/Default/TokenPlanAction.php:224
 #: classes/Gems/Snippets/TokenPlanTableSnippet.php:58
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:74
 #: classes/Gems/Tracker/Engine/StepEngineAbstract.php:386
 #: classes/Gems/Tracker/Model/StandardTokenModel.php:198
 msgid "Valid until"
 msgstr "Valid until"
 
-#: classes/Gems/Default/TokenPlanAction.php:120
+#: classes/Gems/Default/TokenPlanAction.php:115
 #: classes/Gems/Snippets/TokenPlanTableSnippet.php:59
 msgid "Contact date"
 msgstr "Contact date"
 
-#: classes/Gems/Default/TokenPlanAction.php:174
+#: classes/Gems/Default/TokenPlanAction.php:169
 #, php-format
 msgid "Email %s"
 msgstr "Email %s"
 
-#: classes/Gems/Default/TokenPlanAction.php:180
+#: classes/Gems/Default/TokenPlanAction.php:175
 msgid "No tokens found."
 msgstr "No tokens found."
 
-#: classes/Gems/Default/TokenPlanAction.php:235
+#: classes/Gems/Default/TokenPlanAction.php:225
 msgid "E-Mailed on"
 msgstr "E-Mailed on"
 
-#: classes/Gems/Default/TokenPlanAction.php:236
+#: classes/Gems/Default/TokenPlanAction.php:226
 msgid "Completion date"
 msgstr "Completion date"
 
-#: classes/Gems/Default/TokenPlanAction.php:240
+#: classes/Gems/Default/TokenPlanAction.php:230
+#: classes/Gems/Snippets/AutosearchFormSnippet.php:116
 msgid "For date"
 msgstr "For date"
 
-#: classes/Gems/Default/TokenPlanAction.php:287
+#: classes/Gems/Default/TokenPlanAction.php:252
 msgid "Select:"
 msgstr "Select:"
 
-#: classes/Gems/Default/TokenPlanAction.php:293
+#: classes/Gems/Default/TokenPlanAction.php:258
 msgid "(all tracks)"
 msgstr "(all tracks)"
 
-#: classes/Gems/Default/TokenPlanAction.php:304
+#: classes/Gems/Default/TokenPlanAction.php:269
 msgid "(all rounds)"
 msgstr "(all rounds)"
 
-#: classes/Gems/Default/TokenPlanAction.php:318
+#: classes/Gems/Default/TokenPlanAction.php:283
 msgid "(all surveys)"
 msgstr "(all surveys)"
 
-#: classes/Gems/Default/TokenPlanAction.php:321
+#: classes/Gems/Default/TokenPlanAction.php:286
 msgid "(all actions)"
 msgstr "(all actions)"
 
-#: classes/Gems/Default/TokenPlanAction.php:322
+#: classes/Gems/Default/TokenPlanAction.php:288
 msgid "Not emailed"
 msgstr "Not emailed"
 
-#: classes/Gems/Default/TokenPlanAction.php:323
+#: classes/Gems/Default/TokenPlanAction.php:289
 msgid "To email"
 msgstr "To email"
 
-#: classes/Gems/Default/TokenPlanAction.php:324
+#: classes/Gems/Default/TokenPlanAction.php:290
 msgid "Needs reminder"
 msgstr "Needs reminder"
 
-#: classes/Gems/Default/TokenPlanAction.php:325
+#: classes/Gems/Default/TokenPlanAction.php:291
 msgid "Yet to Answer"
 msgstr "Yet to Answer"
 
-#: classes/Gems/Default/TokenPlanAction.php:341
-#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:79
+#: classes/Gems/Default/TokenPlanAction.php:294
+msgid "Removed"
+msgstr "Removed"
+
+#: classes/Gems/Default/TokenPlanAction.php:308
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:88
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:90
 msgid "(all fillers)"
 msgstr "(all fillers)"
 
-#: classes/Gems/Default/TokenPlanAction.php:360
+#: classes/Gems/Default/TokenPlanAction.php:327
 msgid "(all staff)"
 msgstr "(all staff)"
 
-#: classes/Gems/Default/TokenPlanAction.php:471
+#: classes/Gems/Default/TokenPlanAction.php:454
 #: classes/Gems/Snippets/TokenModelSnippetAbstract.php:59
 #: classes/Gems/Snippets/TokenPlanTableSnippet.php:122
 #: snippets/BrowseSingleSurveyTokenSnippet.php:144
@@ -2992,7 +2992,7 @@
 msgid "+"
 msgstr "+"
 
-#: classes/Gems/Default/TokenPlanAction.php:485
+#: classes/Gems/Default/TokenPlanAction.php:468
 msgid "Token planning"
 msgstr "Token planning"
 
@@ -3219,7 +3219,7 @@
 msgstr[1] "fields"
 
 #: classes/Gems/Default/TrackFieldsAction.php:175
-#: classes/Gems/Menu/MenuAbstract.php:477
+#: classes/Gems/Menu/MenuAbstract.php:480
 msgid "Fields"
 msgstr "Fields"
 
@@ -3348,7 +3348,7 @@
 msgstr[1] "rounds"
 
 #: classes/Gems/Default/TrackRoundsAction.php:227
-#: classes/Gems/Menu/MenuAbstract.php:485
+#: classes/Gems/Menu/MenuAbstract.php:488
 msgid "Rounds"
 msgstr "Rounds"
 
@@ -3610,81 +3610,81 @@
 msgid "Track Summary"
 msgstr "Track Summary"
 
-#: classes/Gems/Menu/MenuAbstract.php:327
+#: classes/Gems/Menu/MenuAbstract.php:329
 msgid "Track Compliance"
 msgstr "Track Compliance"
 
-#: classes/Gems/Menu/MenuAbstract.php:330
+#: classes/Gems/Menu/MenuAbstract.php:333
 msgid "By period"
 msgstr "By period"
 
-#: classes/Gems/Menu/MenuAbstract.php:331
+#: classes/Gems/Menu/MenuAbstract.php:334
 msgid "By token"
 msgstr "By token"
 
-#: classes/Gems/Menu/MenuAbstract.php:332
+#: classes/Gems/Menu/MenuAbstract.php:335
 msgid "By respondent"
 msgstr "By patient"
 
-#: classes/Gems/Menu/MenuAbstract.php:336
+#: classes/Gems/Menu/MenuAbstract.php:339
 msgid "Bulk mail"
 msgstr "Bulk mail"
 
-#: classes/Gems/Menu/MenuAbstract.php:354
+#: classes/Gems/Menu/MenuAbstract.php:357
 msgid "Errors"
 msgstr "Errors"
 
-#: classes/Gems/Menu/MenuAbstract.php:355
+#: classes/Gems/Menu/MenuAbstract.php:358
 msgid "PHP"
 msgstr "PHP"
 
-#: classes/Gems/Menu/MenuAbstract.php:358
+#: classes/Gems/Menu/MenuAbstract.php:361
 msgid "Maintenance mode"
 msgstr "Maintenance mode"
 
-#: classes/Gems/Menu/MenuAbstract.php:359
+#: classes/Gems/Menu/MenuAbstract.php:362
 msgid "Clean cache"
 msgstr "Clean cache"
 
-#: classes/Gems/Menu/MenuAbstract.php:426
+#: classes/Gems/Menu/MenuAbstract.php:429
 msgid "Reset password"
 msgstr "Reset password"
 
-#: classes/Gems/Menu/MenuAbstract.php:453
+#: classes/Gems/Menu/MenuAbstract.php:456
 msgid "Check status"
 msgstr "Check status"
 
-#: classes/Gems/Menu/MenuAbstract.php:454
+#: classes/Gems/Menu/MenuAbstract.php:457
 msgid "Synchronize surveys"
 msgstr "Synchronize surveys"
 
-#: classes/Gems/Menu/MenuAbstract.php:455
-#: classes/Gems/Menu/MenuAbstract.php:468
+#: classes/Gems/Menu/MenuAbstract.php:458
+#: classes/Gems/Menu/MenuAbstract.php:471
 msgid "Check is answered"
 msgstr "Check is answered"
 
-#: classes/Gems/Menu/MenuAbstract.php:456
+#: classes/Gems/Menu/MenuAbstract.php:459
 msgid "Check attributes"
 msgstr "Check attributes"
 
-#: classes/Gems/Menu/MenuAbstract.php:457
+#: classes/Gems/Menu/MenuAbstract.php:460
 msgid "Synchronize all surveys"
 msgstr "Synchronize all surveys"
 
-#: classes/Gems/Menu/MenuAbstract.php:458
-#: classes/Gems/Menu/MenuAbstract.php:469
+#: classes/Gems/Menu/MenuAbstract.php:461
+#: classes/Gems/Menu/MenuAbstract.php:472
 msgid "Check all is answered"
 msgstr "Check all is answered"
 
-#: classes/Gems/Menu/MenuAbstract.php:465
+#: classes/Gems/Menu/MenuAbstract.php:468
 msgid "PDF"
 msgstr "PDF"
 
-#: classes/Gems/Menu/MenuAbstract.php:503
+#: classes/Gems/Menu/MenuAbstract.php:506
 msgid "Check assignments"
 msgstr "Check assignments"
 
-#: classes/Gems/Menu/MenuAbstract.php:506
+#: classes/Gems/Menu/MenuAbstract.php:509
 msgid "Check all assignments"
 msgstr "Check all assignments"
 
@@ -3794,6 +3794,7 @@
 msgstr "Y"
 
 #: classes/Gems/Selector/DateSelectorAbstract.php:563
+#: classes/Gems/Snippets/Tracker/Summary/SummaryTableSnippet.php:128
 #: classes/Gems/Util/Translated.php:81
 msgid "-"
 msgstr "n/a"
@@ -3911,11 +3912,43 @@
 msgid "(select a track)"
 msgstr "(select a track)"
 
-#: classes/Gems/Snippets/Tracker/Compliance/ComplianceTableSnippet.php:178
-#: classes/Gems/Snippets/Tracker/Summary/SummaryTableSnippet.php:124
-msgid "No track selected..."
-msgstr "No track selected..."
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:71
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:71
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:370
+msgid "Track start"
+msgstr "Track start"
 
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:72
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:72
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:371
+msgid "Track end"
+msgstr "Track end"
+
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceTableSnippet.php:151
+msgid "Missed deadline"
+msgstr "Missed deadline"
+
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceTableSnippet.php:153
+msgid "Open - can be answered now"
+msgstr "Open - can be answered now"
+
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceTableSnippet.php:155
+msgid "Valid from date unknown"
+msgstr "Valid from date unknown"
+
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceTableSnippet.php:157
+msgid "Valid from date in the future"
+msgstr "Valid from date in the future"
+
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceTableSnippet.php:159
+msgid "Token does not exist"
+msgstr "Token does not exist"
+
+#: classes/Gems/Snippets/Tracker/Summary/SummaryTableSnippet.php:126
+#, php-format
+msgid "%d%%"
+msgstr "%d%%"
+
 #: classes/Gems/Task/Db/ExecutePatch.php:66
 #, php-format
 msgid "Executing patchlevel %d"
@@ -4000,6 +4033,10 @@
 msgid "Completed"
 msgstr "Completed"
 
+#: classes/Gems/Tracker/Token.php:1040 classes/Gems/Tracker/Token.php:1042
+msgid "Future"
+msgstr "Future"
+
 #: classes/Gems/Tracker/Batch/SynchronizeSourcesBatch.php:135
 msgid "No surveys were changed."
 msgstr "No surveys were changed."
@@ -4051,14 +4088,6 @@
 msgid "This track type does not allow the creation of new rounds."
 msgstr "This track type does not allow the creation of new rounds."
 
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:370
-msgid "Track start"
-msgstr "Track start"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:371
-msgid "Track end"
-msgstr "Track end"
-
 #: classes/Gems/Tracker/Engine/StepEngineAbstract.php:387
 msgid "Start time"
 msgstr "Start time"
@@ -4772,6 +4801,10 @@
 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:233
+msgid "Unknown"
+msgstr "Unknown"
+
 #: classes/Gems/Util/Translated.php:246
 msgid "mr."
 msgstr "Mr."
@@ -5250,8 +5283,8 @@
 msgstr[1] ""
 "After this survey there are another %d surveys we would like you to answer."
 
-#~ msgid "Survey can be answered until %s."
-#~ msgstr "Survey can be answered until %s."
+#~ msgid "Success"
+#~ msgstr "Success"
 
 #~ msgid "Survey must be answered tomorrow!"
 #~ msgstr "Survey must be answered tomorrow!"
@@ -5328,9 +5361,6 @@
 #~ msgid "Dear {greeting},"
 #~ msgstr "Dear {greeting},"
 
-#~ msgid "The token %s does not exist."
-#~ msgstr "The token %s does not exist."
-
 #~ msgid ""
 #~ "After answering the survey you will return to the respondent overview "
 #~ "screen."

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

Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po	2013-01-17 17:34:35 UTC (rev 1111)
+++ trunk/library/languages/default-nl.po	2013-01-18 17:26:18 UTC (rev 1112)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: GemsTracker NL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-16 19:27+0100\n"
+"POT-Creation-Date: 2013-01-18 17:59+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Matijs de Jong <mj...@ma...>\n"
 "Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -329,15 +329,15 @@
 #: classes/Gems/Menu.php:323 classes/Gems/Menu.php:423
 #: classes/Gems/Email/EmailFormAbstract.php:280
 #: classes/Gems/Email/EmailFormAbstract.php:291
-#: classes/Gems/Menu/MenuAbstract.php:383
-#: classes/Gems/Menu/MenuAbstract.php:396
+#: classes/Gems/Menu/MenuAbstract.php:386
+#: classes/Gems/Menu/MenuAbstract.php:399
 msgid "Preview"
 msgstr "Preview"
 
 #: classes/Gems/Menu.php:332 classes/Gems/Default/ExportAction.php:149
 #: classes/Gems/Default/TrackMaintenanceAction.php:336
-#: classes/Gems/Menu/MenuAbstract.php:392
-#: classes/Gems/Menu/MenuAbstract.php:474 snippets/AddTracksSnippet.php:238
+#: classes/Gems/Menu/MenuAbstract.php:395
+#: classes/Gems/Menu/MenuAbstract.php:477 snippets/AddTracksSnippet.php:238
 msgid "Tracks"
 msgstr "Trajecten"
 
@@ -355,8 +355,8 @@
 
 #: classes/Gems/Menu.php:377
 #: classes/Gems/Default/SurveyMaintenanceAction.php:586
-#: classes/Gems/Menu/MenuAbstract.php:399
-#: classes/Gems/Menu/MenuAbstract.php:461
+#: classes/Gems/Menu/MenuAbstract.php:402
+#: classes/Gems/Menu/MenuAbstract.php:464
 #: classes/Gems/Tracker/Model/TrackModel.php:100
 msgid "Surveys"
 msgstr "Vragenlijsten"
@@ -388,7 +388,7 @@
 msgid "Overview"
 msgstr "Overzicht"
 
-#: classes/Gems/Menu.php:593 classes/Gems/Menu/MenuAbstract.php:356
+#: classes/Gems/Menu.php:593 classes/Gems/Menu/MenuAbstract.php:359
 msgid "Project"
 msgstr "Project"
 
@@ -418,7 +418,7 @@
 msgid "Changelog"
 msgstr "Changelog"
 
-#: classes/Gems/Model.php:212 classes/Gems/Default/ComplianceAction.php:84
+#: classes/Gems/Model.php:212 classes/Gems/Default/ComplianceAction.php:86
 #: classes/Gems/Tracker/Model/StandardTokenModel.php:213
 msgid "Respondent nr"
 msgstr "Patiënt nr"
@@ -476,7 +476,7 @@
 #: classes/Gems/Default/SourceAction.php:195
 #: classes/Gems/Default/StaffAction.php:328
 #: classes/Gems/Default/SurveyMaintenanceAction.php:435
-#: classes/Gems/Default/TokenPlanAction.php:121
+#: classes/Gems/Default/TokenPlanAction.php:116
 #: classes/Gems/Default/TrackFieldsAction.php:98
 #: classes/Gems/Default/TrackMaintenanceAction.php:249
 #: classes/Gems/Snippets/TokenPlanTableSnippet.php:60
@@ -549,7 +549,7 @@
 msgstr "Probeert upgrade voor %s naar niveau %s: %s"
 
 #: classes/Gems/Controller/BrowseEditAction.php:357
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:239
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:261
 #: classes/Gems/Default/StaffAction.php:228
 #: classes/Gems/Snippets/ModelFormSnippetAbstract.php:186
 #, php-format
@@ -557,7 +557,7 @@
 msgstr "Nieuwe %s..."
 
 #: classes/Gems/Controller/BrowseEditAction.php:390
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:259
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:281
 #: classes/Gems/Default/TrackFieldsAction.php:130
 #: classes/Gems/Default/TrackRoundsAction.php:171
 #, php-format
@@ -580,19 +580,19 @@
 msgstr "Bewerk %s %s"
 
 #: classes/Gems/Controller/BrowseEditAction.php:413
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:269
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:291
 #: classes/Gems/Snippets/ModelFormSnippetAbstract.php:188
 #, php-format
 msgid "Edit %s"
 msgstr "Bewerk %s"
 
 #: classes/Gems/Controller/BrowseEditAction.php:516
-#: classes/Gems/Snippets/AutosearchFormSnippet.php:166
+#: classes/Gems/Snippets/AutosearchFormSnippet.php:249
 msgid "Free search text"
 msgstr "Vrije zoek tekst"
 
 #: classes/Gems/Controller/BrowseEditAction.php:587
-#: classes/Gems/Snippets/AutosearchFormSnippet.php:241
+#: classes/Gems/Snippets/AutosearchFormSnippet.php:324
 msgid "Search"
 msgstr "Zoeken"
 
@@ -709,26 +709,26 @@
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:249
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:271
 #, 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
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:304
 msgid "No data found."
 msgstr "Geen gegevens gevonden."
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:344
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:366
 #, php-format
 msgid "No %s found..."
 msgstr "Geen %s gevonden..."
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:354
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:376
 #, php-format
 msgid "Showing %s"
 msgstr "Toon %s"
 
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:390
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:412
 #: classes/Gems/Default/OptionAction.php:181
 #: classes/MUtil/Snippets/ModelFormSnippetAbstract.php:341
 msgid "item"
@@ -810,19 +810,24 @@
 msgid "The survey for token %s is no longer active."
 msgstr "De vragenlijst voor kenmerk %s is niet meer in gebruik."
 
-#: classes/Gems/Default/ComplianceAction.php:85
+#: classes/Gems/Default/ComplianceAction.php:87
 msgid "Start date"
 msgstr "Startdatum"
 
-#: classes/Gems/Default/ComplianceAction.php:86
+#: classes/Gems/Default/ComplianceAction.php:88
 msgid "End date"
 msgstr "Einddatum"
 
-#: classes/Gems/Default/ComplianceAction.php:98
+#: classes/Gems/Default/ComplianceAction.php:93
+#: classes/Gems/Default/SummaryAction.php:192
+msgid "No track selected..."
+msgstr "Geen traject geselecteerd..."
+
+#: classes/Gems/Default/ComplianceAction.php:173
 msgid "Compliance"
 msgstr "Voortgang"
 
-#: classes/Gems/Default/ComplianceAction.php:109
+#: classes/Gems/Default/ComplianceAction.php:184
 #: classes/Gems/Default/ProjectTracksAction.php:85
 #: classes/Gems/Default/TrackAction.php:452
 #: classes/Gems/Default/TrackMaintenanceAction.php:331
@@ -1226,7 +1231,7 @@
 #: classes/Gems/Default/ExportAction.php:154
 #: classes/Gems/Default/MailJobAction.php:100
 #: classes/Gems/Default/ProjectSurveysAction.php:67
-#: classes/Gems/Default/SummaryAction.php:155
+#: classes/Gems/Default/SummaryAction.php:168
 #: classes/Gems/Default/SurveyAction.php:201
 #: classes/Gems/Email/OneMailForm.php:57
 #: classes/Gems/Export/RespondentExport.php:156
@@ -1437,32 +1442,30 @@
 msgstr "Ongeldige taal instelling."
 
 #: classes/Gems/Default/LogAction.php:78
-#: classes/Gems/Default/TokenPlanAction.php:243
+#: classes/Gems/Default/TokenPlanAction.php:234
+#: classes/Gems/Snippets/AutosearchFormSnippet.php:125
 msgid "from"
 msgstr "vanaf"
 
 #: classes/Gems/Default/LogAction.php:83
-#: classes/Gems/Default/TokenPlanAction.php:248
+#: classes/Gems/Default/TokenPlanAction.php:238
+#: classes/Gems/Snippets/AutosearchFormSnippet.php:141
 msgid "until"
 msgstr "tot"
 
 #: classes/Gems/Default/LogAction.php:89
-#: classes/Gems/Default/TokenPlanAction.php:254
 msgid "days"
 msgstr "dagen"
 
 #: classes/Gems/Default/LogAction.php:90
-#: classes/Gems/Default/TokenPlanAction.php:255
 msgid "weeks"
 msgstr "weken"
 
 #: classes/Gems/Default/LogAction.php:91
-#: classes/Gems/Default/TokenPlanAction.php:256
 msgid "months"
 msgstr "maanden"
 
 #: classes/Gems/Default/LogAction.php:92
-#: classes/Gems/Default/TokenPlanAction.php:257
 msgid "years"
 msgstr "jaren"
 
@@ -1517,7 +1520,7 @@
 msgstr "Bericht"
 
 #: classes/Gems/Default/LogAction.php:198
-#: classes/Gems/Default/TokenPlanAction.php:116
+#: classes/Gems/Default/TokenPlanAction.php:111
 #: classes/Gems/Snippets/TokenPlanTableSnippet.php:55
 #: snippets/RespondentDetailsSnippet.php:74
 #: snippets/RespondentDetailsWithAssignmentsSnippet.php:148
@@ -2066,7 +2069,7 @@
 msgstr "Sessie inhoud"
 
 #: classes/Gems/Default/ProjectInformationAction.php:226
-#: classes/Gems/Menu/MenuAbstract.php:357
+#: classes/Gems/Menu/MenuAbstract.php:360
 msgid "Session"
 msgstr "Sessie"
 
@@ -2083,6 +2086,7 @@
 #: classes/Gems/Email/EmailFormAbstract.php:193
 #: classes/Gems/Email/EmailFormAbstract.php:251
 #: classes/Gems/Email/MailTemplateForm.php:81
+#: classes/Gems/Snippets/AutosearchFormSnippet.php:112
 #: classes/Gems/Tracker/Model/TrackModel.php:103
 msgid "From"
 msgstr "Van"
@@ -2539,7 +2543,7 @@
 msgstr[1] "bronnen"
 
 #: classes/Gems/Default/SourceAction.php:249
-#: classes/Gems/Menu/MenuAbstract.php:452
+#: classes/Gems/Menu/MenuAbstract.php:455
 msgid "Survey Sources"
 msgstr "Bronnen"
 
@@ -2623,61 +2627,49 @@
 msgid "You are not allowed to change this password."
 msgstr "U mag dit wachtwoord niet wijzigen."
 
-#: classes/Gems/Default/SummaryAction.php:154
+#: classes/Gems/Default/SummaryAction.php:167
 #: classes/Gems/Email/OneMailForm.php:55
 #: classes/Gems/Export/RespondentExport.php:157
-#: classes/Gems/Menu/MenuAbstract.php:497
+#: classes/Gems/Menu/MenuAbstract.php:500
 #: classes/Gems/Tracker/Model/StandardTokenModel.php:196
 msgid "Round"
 msgstr "Ronde"
 
-#: classes/Gems/Default/SummaryAction.php:156
-msgid "Filler"
-msgstr "Invuller"
-
-#: classes/Gems/Default/SummaryAction.php:159
-#: classes/Gems/Default/TokenPlanAction.php:326
+#: classes/Gems/Default/SummaryAction.php:169
+#: classes/Gems/Default/TokenPlanAction.php:292
 #: classes/Gems/Selector/TokenByGroupDateSelector.php:139
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceTableSnippet.php:149
 msgid "Answered"
 msgstr "Beantwoord"
 
-#: classes/Gems/Default/SummaryAction.php:160
-#: classes/Gems/Default/TokenPlanAction.php:327
+#: classes/Gems/Default/SummaryAction.php:170
+#: classes/Gems/Default/TokenPlanAction.php:293
 #: classes/Gems/Selector/TokenByGroupDateSelector.php:129
 #: classes/Gems/Tracker/Token.php:1038
 #: snippets/RespondentTokenTabsSnippet.php:68
 msgid "Missed"
 msgstr "Gemist"
 
-#: classes/Gems/Default/SummaryAction.php:161
+#: classes/Gems/Default/SummaryAction.php:171
+#: classes/Gems/Default/TokenPlanAction.php:287
 #: classes/Gems/Tracker/Token.php:1044
 msgid "Open"
 msgstr "Open"
 
-#: classes/Gems/Default/SummaryAction.php:162
-#: classes/Gems/Tracker/Token.php:1040 classes/Gems/Tracker/Token.php:1042
-msgid "Future"
-msgstr "Toekomstig"
+#: classes/Gems/Default/SummaryAction.php:172
+msgid "Total"
+msgstr "Totaal"
 
-#: classes/Gems/Default/SummaryAction.php:163
-#: classes/Gems/Util/Translated.php:233
-msgid "Unknown"
-msgstr "Onbekend"
+#: classes/Gems/Default/SummaryAction.php:180
+msgid "Filler"
+msgstr "Invuller"
 
-#: classes/Gems/Default/SummaryAction.php:165
-msgid "Success"
-msgstr "Succes"
-
-#: classes/Gems/Default/SummaryAction.php:166
-msgid "Removed"
-msgstr "Verwijderd"
-
-#: classes/Gems/Default/SummaryAction.php:179
+#: classes/Gems/Default/SummaryAction.php:205
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: classes/Gems/Default/SummaryAction.php:190
-#: classes/Gems/Default/TokenPlanAction.php:480
+#: classes/Gems/Default/SummaryAction.php:216
+#: classes/Gems/Default/TokenPlanAction.php:463
 #: classes/Gems/Default/TrackAction.php:450
 #: classes/Gems/Tracker/Snippets/EditTokenSnippetAbstract.php:141
 msgid "token"
@@ -2912,98 +2904,106 @@
 msgid "Not used in tracks."
 msgstr "Niet in trajecten gebruikt."
 
-#: classes/Gems/Default/TokenPlanAction.php:117
+#: classes/Gems/Default/TokenPlanAction.php:112
 #: classes/Gems/Snippets/TokenPlanTableSnippet.php:56
 msgid "Round / Details"
 msgstr "Ronde / Details"
 
-#: classes/Gems/Default/TokenPlanAction.php:118
-#: classes/Gems/Default/TokenPlanAction.php:233
+#: classes/Gems/Default/TokenPlanAction.php:113
+#: classes/Gems/Default/TokenPlanAction.php:223
 #: classes/Gems/Snippets/TokenPlanTableSnippet.php:57
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:73
 #: classes/Gems/Tracker/Engine/StepEngineAbstract.php:385
 msgid "Valid from"
 msgstr "Geldig vanaf"
 
-#: classes/Gems/Default/TokenPlanAction.php:119
-#: classes/Gems/Default/TokenPlanAction.php:234
+#: classes/Gems/Default/TokenPlanAction.php:114
+#: classes/Gems/Default/TokenPlanAction.php:224
 #: classes/Gems/Snippets/TokenPlanTableSnippet.php:58
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:74
 #: classes/Gems/Tracker/Engine/StepEngineAbstract.php:386
 #: classes/Gems/Tracker/Model/StandardTokenModel.php:198
 msgid "Valid until"
 msgstr "Geldig tot"
 
-#: classes/Gems/Default/TokenPlanAction.php:120
+#: classes/Gems/Default/TokenPlanAction.php:115
 #: classes/Gems/Snippets/TokenPlanTableSnippet.php:59
 msgid "Contact date"
 msgstr "Contactdatum"
 
-#: classes/Gems/Default/TokenPlanAction.php:174
+#: classes/Gems/Default/TokenPlanAction.php:169
 #, php-format
 msgid "Email %s"
 msgstr "Email %s"
 
-#: classes/Gems/Default/TokenPlanAction.php:180
+#: classes/Gems/Default/TokenPlanAction.php:175
 msgid "No tokens found."
 msgstr "Geen kenmerken gevonden."
 
-#: classes/Gems/Default/TokenPlanAction.php:235
+#: classes/Gems/Default/TokenPlanAction.php:225
 msgid "E-Mailed on"
 msgstr "Email verstuurd op"
 
-#: classes/Gems/Default/TokenPlanAction.php:236
+#: classes/Gems/Default/TokenPlanAction.php:226
 msgid "Completion date"
 msgstr "Datum ingevuld op"
 
-#: classes/Gems/Default/TokenPlanAction.php:240
+#: classes/Gems/Default/TokenPlanAction.php:230
+#: classes/Gems/Snippets/AutosearchFormSnippet.php:116
 msgid "For date"
 msgstr "Met datum"
 
-#: classes/Gems/Default/TokenPlanAction.php:287
+#: classes/Gems/Default/TokenPlanAction.php:252
 msgid "Select:"
 msgstr "Selecteren:"
 
-#: classes/Gems/Default/TokenPlanAction.php:293
+#: classes/Gems/Default/TokenPlanAction.php:258
 msgid "(all tracks)"
 msgstr "(alle trajecten)"
 
-#: classes/Gems/Default/TokenPlanAction.php:304
+#: classes/Gems/Default/TokenPlanAction.php:269
 msgid "(all rounds)"
 msgstr "(alle rondes)"
 
-#: classes/Gems/Default/TokenPlanAction.php:318
+#: classes/Gems/Default/TokenPlanAction.php:283
 msgid "(all surveys)"
 msgstr "(alle vragenlijsten)"
 
-#: classes/Gems/Default/TokenPlanAction.php:321
+#: classes/Gems/Default/TokenPlanAction.php:286
 msgid "(all actions)"
 msgstr "(alle acties)"
 
-#: classes/Gems/Default/TokenPlanAction.php:322
+#: classes/Gems/Default/TokenPlanAction.php:288
 msgid "Not emailed"
 msgstr "Niet gemaild"
 
-#: classes/Gems/Default/TokenPlanAction.php:323
+#: classes/Gems/Default/TokenPlanAction.php:289
 msgid "To email"
 msgstr "Te mailen"
 
-#: classes/Gems/Default/TokenPlanAction.php:324
+#: classes/Gems/Default/TokenPlanAction.php:290
 msgid "Needs reminder"
 msgstr "Herinnering nodig"
 
-#: classes/Gems/Default/TokenPlanAction.php:325
+#: classes/Gems/Default/TokenPlanAction.php:291
 msgid "Yet to Answer"
 msgstr "Nog te beantwoorden"
 
-#: classes/Gems/Default/TokenPlanAction.php:341
-#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:79
+#: classes/Gems/Default/TokenPlanAction.php:294
+msgid "Removed"
+msgstr "Verwijderd"
+
+#: classes/Gems/Default/TokenPlanAction.php:308
+#: classes/Gems/Snippets/Tracker/Compliance/ComplianceSearchFormSnippet.php:88
+#: classes/Gems/Snippets/Tracker/Summary/SummarySearchFormSnippet.php:90
 msgid "(all fillers)"
 msgstr "(alle invullers)"
 
-#: classes/Gems/Default/TokenPlanAction.php:360
+#: classes/Gems/Default/TokenPlanAction.php:327
 msgid "(all staff)"
 msgstr "(alle medewerkers)"
 
-#: classes/Gems/Default/TokenPlanAction.php:471
+#: classes/Gems/Default/TokenPlanAction.php:454
 #: classes/Gems/Snippets/TokenModelSnippetAbstract.php:59
 #: classes/Gems/Snippets/TokenPlanTableSnippet.php:122
 #: snippets/BrowseSingleSurveyTokenSnippet.php:144
@@ -3011,7 +3011,7 @@
 msgid "+"
 msgstr "+"
 
-#: classes/Gems/Default/TokenPlanAction.php:485
+#: classes/Gems/Default/TokenPlanAction.php:468
 msgid "Token planning"
 msgstr "Per kenmerk plannen"
 
@@ -3243,7 +3243,7 @@
 msgstr[1] "velden"
 
 #: classes/Gems/Default/TrackFieldsAction.php:175
-#: classes/Gems/Menu/MenuAbstract.php:477
+#: classes/Gems/Menu/MenuAbstract.php:480
 msgid "Fields"
 msgstr "Velden"
 
@@ -3375,7 +3375,7 @@
 msgstr[1] "rondes"
 
 #: classes/Gems/Default/TrackRoundsAction.php:227
-#: classes/Gems/Menu/MenuAbstract.php:485
+#: classes/Gems/Menu/MenuAbstract.php:488
 msgid "Rounds"
 msgstr "Rondes"
 
@@ -3638,81 +3638,81 @@
 msgid "Track Summary"
 msgstr "Traject Samenvatting"
 
-#: classes/Gems/Menu/MenuAbstract.php:327
+#: classes/Gems/Menu/MenuAbstract.php:329
 msgid "Track Compliance"
 msgstr "Traject Voortgang"
 
-#: classes/Gems/Menu/MenuAbstract.php:330
+#: classes/Gems/Menu/MenuAbstract.php:333
 msgid "By period"
 msgstr "Per periode"
 
-#: classes/Gems/Menu/MenuAbstract.php:331
+#: classes/Gems/Menu/MenuAbstract.php:334
 msgid "By token"
 msgstr "Per kenmerk"
 
-#: classes/Gems/Menu/MenuAbstract.php:332
+#: classes/Gems/Menu/MenuAbstract.php:335
 msgid "By respondent"
 msgstr "Per patiënt"
 
-#: classes/Gems/Menu/MenuAbstract.php:336
+#: classes/Gems/Menu/MenuAbstract.php:339
 msgid "Bulk mail"
 msgstr "Bulk mail"
 
-#: cla...
 
[truncated message content]