From c04071366f250caa066d470368f2fd808e9e7ca8 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Tue, 29 Jan 2019 08:53:29 +0100 Subject: [PATCH 1/3] =?UTF-8?q?#1063=20client.summary=20a=C3=B1adir=20expl?= =?UTF-8?q?icaciones?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/components/label-value/label-value.html | 7 ++++++- front/core/components/label-value/label-value.js | 6 ++++-- front/core/components/label-value/style.scss | 6 ++++++ modules/client/front/summary/index.html | 15 ++++++++++----- modules/client/front/summary/locale/es.yml | 5 +++++ 5 files changed, 31 insertions(+), 8 deletions(-) diff --git a/front/core/components/label-value/label-value.html b/front/core/components/label-value/label-value.html index ab7cdbc28e..714c0f278a 100644 --- a/front/core/components/label-value/label-value.html +++ b/front/core/components/label-value/label-value.html @@ -1,4 +1,9 @@
- + + +
\ No newline at end of file diff --git a/front/core/components/label-value/label-value.js b/front/core/components/label-value/label-value.js index 88edb53817..ecf3bf4b39 100644 --- a/front/core/components/label-value/label-value.js +++ b/front/core/components/label-value/label-value.js @@ -2,9 +2,11 @@ import ngModule from '../../module'; import './style.scss'; export default class Controller { - constructor($element, $translate) { + constructor($element, $translate, $attrs) { this.element = $element[0]; this._ = $translate; + this.hasInfo = Boolean($attrs.info); + this.info = $attrs.info || null; } set label(value) { let label = this.element.querySelector('vn-label'); @@ -24,7 +26,7 @@ export default class Controller { return this._value; } } -Controller.$inject = ['$element', '$translate']; +Controller.$inject = ['$element', '$translate', '$attrs']; ngModule.component('vnLabelValue', { controller: Controller, diff --git a/front/core/components/label-value/style.scss b/front/core/components/label-value/style.scss index e4360cec43..7caa0175fc 100644 --- a/front/core/components/label-value/style.scss +++ b/front/core/components/label-value/style.scss @@ -11,4 +11,10 @@ vn-label-value > section { & > span { color: $main-font-color; } + + & > vn-icon { + vertical-align: middle; + color: $secondary-font-color; + font-size: 1.2em + } } \ No newline at end of file diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html index e47c2e76a5..f14f4e651e 100644 --- a/modules/client/front/summary/index.html +++ b/modules/client/front/summary/index.html @@ -168,22 +168,27 @@

Financial information

+ ng-class="{alert: $ctrl.summary.debt.debt > $ctrl.summary.credit}" + info="Invoices minus payments plus orders not yet invoiced"> + ($ctrl.summary.credit && $ctrl.summary.creditInsurance == null)}" + info="Verdnatura's maximum risk"> + value="{{$ctrl.summary.creditInsurance | currency:'€':2}} ({{$ctrl.summary.classifications[0].insurances[0].grade}})" + info="Solunion's maximum risk"> + value="{{$ctrl.summary.sumRisk | currency:'€':2}}" + info="Invoices minus payments"> + ng-class="{alert: $ctrl.summary.defaulters[0].amount}" + info="Deviated invoices minus payments"> Date: Tue, 29 Jan 2019 11:07:37 +0100 Subject: [PATCH 2/3] removed gulp docker from gulp backTest sequence --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index f100e66ad7..f490e11910 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -100,7 +100,7 @@ function backTest(done) { nodemon({ exec: gulpBin, - args: ['dockerAndBackTest'], + args: ['backendUnitTest'], watch: backSources, done: done }); From 8f7fd03d6e0a888c228910143a9f5bebd2622c0f Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Tue, 29 Jan 2019 14:46:21 +0100 Subject: [PATCH 3/3] #1035 ticket al borrar falta traduccion --- loopback/locale/en.json | 3 ++- modules/ticket/front/locale/es.yml | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/loopback/locale/en.json b/loopback/locale/en.json index bc7db2e301..e9395682f6 100644 --- a/loopback/locale/en.json +++ b/loopback/locale/en.json @@ -29,5 +29,6 @@ "You can't make changes on the basic data of an confirmed order or with rows": "You can't make changes on the basic data of an confirmed order or with rows", "You can't create a ticket for a inactive client": "You can't create a ticket for a inactive client", "Worker cannot be blank": "Worker cannot be blank", - "You don't have enough privileges to change the state of this ticket": "You don't have enough privileges to change the state of this ticket" + "You don't have enough privileges to change the state of this ticket": "You don't have enough privileges to change the state of this ticket", + "You must delete the claim id %d first": "You must delete the claim id %d first" } \ No newline at end of file diff --git a/modules/ticket/front/locale/es.yml b/modules/ticket/front/locale/es.yml index b56740e7b9..16c8a14099 100644 --- a/modules/ticket/front/locale/es.yml +++ b/modules/ticket/front/locale/es.yml @@ -58,6 +58,8 @@ Delay: Retraso Code 100: Código 100 Invoice: Factura Client card: Ficha del cliente +You are going to delete this ticket: Vas a borrar este ticket +Ticket deleted: Ticket borrado #sections List: Listado