From f76a258fce2236368323dc2adab4d36ef8ac1b53 Mon Sep 17 00:00:00 2001
From: Daniel Herrero <dherrero@alfatecsistemas.es>
Date: Tue, 28 Nov 2017 13:21:26 +0100
Subject: [PATCH] client credit list terminado

---
 .../client/src/credit-list/credit-list.html   |  9 +++--
 client/client/src/credit-list/credit-list.js  | 35 +++++++++++++------
 .../salix/src/components/left-menu/actions.js |  2 +-
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/client/client/src/credit-list/credit-list.html b/client/client/src/credit-list/credit-list.html
index 918890155..ab255e86f 100644
--- a/client/client/src/credit-list/credit-list.html
+++ b/client/client/src/credit-list/credit-list.html
@@ -10,13 +10,13 @@
 
             <vn-grid-header on-order="$ctrl.onOrder(field, order)">
                 <vn-column-header vn-one pad-medium-h field="amount" text="credit"></vn-column-header>
-                <vn-column-header vn-one pad-medium-h field="created" text="Desde"></vn-column-header>
+                <vn-column-header vn-two pad-medium-h field="created" text="Desde"></vn-column-header>
                 <vn-six></vn-six>
             </vn-grid-header>
             <vn-one class="list list-content">
                 <vn-horizontal vn-one class="list list-element text-center" ng-repeat="credit in index.model.instances track by credit.id">
                     <vn-one pad-medium-h>{{::credit.amount | number:2}}</vn-one>
-                    <vn-one pad-medium-h>{{::credit.created}}</vn-one>
+                    <vn-two pad-medium-h>{{::credit.created | date:'dd/MM/yyyy HH:mm' }}</vn-two>
                     <vn-six></vn-six>
                 </vn-horizontal>
             </vn-one>
@@ -26,4 +26,7 @@
             </vn-one>
         </vn-vertical>
     </vn-card>
-</vn-vertical>
\ No newline at end of file
+</vn-vertical>
+<a ui-sref="clientCard.credit.create" fixed-bottom-right>
+        <vn-float-button icon="add"></vn-float-button>
+</a>
\ No newline at end of file
diff --git a/client/client/src/credit-list/credit-list.js b/client/client/src/credit-list/credit-list.js
index a0da14e4c..a18de64aa 100644
--- a/client/client/src/credit-list/credit-list.js
+++ b/client/client/src/credit-list/credit-list.js
@@ -1,24 +1,37 @@
 import ngModule from '../module';
 
 class ClientCreditList {
-    constructor($scope) {
+    constructor($scope, $timeout) {
         this.$ = $scope;
+        this.$timeout = $timeout;
+
+        this.waitingMgCrud = 0;
     }
     onOrder(field, order) {
         this.filter(`${field} ${order}`);
     }
     filter(order) {
-        this.$.index.filter = {
-            page: 1,
-            size: 10,
-            clientFk: this.client.id
-        };
+        if (this.$.index) {
+            this.waitingMgCrud = 0;
+            this.$.index.filter = {
+                page: 1,
+                size: 10,
+                clientFk: this.client.id
+            };
 
-        if (order) {
-            this.$.index.filter.order = order;
+            if (order) {
+                this.$.index.filter.order = order;
+            }
+
+            this.$.index.accept();
+        } else if (this.waitingMgCrud > 0) {
+            throw new Error('Magic Crud is not loaded');
+        } else {
+            this.waitingMgCrud++;
+            this.$timeout(() => {
+                this.filter(order);
+            });
         }
-
-        this.$.index.accept();
     }
 
     $onChanges() {
@@ -27,7 +40,7 @@ class ClientCreditList {
         }
     }
 }
-ClientCreditList.$inject = ['$scope'];
+ClientCreditList.$inject = ['$scope', '$timeout'];
 
 ngModule.component('vnClientCreditList', {
     template: require('./credit-list.html'),
diff --git a/client/salix/src/components/left-menu/actions.js b/client/salix/src/components/left-menu/actions.js
index 4d4d6ee6d..30d379df1 100644
--- a/client/salix/src/components/left-menu/actions.js
+++ b/client/salix/src/components/left-menu/actions.js
@@ -9,7 +9,7 @@ export default class MenuActions {
     switchItem() {
         if (!this.items || !this.items.length) return;
 
-        let stateName = this.$state.current.name.replace('create', 'list').replace('edit', 'list');
+        let stateName = this.$state.current.name.replace('.create', '.list').replace('.edit', '.list');
 
         for (let i = 0; i < this.items.length; i++) {
             this.items[i].active = (this.items[i].href === stateName);