added table-column ordering (#1086)

src/Repository/ActivityRepository.php

@@ -245,9 +245,23 @@ class ActivityRepository extends EntityRepository
             ->from(Activity::class, 'a')
             ->leftJoin('a.project', 'p')
             ->leftJoin('p.customer', 'c')
-            ->addOrderBy('a.' . $query->getOrderBy(), $query->getOrder())
         ;
 
+        $orderBy = $query->getOrderBy();
+        switch ($orderBy) {
+            case 'project':
+                $orderBy = 'p.name';
+                break;
+            case 'customer':
+                $orderBy = 'c.name';
+                break;
+            default:
+                $orderBy = 'a.' . $orderBy;
+                break;
+        }
+
+        $qb->addOrderBy($orderBy, $query->getOrder());
+
         $where = $qb->expr()->andX();
 
         if (in_array($query->getVisibility(), [ActivityQuery::SHOW_VISIBLE, ActivityQuery::SHOW_HIDDEN])) {