From a06f7fb01f77246265551df954d4daa232bbe5c4 Mon Sep 17 00:00:00 2001
From: Joan <joan@verdnatura.es>
Date: Tue, 7 Aug 2018 12:48:55 +0200
Subject: [PATCH] added claim list #443

---
 client/claim/src/index/index.html | 85 ++++++++++++-------------------
 client/claim/src/index/index.js   | 60 ++++++++--------------
 client/claim/src/locale/es.yml    |  4 +-
 client/modules.yml                |  2 +-
 4 files changed, 56 insertions(+), 95 deletions(-)

diff --git a/client/claim/src/index/index.html b/client/claim/src/index/index.html
index b7175f05d..3fdc3169c 100644
--- a/client/claim/src/index/index.html
+++ b/client/claim/src/index/index.html
@@ -1,9 +1,9 @@
 <vn-crud-model
     vn-id="model"
-    url="/ticket/api/Tickets"
+    url="/claim/api/Claims"
     filter="::$ctrl.filter"
     limit="20"
-    data="tickets"
+    data="claims"
     auto-load="false">
 </vn-crud-model>
 <div margin-medium>
@@ -17,64 +17,43 @@
         </vn-card>
     </div>
     <vn-card margin-medium-v pad-medium>
-        <table class="vn-grid">
-            <thead>
-                <tr>
-                    <th translate number>Id</th>
-                    <th translate>Salesperson</th>
-                    <th translate>Date</th>
-                    <th translate>Hour</th>
-                    <th translate>Alias</th>
-                    <th translate>Province</th>
-                    <th translate>State</th>
-                    <th translate>Agency</th>
-                    <th translate>Warehouse</th>
-                    <th translate number>Invoice</th>
-                    <th translate number>Route</th>
-                    <th></th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr ng-repeat="ticket in tickets" 
-                    class="{{::$ctrl.compareDate(ticket.shipped)}} clickable"
-                    ui-sref="ticket.card.summary({id: {{::ticket.id}}})">
-                    <th  number>{{::ticket.id}}</th>
-                    <td>{{::ticket.client.salesPerson.name | dashIfEmpty}}</td>
-                    <td>{{::ticket.shipped | date:'dd/MM/yyyy'}}</td>
-                    <td>{{::ticket.shipped | date:'HH:mm'}}</td>
-                    <td>
-                        <span 
-                            class="link" 
-                            ng-click="$ctrl.showDescriptor($event, ticket.clientFk)">
-                            {{::ticket.nickname}}
-                        </span>
-                    </td>
-                    <td>{{::ticket.address.province.name}}</td>
-                    <td>{{::ticket.tracking.state.name}}</td>
-                    <td>{{::ticket.agencyMode.name}}</td>
-                    <td>{{::ticket.warehouse.name}}</td>
-                    <td number>{{::ticket.refFk | dashIfEmpty}}</td>
-                    <td number>{{::ticket.routeFk | dashIfEmpty}}</td>
-                    <td>
+        <vn-table model="model">
+            <vn-thead>
+                <vn-tr>
+                    <vn-th field="id" number>Id</vn-th>
+                    <vn-th field="clientFk" number>Client Id</vn-th>
+                    <vn-th field="clientFk">Client</vn-th>
+                    <vn-th field="created">Created</vn-th>
+                    <vn-th field="workerFk">Worker</vn-th>
+                    <vn-th field="observation">Observation</vn-th>
+                    <vn-th field="claimResponsibleFk">Responsible</vn-th>
+                    <vn-th field="claimStateFk">State</vn-th>
+                    <vn-th></vn-th>
+                </vn-tr>
+            </vn-thead>
+            <vn-tbody>
+                <vn-tr ng-repeat="claim in claims">
+                    <vn-td number>{{::claim.id}}</vn-td>
+                    <vn-td number>{{::claim.client.id}}</vn-td>
+                    <vn-td>{{::claim.client.name}}</vn-td>
+                    <vn-td>{{::claim.created | date:'dd/MM/yyyy'}}</vn-td>
+                    <vn-td>{{::claim.worker.firstName}} {{::claim.worker.name}}</vn-td>
+                    <vn-td>{{::claim.observation}}</vn-td>
+                    <vn-td>{{::claim.claimResponsible.description}}</vn-td>
+                    <vn-td>{{::claim.claimState.description}}</vn-td>
+                    <vn-td>
                         <vn-icon-button
                             ng-click="$ctrl.preview($event, ticket)"
                             vn-tooltip="Preview"
                             icon="desktop_windows">
                         </vn-icon-button>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-        <vn-client-descriptor-popover vn-id="descriptor"></vn-client-descriptor-popover>
+                    </vn-td>
+                </vn-tr>
+            </vn-tbody>
+        </vn-table>
     </vn-card>
     <vn-pagination
         model="model"
         scroll-selector="ui-view">
     </vn-pagination>
-</div>
-<vn-dialog class="dialog-summary"
-    vn-id="dialog-summary-ticket">
-    <tpl-body>
-        <vn-ticket-summary ticket="$ctrl.ticketSelected"></vn-ticket-summary>
-    </tpl-body>
-</vn-dialog>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/client/claim/src/index/index.js b/client/claim/src/index/index.js
index 4027f5043..3721fb0fa 100644
--- a/client/claim/src/index/index.js
+++ b/client/claim/src/index/index.js
@@ -8,51 +8,31 @@ export default class Controller {
         this.filter = {
             include: [
                 {
-                    relation: 'address',
-                    scope: {
-                        fields: ['provinceFk'],
-                        include: {
-                            relation: 'province',
-                            scope: {
-                                fields: ['name']
-                            }
-                        }
-                    }
-                }, {
-                    relation: 'warehouse',
-                    scope: {
-                        fields: ['name']
-                    }
-                }, {
-                    relation: 'agencyMode',
-                    scope: {
-                        fields: ['name']
-                    }
-                }, {
-                    relation: 'tracking',
-                    scope: {
-                        fields: ['stateFk'],
-                        include: {
-                            relation: 'state',
-                            scope: {
-                                fields: ['name']
-                            }
-                        }
-                    }
-                }, {
                     relation: 'client',
                     scope: {
-                        fields: ['salesPersonFk'],
-                        include: {
-                            relation: 'salesPerson',
-                            scope: {
-                                fields: ['name']
-                            }
-                        }
+                        fields: ['name']
+                    }
+                },
+                {
+                    relation: 'worker',
+                    scope: {
+                        fields: ['firstName', 'name']
+                    }
+                },
+                {
+                    relation: 'claimResponsible',
+                    scope: {
+                        fields: ['description']
+                    }
+                },
+                {
+                    relation: 'claimState',
+                    scope: {
+                        fields: ['description']
                     }
                 }
             ],
-            order: 'shipped DESC'
+            order: 'claimStateFk ASC, created DESC'
         };
     }
 }
diff --git a/client/claim/src/locale/es.yml b/client/claim/src/locale/es.yml
index 9799c2a8d..fc6b2c490 100644
--- a/client/claim/src/locale/es.yml
+++ b/client/claim/src/locale/es.yml
@@ -1,5 +1,7 @@
 #Ordenar alfabeticamente
-
+Client Id: Id cliente
+Observation: Observación
+Responsible: Responsable
 
 #sections
 Claims: Reclamaciones
diff --git a/client/modules.yml b/client/modules.yml
index ceef9935b..617a08969 100644
--- a/client/modules.yml
+++ b/client/modules.yml
@@ -8,4 +8,4 @@ salix: []
 #route: []
 ticket: [item, client]
 order: [item, ticket]
-claim: []
+claim: [item, client]