From be5a8803ec863a471d17c49f94357d8dbae9b560 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Tue, 15 Jan 2019 11:15:30 +0100
Subject: [PATCH] #255 Download icon fixes

---
 modules/client/back/methods/receipt/filter.js |  6 ++-
 modules/client/front/address/index/index.html |  1 -
 modules/client/front/index/index.js           |  4 +-
 modules/client/front/risk/index/index.html    | 43 +++++++++++--------
 modules/client/front/risk/index/locale/es.yml |  5 ++-
 5 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/modules/client/back/methods/receipt/filter.js b/modules/client/back/methods/receipt/filter.js
index f4ec6ad40..b9f26b1ab 100644
--- a/modules/client/back/methods/receipt/filter.js
+++ b/modules/client/back/methods/receipt/filter.js
@@ -42,7 +42,8 @@ module.exports = Self => {
                             r.bankFk,
                             firstName,
                             name,
-                            r.clientFk
+                            r.clientFk,
+                            FALSE pdf
                         FROM vn.receipt r
                             LEFT JOIN vn.worker w ON w.id = r.workerFk
                             JOIN vn.company c ON c.id = r.companyFk
@@ -60,7 +61,8 @@ module.exports = Self => {
                             NULL,
                             NULL,
                             NULL,
-                            i.clientFk
+                            i.clientFk,
+                            i.pdf
                         FROM vn.invoiceOut i
                             JOIN vn.company c ON c.id = i.companyFk
                         WHERE i.clientFk = ? AND i.companyFk = ?
diff --git a/modules/client/front/address/index/index.html b/modules/client/front/address/index/index.html
index b9e60c2e2..494d249d9 100644
--- a/modules/client/front/address/index/index.html
+++ b/modules/client/front/address/index/index.html
@@ -6,7 +6,6 @@
     data="addresses"
     auto-load="true">
 </vn-crud-model>
-
 <vn-vertical>
     <vn-card pad-large compact>
         <vn-title vn-one>Addresses</vn-title>
diff --git a/modules/client/front/index/index.js b/modules/client/front/index/index.js
index 7fa644f5c..1497224fe 100644
--- a/modules/client/front/index/index.js
+++ b/modules/client/front/index/index.js
@@ -12,7 +12,7 @@ export default class Controller {
         case 'search':
             return /^\d+$/.test(value)
                 ? {id: value}
-                : {name: {regexp: value}};
+                : {name: {like: `%${value}%`}};
         case 'phone':
             return {
                 or: [
@@ -23,7 +23,7 @@ export default class Controller {
         case 'name':
         case 'socialName':
         case 'city':
-            return {[param]: {regexp: value}};
+            return {[param]: {regexp: `%${value}%`}};
         case 'id':
         case 'fi':
         case 'postcode':
diff --git a/modules/client/front/risk/index/index.html b/modules/client/front/risk/index/index.html
index d93a77b59..9c87712f9 100644
--- a/modules/client/front/risk/index/index.html
+++ b/modules/client/front/risk/index/index.html
@@ -30,7 +30,7 @@
             </vn-one>
             <vn-one>
                 <div class="totalBox" ng-if="riskTotal.length">
-                    <h6> Total por empresa</h6>
+                    <h6 translate>Total by company</h6>
                     <vn-auto ng-repeat="riskByCompany in riskTotal">  
                         <vn-label-value
                             label="{{riskByCompany.company.code}}"
@@ -48,11 +48,11 @@
                         <vn-th>Creation date</vn-th>
                         <vn-th>Employee</vn-th>
                         <vn-th>Reference</vn-th>
-                        <vn-th>Bank</vn-th>
-                        <vn-th>Debit</vn-th>
-                        <vn-th>Havings</vn-th>
-                        <vn-th>Balance</vn-th>
-                        <vn-th>Conciliated</vn-th>
+                        <vn-th number>Bank</vn-th>
+                        <vn-th number>Debit</vn-th>
+                        <vn-th number>Havings</vn-th>
+                        <vn-th number>Balance</vn-th>
+                        <vn-th center>Conciliated</vn-th>
                         <vn-th></vn-th>
                     </vn-tr>
                 </vn-thead>
@@ -62,23 +62,23 @@
                         <vn-td>{{::risk.created | dateTime:'dd/MM/yyyy HH:mm'}}</vn-td>
                         <vn-td>{{::risk.firstName}} {{::risk.name}}</vn-td>
                         <vn-td>{{::risk.ref ? 'N/FRA ' + risk.ref : ''}}</vn-td>
-                        <vn-td>{{::risk.bankFk}}</vn-td>
-                        <vn-td>{{::risk.debit | currency:'€':2}}</vn-td>
-                        <vn-td>{{::risk.credit | currency:'€':2}}</vn-td>
-                        <vn-td>{{risk.balance | currency:'€':2}}</vn-td>
-                        <vn-td style="text-align: center">
+                        <vn-td number>{{::risk.bankFk}}</vn-td>
+                        <vn-td number>{{::risk.debit | currency:'€':2}}</vn-td>
+                        <vn-td number>{{::risk.credit | currency:'€':2}}</vn-td>
+                        <vn-td number>{{risk.balance | currency:'€':2}}</vn-td>
+                        <vn-td center>
                             <vn-check
                                 field="risk.isConciliate"
                                 disabled="true">
                             </vn-check>
                         </vn-td>
-                        <vn-td style="text-align: center">
-                            <a ng-show="risk.ref"
+                        <vn-td center>
+                            <a ng-show="risk.pdf"
                                 href="api/InvoiceOuts/{{::risk.ref}}/download?access_token={{::$ctrl.accessToken}}">
-                                <vn-icon
+                                <vn-icon-button
                                     icon="cloud_download"
                                     title="Download PDF">
-                                </vn-icon>
+                                </vn-icon-button>
                             </a>
                         </vn-td>
                     </vn-tr>
@@ -94,8 +94,13 @@
         </vn-pagination>
     </vn-card>
 </vn-vertical>
-<a ui-sref="client.card.risk.create" vn-tooltip="New payment" 
-    vn-bind="+" fixed-bottom-right>
-    <vn-float-button vn-acl="administrative" vn-acl-action="remove" icon="add"></vn-float-button>
+<a ui-sref="client.card.risk.create"
+    vn-tooltip="New payment" 
+    vn-bind="+"
+    fixed-bottom-right>
+    <vn-float-button
+        vn-acl="administrative"
+        vn-acl-action="remove"
+        icon="add">
+    </vn-float-button>
 </a>
-    
\ No newline at end of file
diff --git a/modules/client/front/risk/index/locale/es.yml b/modules/client/front/risk/index/locale/es.yml
index f0eb2cd52..17672a8a9 100644
--- a/modules/client/front/risk/index/locale/es.yml
+++ b/modules/client/front/risk/index/locale/es.yml
@@ -4,4 +4,7 @@ Bank: Caja
 Debit: Debe
 Conciliated: Conciliado
 New payment: Añadir pago
-Havings: Haber
\ No newline at end of file
+Havings: Haber
+Balance: Balance
+Total by company: Total por empresa
+Download PDF: Descargar PDF
\ No newline at end of file