CRM-20296 - order by even then odd numbers as advertised

CRM/Report/Form.php

@@ -2763,6 +2763,17 @@ public function storeOrderByArray() {
 
         if (!empty($orderByField)) {
           $this->_orderByFields[$orderByField['tplField']] = $orderByField;
+          if ($orderByField['name'] == 'street_number') {
+            // First order by Even/Odd - list even numbers first, then odd
+            // numbers. Even numbered addresses are on one side of the
+            // street and odd numbered addresses are on the other side of 
+            // the street so, when door knocking, it is easier to do streets
+            // one side at a time.
+            $orderBys[] = "{$orderByField['dbAlias']} % 2 {$orderBy['order']}";
+            // Below, add order clause as it normally would be added, so all
+            // even numbers are listed in numeric order, followed by all odd
+            // numbers in numeric order.
+          }
           $orderBys[] = "{$orderByField['dbAlias']} {$orderBy['order']}";
 
           // Record any section headers for assignment to the template

CRM/Report/Form/Campaign/SurveyDetails.php

@@ -203,7 +203,7 @@ public function __construct() {
         ),
         'grouping' => 'survey-activity-fields',
       ),
-    ) + $this->addAddressFields();
+    ) + $this->getAddressColumns();
     parent::__construct();
   }