From 0a457602516563eec03360ddbf6177cb2a935c96 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Wed, 20 Feb 2019 07:30:40 +0100 Subject: [PATCH 01/14] removed duplicated empty-rows --- front/core/components/log/index.html | 3 --- modules/claim/front/index/index.html | 6 ------ modules/client/front/credit/index/index.html | 3 --- modules/client/front/mandate/index.html | 3 --- modules/client/front/recovery/index/index.html | 3 --- modules/order/front/index/index.html | 3 --- modules/ticket/front/descriptor/addStowaway.html | 3 --- modules/ticket/front/descriptor/removeStowaway.html | 3 --- modules/ticket/front/sale/index.html | 3 --- modules/travel/front/index/index.html | 3 --- 10 files changed, 33 deletions(-) diff --git a/front/core/components/log/index.html b/front/core/components/log/index.html index eb065c6cb..8211a8e08 100644 --- a/front/core/components/log/index.html +++ b/front/core/components/log/index.html @@ -77,9 +77,6 @@ - - No results - diff --git a/modules/claim/front/index/index.html b/modules/claim/front/index/index.html index f6d27dffb..67aedec4b 100644 --- a/modules/claim/front/index/index.html +++ b/modules/claim/front/index/index.html @@ -63,12 +63,6 @@ - - No results - - - Enter a new search - diff --git a/modules/client/front/credit/index/index.html b/modules/client/front/credit/index/index.html index a68e31d2f..3a9244f86 100644 --- a/modules/client/front/credit/index/index.html +++ b/modules/client/front/credit/index/index.html @@ -24,9 +24,6 @@ {{::credit.worker.user.nickname}} - - No results - diff --git a/modules/client/front/mandate/index.html b/modules/client/front/mandate/index.html index 69beeaa02..4b290d205 100644 --- a/modules/client/front/mandate/index.html +++ b/modules/client/front/mandate/index.html @@ -28,9 +28,6 @@ {{::mandate.finished | date:'dd/MM/yyyy HH:mm' || '-'}} - - No results - diff --git a/modules/client/front/recovery/index/index.html b/modules/client/front/recovery/index/index.html index b130d73c2..1e8009429 100644 --- a/modules/client/front/recovery/index/index.html +++ b/modules/client/front/recovery/index/index.html @@ -36,9 +36,6 @@ {{::recovery.period}} - - No results - diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html index b136425ab..b2d934ce4 100644 --- a/modules/order/front/index/index.html +++ b/modules/order/front/index/index.html @@ -66,9 +66,6 @@ - - Enter a new search - diff --git a/modules/ticket/front/descriptor/addStowaway.html b/modules/ticket/front/descriptor/addStowaway.html index 64bb65554..349ae137e 100644 --- a/modules/ticket/front/descriptor/addStowaway.html +++ b/modules/ticket/front/descriptor/addStowaway.html @@ -26,9 +26,6 @@ {{ticket.state.state.name}} - - No results - diff --git a/modules/ticket/front/descriptor/removeStowaway.html b/modules/ticket/front/descriptor/removeStowaway.html index 7653d25b7..515d6b2cc 100644 --- a/modules/ticket/front/descriptor/removeStowaway.html +++ b/modules/ticket/front/descriptor/removeStowaway.html @@ -25,9 +25,6 @@ {{stowaway.ticket.state.state.name}} - - No results - diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html index 427ea1958..62dc10294 100644 --- a/modules/ticket/front/sale/index.html +++ b/modules/ticket/front/sale/index.html @@ -144,9 +144,6 @@ - - No results - diff --git a/modules/travel/front/index/index.html b/modules/travel/front/index/index.html index 21750fa8b..744b0680d 100644 --- a/modules/travel/front/index/index.html +++ b/modules/travel/front/index/index.html @@ -47,9 +47,6 @@ - - Enter a new search - From c8623ef3da6ba02e06991fb376ce906e8314cc4d Mon Sep 17 00:00:00 2001 From: Gerard Date: Wed, 20 Feb 2019 08:24:10 +0100 Subject: [PATCH 02/14] e2e now changes the agency --- e2e/helpers/selectors.js | 1 + e2e/paths/order-module/01_edit_basic_data.spec.js | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 3c11a5fbb..a54ed048c 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -486,6 +486,7 @@ export default { orderBasicData: { clientAutocomplete: `vn-autocomplete[label="Client"]`, addressAutocomplete: `vn-autocomplete[label="Address"]`, + agencyAutocomplete: `vn-autocomplete[label="Agency"]`, observationInput: `vn-textarea[label="Observation"] textarea`, saveButton: `${components.vnSubmit}` }, diff --git a/e2e/paths/order-module/01_edit_basic_data.spec.js b/e2e/paths/order-module/01_edit_basic_data.spec.js index 0efcc4f8c..633c9d338 100644 --- a/e2e/paths/order-module/01_edit_basic_data.spec.js +++ b/e2e/paths/order-module/01_edit_basic_data.spec.js @@ -64,6 +64,7 @@ describe('Order edit basic data path', () => { const result = await nightmare .autocompleteSearch(selectors.orderBasicData.clientAutocomplete, 'Tony Stark') .autocompleteSearch(selectors.orderBasicData.addressAutocomplete, 'Tony Stark') + .autocompleteSearch(selectors.orderBasicData.agencyAutocomplete, 'Silla247') .clearInput(selectors.orderBasicData.observationInput) .write(selectors.orderBasicData.observationInput, 'Observation modified') .waitToClick(selectors.orderBasicData.saveButton) @@ -80,6 +81,13 @@ describe('Order edit basic data path', () => { expect(result).toEqual('104: Tony Stark'); }); + it('should now confirm the agency have been edited', async() => { + const result = await nightmare + .waitToGetProperty(`${selectors.orderBasicData.agencyAutocomplete} input`, 'value'); + + expect(result).toEqual('7: Silla247'); + }); + it('should now confirm the observations have been edited', async() => { const result = await nightmare .waitToGetProperty(selectors.orderBasicData.observationInput, 'value'); From 419778f67ed762393e09630b2c10715783d95abc Mon Sep 17 00:00:00 2001 From: Gerard Date: Wed, 20 Feb 2019 08:26:53 +0100 Subject: [PATCH 03/14] now has the proper title directive --- front/core/components/fetched-tags/index.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/front/core/components/fetched-tags/index.html b/front/core/components/fetched-tags/index.html index 546e5d67d..a1816d6f0 100644 --- a/front/core/components/fetched-tags/index.html +++ b/front/core/components/fetched-tags/index.html @@ -1,5 +1,8 @@ - {{::$ctrl.title}} + + {{::$ctrl.title}} +
Date: Wed, 20 Feb 2019 08:57:51 +0100 Subject: [PATCH 04/14] fixed styles --- front/core/components/check/style.scss | 4 ++++ print/lib/reportEngine.js | 2 +- print/report/email-header/locale.js | 2 +- print/report/rpt-delivery-note/index.html | 3 +-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/front/core/components/check/style.scss b/front/core/components/check/style.scss index 0804a5750..5ddd56fa3 100644 --- a/front/core/components/check/style.scss +++ b/front/core/components/check/style.scss @@ -18,4 +18,8 @@ vn-check { md-checkbox { margin-bottom: 0 } + + md-checkbox .md-label { + margin-bottom: .5em; + } } diff --git a/print/lib/reportEngine.js b/print/lib/reportEngine.js index e4cfce6df..dccb18b4a 100644 --- a/print/lib/reportEngine.js +++ b/print/lib/reportEngine.js @@ -107,7 +107,7 @@ module.exports = { format: 'A4', border: '1.5cm', footer: { - height: '60px', + height: '55px', } }; diff --git a/print/report/email-header/locale.js b/print/report/email-header/locale.js index a3d2003a5..7200e6048 100644 --- a/print/report/email-header/locale.js +++ b/print/report/email-header/locale.js @@ -1,5 +1,5 @@ module.exports = { messages: { - es: {clientName: 'Nombre cliente'}, + es: {}, }, }; diff --git a/print/report/rpt-delivery-note/index.html b/print/report/rpt-delivery-note/index.html index 5332858c3..65b1866ae 100644 --- a/print/report/rpt-delivery-note/index.html +++ b/print/report/rpt-delivery-note/index.html @@ -5,7 +5,7 @@ -
+
@@ -185,7 +185,6 @@
-
Date: Wed, 20 Feb 2019 09:16:19 +0100 Subject: [PATCH 05/14] removed fi from worker module --- modules/worker/front/card/index.js | 6 ++---- modules/worker/front/descriptor/index.html | 3 --- .../report/printer-setup/assets/files/port.png | Bin 0 -> 32699 bytes print/report/printer-setup/index.js | 5 ++++- print/report/printer-setup/locale.js | 3 +++ 5 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 print/report/printer-setup/assets/files/port.png diff --git a/modules/worker/front/card/index.js b/modules/worker/front/card/index.js index ea1457fc8..9b4f6f93f 100644 --- a/modules/worker/front/card/index.js +++ b/modules/worker/front/card/index.js @@ -19,10 +19,8 @@ class Controller { { relation: 'user', scope: {fields: ['name', 'email']} - }, { - relation: 'client', - scope: {fields: ['fi']} - }, { + }, + { relation: 'sip', scope: {fields: ['extension']} }, { diff --git a/modules/worker/front/descriptor/index.html b/modules/worker/front/descriptor/index.html index 696f2a22f..5b6bdaa6b 100644 --- a/modules/worker/front/descriptor/index.html +++ b/modules/worker/front/descriptor/index.html @@ -23,9 +23,6 @@ - - diff --git a/print/report/printer-setup/assets/files/port.png b/print/report/printer-setup/assets/files/port.png new file mode 100644 index 0000000000000000000000000000000000000000..237d1057b2602245f00346cb33f2a1b56e333da4 GIT binary patch literal 32699 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 Date: Wed, 20 Feb 2019 09:29:14 +0100 Subject: [PATCH 06/14] fixed print styles --- print/report/letter-debtor-nd/index.html | 2 +- print/report/letter-debtor-st/index.html | 2 +- print/report/payment-update/index.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/print/report/letter-debtor-nd/index.html b/print/report/letter-debtor-nd/index.html index e1daa91a6..01247ced4 100644 --- a/print/report/letter-debtor-nd/index.html +++ b/print/report/letter-debtor-nd/index.html @@ -15,7 +15,7 @@ -

{{ $t('sections.introduction.title') }},

+

{{ $t('sections.introduction.title') }},

{{ $t('sections.introduction.description') }}

{{ $t('sections.introduction.terms') }}

diff --git a/print/report/letter-debtor-st/index.html b/print/report/letter-debtor-st/index.html index f9c915072..4f5ea17ac 100644 --- a/print/report/letter-debtor-st/index.html +++ b/print/report/letter-debtor-st/index.html @@ -15,7 +15,7 @@ -

{{ $t('sections.introduction.title') }},

+

{{ $t('sections.introduction.title') }},

{{ $t('sections.introduction.description') }}

{{ $t('checkExtract') }}

diff --git a/print/report/payment-update/index.html b/print/report/payment-update/index.html index bd4b9a0db..fdc893662 100644 --- a/print/report/payment-update/index.html +++ b/print/report/payment-update/index.html @@ -15,7 +15,7 @@ -

{{ $t('sections.introduction.title') }},

+

{{ $t('sections.introduction.title') }},

From 20843a906831796e03fc634a73716829dab1ad66 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Wed, 20 Feb 2019 09:59:39 +0100 Subject: [PATCH 07/14] updated module worker acl, removed fi from summary --- modules/worker/front/routes.json | 6 +++--- modules/worker/front/summary/index.html | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/worker/front/routes.json b/modules/worker/front/routes.json index e13413d0f..cb2823484 100644 --- a/modules/worker/front/routes.json +++ b/modules/worker/front/routes.json @@ -17,8 +17,7 @@ "url": "/index?q", "state": "worker.index", "component": "vn-worker-index", - "description": "Workers", - "acl": ["developer"] + "description": "Workers" }, { "url" : "/summary", "state": "worker.card.summary", @@ -40,7 +39,8 @@ "description": "Basic data", "params": { "worker": "$ctrl.worker" - } + }, + "acl": ["developer"] } ] } \ No newline at end of file diff --git a/modules/worker/front/summary/index.html b/modules/worker/front/summary/index.html index 429db6d98..bc58e7bf1 100644 --- a/modules/worker/front/summary/index.html +++ b/modules/worker/front/summary/index.html @@ -6,9 +6,6 @@ - - From 0f5d1e55c09bfdcc93de1c993d5d2ded204bd4a2 Mon Sep 17 00:00:00 2001 From: Gerard Date: Wed, 20 Feb 2019 11:30:55 +0100 Subject: [PATCH 08/14] item descriptor not sending the correct warehouse fixed --- modules/item/back/methods/item/getVisibleAvailable.js | 4 ++-- modules/item/front/descriptor/index.js | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/item/back/methods/item/getVisibleAvailable.js b/modules/item/back/methods/item/getVisibleAvailable.js index fecdb736b..dd60a069e 100644 --- a/modules/item/back/methods/item/getVisibleAvailable.js +++ b/modules/item/back/methods/item/getVisibleAvailable.js @@ -23,11 +23,11 @@ module.exports = Self => { } }); - Self.getVisibleAvailable = async(itemFk, warehouseFk) => { + Self.getVisibleAvailable = async(id, warehouseFk) => { let query = ` CALL vn.getItemVisibleAvailable(?,curdate(),?,?)`; - let options = [itemFk, warehouseFk, false]; + let options = [id, warehouseFk, false]; [res] = await Self.rawSql(query, options); return { diff --git a/modules/item/front/descriptor/index.js b/modules/item/front/descriptor/index.js index 922ca4814..da94aacb6 100644 --- a/modules/item/front/descriptor/index.js +++ b/modules/item/front/descriptor/index.js @@ -34,20 +34,21 @@ class Controller { set item(value) { this._item = value; - this.updateStock(); + if (value && value.itemType && value.itemType.warehouseFk) + this.updateStock(value.itemType.warehouseFk); } get item() { return this._item; } - updateStock() { + updateStock(warehouseFk) { this.available = null; this.visible = null; if (this._item && this._item.id) { let options = { params: { - warehouseFk: this._warehouseFk + warehouseFk: warehouseFk } }; this.$http.get(`/item/api/Items/${this._item.id}/getVisibleAvailable`, options).then(response => { @@ -81,7 +82,7 @@ class Controller { warehouseFk: this.warehouseFk }).then(res => { this.vnApp.showSuccess(this.$translate.instant('Data saved!')); - this.updateStock(); + this.updateStock(this.item.itemType.warehouseFk); }); } } From efff9d21848fdefd1adf25c1127f5f6481e986b2 Mon Sep 17 00:00:00 2001 From: Gerard Date: Wed, 20 Feb 2019 11:36:55 +0100 Subject: [PATCH 09/14] deleted duplicated data --- modules/item/front/index/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html index 997f2fded..8a8b920eb 100644 --- a/modules/item/front/index/index.html +++ b/modules/item/front/index/index.html @@ -72,7 +72,6 @@ {{::item.userNickname}} - {{::item.density}} {{::item.density}} {{::item.taxClass}} From 5d6951a610bad2f1c987f8f14e7165154a65a98f Mon Sep 17 00:00:00 2001 From: Gerard Date: Wed, 20 Feb 2019 11:41:06 +0100 Subject: [PATCH 10/14] deleted deprecated component --- modules/item/front/index/index.js | 1 - modules/item/front/index/product.html | 38 --------------------- modules/item/front/index/product.js | 49 --------------------------- modules/item/front/index/style.scss | 26 -------------- 4 files changed, 114 deletions(-) delete mode 100644 modules/item/front/index/product.html delete mode 100644 modules/item/front/index/product.js diff --git a/modules/item/front/index/index.js b/modules/item/front/index/index.js index 01b568d11..7a5adc600 100644 --- a/modules/item/front/index/index.js +++ b/modules/item/front/index/index.js @@ -1,5 +1,4 @@ import ngModule from '../module'; -import './product'; import './style.scss'; class Controller { diff --git a/modules/item/front/index/product.html b/modules/item/front/index/product.html deleted file mode 100644 index a390e2e09..000000000 --- a/modules/item/front/index/product.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - -

{{::$ctrl.item.id}} - {{::$ctrl.item.name}}
- - - - - - - - - - - - - - diff --git a/modules/item/front/index/product.js b/modules/item/front/index/product.js deleted file mode 100644 index 0dcaf0824..000000000 --- a/modules/item/front/index/product.js +++ /dev/null @@ -1,49 +0,0 @@ -import ngModule from '../module'; - -class ItemProduct { - onClick(event) { - if (event.defaultPrevented) - event.stopImmediatePropagation(); - } - - set item(value) { - if (value) { - let tags = []; - for (let i = 5; i < 9; i++) { - if (value['tag' + i]) { - let tagValue = value['value' + i]; - let tagKey = value['tag' + i]; - tags.push({tag: {name: tagKey}, value: tagValue}); - } - } - value.tags = tags; - } - - this._item = value; - } - - get item() { - return this._item; - } - - clone(event) { - event.preventDefault(); - this.index.cloneItem(this.item); - } - - preview(event) { - event.preventDefault(); - this.index.showItemPreview(this.item); - } -} - -ngModule.component('vnItemProduct', { - template: require('./product.html'), - bindings: { - item: '<' - }, - controller: ItemProduct, - require: { - index: '^vnItemIndex' - } -}); diff --git a/modules/item/front/index/style.scss b/modules/item/front/index/style.scss index 1cbc88124..74f1c1f9c 100644 --- a/modules/item/front/index/style.scss +++ b/modules/item/front/index/style.scss @@ -1,31 +1,5 @@ @import "variables"; -vn-item-product { - display: block; - - .id { - background-color: $color-main; - color: $color-font-dark; - margin-bottom: 0em; - } - .image { - height: 7em; - width: 7em; - - & > img { - max-height: 100%; - max-width: 100%; - border-radius: .2em; - } - } - vn-label-value:first-of-type section{ - margin-top: 0.6em; - } - vn-fetched-tags vn-horizontal{ - margin-top: 0.9em; - } -} - vn-table { img { border-radius: 50%; From b97cb52abe99bbed69e60e50718077ab974be9b8 Mon Sep 17 00:00:00 2001 From: Gerard Date: Wed, 20 Feb 2019 11:52:36 +0100 Subject: [PATCH 11/14] changed traduction of email --- modules/client/front/basic-data/locale/es.yml | 2 +- modules/client/front/create/locale/es.yml | 2 +- modules/client/front/index/locale/es.yml | 2 +- modules/client/front/search-panel/locale/es.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/client/front/basic-data/locale/es.yml b/modules/client/front/basic-data/locale/es.yml index 34edb5986..7d7722e43 100644 --- a/modules/client/front/basic-data/locale/es.yml +++ b/modules/client/front/basic-data/locale/es.yml @@ -4,7 +4,7 @@ Social name: Razón social Phone: Teléfono Mobile: Móvil Fax: Fax -Email: Correo electrónico +Email: E-mail Salesperson: Comercial Channel: Canal You can save multiple emails: >- diff --git a/modules/client/front/create/locale/es.yml b/modules/client/front/create/locale/es.yml index 5c33aace1..6922ba917 100644 --- a/modules/client/front/create/locale/es.yml +++ b/modules/client/front/create/locale/es.yml @@ -2,7 +2,7 @@ Name: Nombre Tax number: NIF/CIF Business name: Razón social Web user: Usuario Web -Email: Correo electrónico +Email: E-mail Create and edit: Crear y editar You can save multiple emails: >- Puede guardar varios correos electrónicos encadenándolos mediante comas diff --git a/modules/client/front/index/locale/es.yml b/modules/client/front/index/locale/es.yml index 71bd4963a..35c21976c 100644 --- a/modules/client/front/index/locale/es.yml +++ b/modules/client/front/index/locale/es.yml @@ -1,5 +1,5 @@ Client id: Id cliente Phone: Teléfono Town/City: Ciudad -Email: Correo electrónico +Email: E-mail View client: Ver cliente \ No newline at end of file diff --git a/modules/client/front/search-panel/locale/es.yml b/modules/client/front/search-panel/locale/es.yml index 590d0e6d8..93d2faf53 100644 --- a/modules/client/front/search-panel/locale/es.yml +++ b/modules/client/front/search-panel/locale/es.yml @@ -4,5 +4,5 @@ Name: Nombre Social name: Razon social Town/City: Ciudad Postcode: Código postal -Email: Correo electrónico +Email: E-mail Phone: Teléfono \ No newline at end of file From 23e08331fc80200cab59a62fbb520adabc92dd0e Mon Sep 17 00:00:00 2001 From: Gerard Date: Wed, 20 Feb 2019 12:12:16 +0100 Subject: [PATCH 12/14] fetched tags not sowing title and displaying wrong fixed --- modules/order/front/line/index.html | 18 ++++++++++++------ modules/order/front/summary/index.html | 10 ++++++++-- modules/order/front/volume/index.html | 8 +++++++- modules/ticket/front/component/index.html | 6 +++++- modules/ticket/front/data/step-two/index.html | 8 +++++++- modules/ticket/front/sale-checked/index.html | 10 ++++++++-- modules/ticket/front/sale-tracking/index.html | 8 +++++++- modules/ticket/front/sale/index.html | 6 +++++- modules/ticket/front/volume/index.html | 2 +- 9 files changed, 60 insertions(+), 16 deletions(-) diff --git a/modules/order/front/line/index.html b/modules/order/front/line/index.html index d8b27efe3..54e743845 100644 --- a/modules/order/front/line/index.html +++ b/modules/order/front/line/index.html @@ -36,15 +36,21 @@ - {{row.itemFk | zeroFill:6}} + {{::row.itemFk | zeroFill:6}} - - {{row.warehouse.name}} - {{row.shipped | date: 'dd/MM/yyyy'}} - {{row.quantity}} + + + + + {{::row.warehouse.name}} + {{::row.shipped | date: 'dd/MM/yyyy'}} + {{::row.quantity}} - {{row.price | currency: 'EUR':2}} + {{::row.price | currency: 'EUR':2}} - {{row.itemFk | zeroFill:6}} + {{::row.itemFk | zeroFill:6}} - + + + + {{::row.quantity}} {{::row.price | currency: 'EUR':2}} {{::row.quantity * row.price | currency: 'EUR':2}} diff --git a/modules/order/front/volume/index.html b/modules/order/front/volume/index.html index acc6fd892..359e9e37b 100644 --- a/modules/order/front/volume/index.html +++ b/modules/order/front/volume/index.html @@ -38,7 +38,13 @@ {{::row.itemFk}} - + + + + {{::row.quantity}} {{::row.volume | number:3}} diff --git a/modules/ticket/front/component/index.html b/modules/ticket/front/component/index.html index 165d3addb..9274a4c18 100644 --- a/modules/ticket/front/component/index.html +++ b/modules/ticket/front/component/index.html @@ -48,7 +48,11 @@ - + + {{::sale.quantity}} diff --git a/modules/ticket/front/data/step-two/index.html b/modules/ticket/front/data/step-two/index.html index b4d07a548..e343ad9e9 100644 --- a/modules/ticket/front/data/step-two/index.html +++ b/modules/ticket/front/data/step-two/index.html @@ -15,7 +15,13 @@ {{("000000"+sale.itemFk).slice(-6)}} - + + + + {{::sale.quantity}} {{::sale.price | currency: 'EUR': 2}} {{::sale.component.newPrice | currency: 'EUR': 2}} diff --git a/modules/ticket/front/sale-checked/index.html b/modules/ticket/front/sale-checked/index.html index 89256c95e..3c8a925c2 100644 --- a/modules/ticket/front/sale-checked/index.html +++ b/modules/ticket/front/sale-checked/index.html @@ -30,10 +30,16 @@ - {{sale.itemFk | zeroFill:6}} + {{::sale.itemFk | zeroFill:6}} - + + + + {{::sale.quantity}} diff --git a/modules/ticket/front/sale-tracking/index.html b/modules/ticket/front/sale-tracking/index.html index da33b4be1..f166b7882 100644 --- a/modules/ticket/front/sale-tracking/index.html +++ b/modules/ticket/front/sale-tracking/index.html @@ -37,7 +37,13 @@ {{sale.itemFk | zeroFill:6}} - + + + + {{::sale.quantity}} {{::sale.originalQuantity}} diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html index 62dc10294..24517d2a6 100644 --- a/modules/ticket/front/sale/index.html +++ b/modules/ticket/front/sale/index.html @@ -108,7 +108,11 @@ - + + {{sale.quantity}} diff --git a/modules/ticket/front/volume/index.html b/modules/ticket/front/volume/index.html index 4121ec4ab..34de1e470 100644 --- a/modules/ticket/front/volume/index.html +++ b/modules/ticket/front/volume/index.html @@ -38,7 +38,7 @@ {{sale.itemFk | zeroFill:6}} - + {{::sale.quantity}} {{::sale.volume.m3 | number:3}} From 687e000e607f6c1d1e953a0a1756637571cae876 Mon Sep 17 00:00:00 2001 From: Gerard Date: Wed, 20 Feb 2019 12:25:41 +0100 Subject: [PATCH 13/14] deleted route model as its not longer needed and --- back/model-config.json | 3 --- back/models/route.json | 19 ------------------- 2 files changed, 22 deletions(-) delete mode 100644 back/models/route.json diff --git a/back/model-config.json b/back/model-config.json index 0a0772b04..537ffb569 100644 --- a/back/model-config.json +++ b/back/model-config.json @@ -32,9 +32,6 @@ "Sip": { "dataSource": "vn" }, - "Route": { - "dataSource": "vn" - }, "Vehicle": { "dataSource": "vn" }, diff --git a/back/models/route.json b/back/models/route.json deleted file mode 100644 index 1bfddd3de..000000000 --- a/back/models/route.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "Route", - "base": "VnModel", - "options": { - "mysql": { - "table": "route" - } - }, - "properties": { - "id": { - "type": "Number", - "id": true, - "description": "Identifier" - }, - "date": { - "type": "date" - } - } -} \ No newline at end of file From 90092a4f48307e89342b7e5635f89b8e29e9d47b Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Wed, 20 Feb 2019 12:31:08 +0100 Subject: [PATCH 14/14] fixed treeview order --- front/core/components/icon/icon.js | 2 +- front/core/components/icon/style.scss | 1 + front/core/components/treeview/index.js | 35 +++++-------------- .../agency/back/methods/zone-geo/getLeaves.js | 27 ++++++++------ 4 files changed, 26 insertions(+), 39 deletions(-) diff --git a/front/core/components/icon/icon.js b/front/core/components/icon/icon.js index 01087b0c7..1b78f4693 100644 --- a/front/core/components/icon/icon.js +++ b/front/core/components/icon/icon.js @@ -26,7 +26,7 @@ class Icon { Icon.$inject = ['$attrs']; ngModule.component('vnIcon', { - template: '{{::$ctrl.iconContent}}', + template: '{{::$ctrl.iconContent}}', controller: Icon, bindings: { icon: '@' diff --git a/front/core/components/icon/style.scss b/front/core/components/icon/style.scss index bed29630d..07a1584e3 100644 --- a/front/core/components/icon/style.scss +++ b/front/core/components/icon/style.scss @@ -2,6 +2,7 @@ vn-icon { display: inline-block; font-size: 18pt; text-align: center; + outline: 0; & > i, & > i.material-icons { diff --git a/front/core/components/treeview/index.js b/front/core/components/treeview/index.js index a71a3a342..0737bf8cb 100644 --- a/front/core/components/treeview/index.js +++ b/front/core/components/treeview/index.js @@ -23,28 +23,6 @@ export default class Treeview extends Component { }); } - /* hasCheckedChilds(node) { - if (!node.childs) return false; - - const childs = node.childs; - for (let i = 0; i < childs.length; i++) { - if (childs[i].selected || this.hasCheckedChilds(childs[i])) - return true; - } - - return false; - } - - hasCheckedParents(node) { - if (!node.parent) return false; - - const parent = node.parent; - if (parent.selected || this.hasCheckedParents(parent)) - return true; - - return false; - } */ - onSelection(item, value) { this.emit('selection', {item, value}); } @@ -67,12 +45,15 @@ export default class Treeview extends Component { } item.childs = newData.sort((a, b) => { - let priority = (b.isIncluded - a.isIncluded) - 1; + if (b.isIncluded !== a.isIncluded) { + if (a.isIncluded == null) + return 1; + if (b.isIncluded == null) + return -1; + return b.isIncluded - a.isIncluded; + } - if (b.name > a.name) - priority++; - - return priority; + return a.name.localeCompare(b.name); }); }); } diff --git a/modules/agency/back/methods/zone-geo/getLeaves.js b/modules/agency/back/methods/zone-geo/getLeaves.js index 631286465..64bb68318 100644 --- a/modules/agency/back/methods/zone-geo/getLeaves.js +++ b/modules/agency/back/methods/zone-geo/getLeaves.js @@ -116,16 +116,7 @@ module.exports = Self => { const parentNodes = nodes.filter(element => { return element.depth === minorDepth; }); - - const sortedLeaves = parentNodes.sort((a, b) => { - let priority = (b.isIncluded - a.isIncluded) - 1; - - if (b.name > a.name) - priority++; - - return priority; - }); - const leaves = Object.assign([], sortedLeaves); + const leaves = Object.assign([], sortNodes(parentNodes)); nestLeaves(leaves); @@ -143,9 +134,23 @@ module.exports = Self => { && element.depth === parent.depth + 1; }); - return elements; + return sortNodes(elements); } return leaves; }; + + function sortNodes(nodes) { + return nodes.sort((a, b) => { + if (b.isIncluded !== a.isIncluded) { + if (a.isIncluded == null) + return 1; + if (b.isIncluded == null) + return -1; + return b.isIncluded - a.isIncluded; + } + + return a.name.localeCompare(b.name); + }); + } };