Change daily rates order

fairnesscoop · May 3, 2022 · 567aa13 · 567aa13
1 parent c42d8fe
commit 567aa13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/client/src/routes/accounting/daily_rates/_Table.svelte b/client/src/routes/accounting/daily_rates/_Table.svelte
@@ -10,8 +10,8 @@
   <thead>
     <tr
       class="text-xs font-semibold tracking-wide text-left text-gray-500 uppercase border-b dark:border-gray-700 bg-gray-50 dark:text-gray-400 dark:bg-gray-800">
-      <th class="px-4 py-3">{$_('accounting.daily_rates.user')}</th>
       <th class="px-4 py-3">{$_('accounting.daily_rates.customer')}</th>
+      <th class="px-4 py-3">{$_('accounting.daily_rates.user')}</th>
       <th class="px-4 py-3">{$_('accounting.daily_rates.task')}</th>
       <th class="px-4 py-3">{$_('accounting.daily_rates.amount')}</th>
       <th class="px-4 py-3">{$_('common.actions')}</th>
@@ -20,8 +20,8 @@
   <tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
     {#each items as { id, user, task, customer, amount } (id)}
       <tr class="text-gray-700 dark:text-gray-400">
-        <td class="px-4 py-3 text-sm">{user.firstName} {user.lastName}</td>
         <td class="px-4 py-3 text-sm">{customer.name}</td>
+        <td class="px-4 py-3 text-sm">{user.firstName} {user.lastName}</td>
         <td class="px-4 py-3 text-sm">{task.name}</td>
         <td class="px-4 py-3 text-sm">{format(amount)}</td>
         <td class="px-4 py-3">

diff --git a/server/src/Infrastructure/Accounting/Repository/DailyRateRepository.ts b/server/src/Infrastructure/Accounting/Repository/DailyRateRepository.ts
@@ -34,8 +34,8 @@ export class DailyRateRepository implements IDailyRateRepository {
       .innerJoin('dailyRate.user', 'user')
       .innerJoin('dailyRate.task', 'task')
       .innerJoin('dailyRate.customer', 'customer')
-      .orderBy('user.lastName', 'ASC')
-      .addOrderBy('user.firstName', 'ASC')
+      .orderBy('customer.name', 'ASC')
+      .addOrderBy('task.name', 'ASC')
       .limit(MAX_ITEMS_PER_PAGE)
       .offset((page - 1) * MAX_ITEMS_PER_PAGE)
       .getManyAndCount();