From 1ae2512169c3ae36590e9a7d1a17607b19def214 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Thu, 16 May 2019 09:24:13 +0200
Subject: [PATCH] client greuge order by shipped and amount #1431

---
 modules/client/front/greuge/index/index.html | 6 +++---
 modules/client/front/greuge/index/index.js   | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/client/front/greuge/index/index.html b/modules/client/front/greuge/index/index.html
index a9d06cfa3..537e67602 100644
--- a/modules/client/front/greuge/index/index.html
+++ b/modules/client/front/greuge/index/index.html
@@ -4,7 +4,7 @@
     filter="::$ctrl.filter"
     link="{clientFk: $ctrl.$stateParams.id}"
     limit="20"
-    data="greuges" auto-load="false">
+    data="greuges" auto-load="true">
 </vn-crud-model>
 <mg-ajax 
     path="/client/api/greuges/{{$ctrl.$stateParams.id}}/sumAmount" 
@@ -20,12 +20,12 @@
             </div>
         </vn-horizontal>
         <vn-vertical>
-            <vn-table model="model">
+            <vn-table model="model" auto-load="false">
                 <vn-thead>
                     <vn-tr>
                         <vn-th field="shipped" default-order="DESC">Date</vn-th>
                         <vn-th field="description">Comment</vn-th>
-                        <vn-th field="amount">Amount</vn-th>
+                        <vn-th field="amount" >Amount</vn-th>
                         <vn-th field="greugeTypeFk">Type</vn-th>
                     </vn-tr>
                 </vn-thead>
diff --git a/modules/client/front/greuge/index/index.js b/modules/client/front/greuge/index/index.js
index 3dd5c9eaf..b89b01d7e 100644
--- a/modules/client/front/greuge/index/index.js
+++ b/modules/client/front/greuge/index/index.js
@@ -6,12 +6,13 @@ class Controller {
         this.filter = {
             include: [
                 {
-                    relation: "greugeType",
+                    relation: 'greugeType',
                     scope: {
-                        fields: ["id", "name"]
+                        fields: ['id', 'name']
                     }
                 }
-            ]
+            ],
+            order: 'shipped DESC, amount'
         };
     }
 }