diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 38cc5a2e74..d4a5fea0ef 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -262,7 +262,7 @@ export default { itemDiary: { thirdTicketId: 'vn-item-diary vn-tbody > vn-tr:nth-child(3) > vn-td:nth-child(2) > span', firstBalance: 'vn-item-diary vn-tbody > vn-tr:nth-child(1) > vn-td.balance', - fifthBalance: 'vn-item-diary vn-tbody > vn-tr.ng-scope.isToday.isIn > vn-td.balance > span', + fifthBalance: 'vn-item-diary vn-tbody > vn-tr:nth-child(5) > vn-td.balance', warehouseAutocomplete: 'vn-item-diary vn-autocomplete[field="$ctrl.warehouseFk"]', }, ticketSummary: { @@ -484,7 +484,8 @@ export default { orderByAutocomplete: `vn-autocomplete[label="Order by"]`, }, orderBasicData: { - clientAutocomplete: `vn-autocomplete[label=Client]`, + clientAutocomplete: `vn-autocomplete[label="Client"]`, + addressAutocomplete: `vn-autocomplete[label="Address"]`, 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 2f24cf94a5..0efcc4f8c6 100644 --- a/e2e/paths/order-module/01_edit_basic_data.spec.js +++ b/e2e/paths/order-module/01_edit_basic_data.spec.js @@ -1,8 +1,7 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/nightmare'; -// Bug #808 order.basic-data -xdescribe('Order edit basic data path', () => { +describe('Order edit basic data path', () => { const nightmare = createNightmare(); describe('when confirmed order', () => { beforeAll(() => { @@ -15,11 +14,12 @@ xdescribe('Order edit basic data path', () => { it('should not be able to change the client', async() => { const result = await nightmare .autocompleteSearch(selectors.orderBasicData.clientAutocomplete, 'Tony Stark') + .autocompleteSearch(selectors.orderBasicData.addressAutocomplete, 'Tony Stark') .waitToClick(selectors.orderBasicData.saveButton) .waitForLastSnackbar(); expect(result).toEqual(`You can't make changes on the basic data of an confirmed order or with rows`); - }); + }, 15000); }); describe('when order with rows', () => { @@ -63,6 +63,7 @@ xdescribe('Order edit basic data path', () => { it('should be able to modify all the properties', async() => { const result = await nightmare .autocompleteSearch(selectors.orderBasicData.clientAutocomplete, 'Tony Stark') + .autocompleteSearch(selectors.orderBasicData.addressAutocomplete, 'Tony Stark') .clearInput(selectors.orderBasicData.observationInput) .write(selectors.orderBasicData.observationInput, 'Observation modified') .waitToClick(selectors.orderBasicData.saveButton) diff --git a/e2e/paths/ticket-module/11_ticket_diary.spec.js b/e2e/paths/ticket-module/11_ticket_diary.spec.js index f5bb6fbc7e..933628e5d4 100644 --- a/e2e/paths/ticket-module/11_ticket_diary.spec.js +++ b/e2e/paths/ticket-module/11_ticket_diary.spec.js @@ -50,7 +50,7 @@ describe('Ticket diary path', () => { it(`should check the fifth line balance is marked as counter`, async() => { const result = await nightmare - .waitToGetProperty(selectors.itemDiary.fifthBalance, 'className'); + .waitToGetProperty(`${selectors.itemDiary.fifthBalance} > span`, 'className'); expect(result).toContain('counter'); }); diff --git a/front/core/components/array-model/array-model.js b/front/core/components/array-model/array-model.js index e1bbb7eea8..3697abc3ba 100644 --- a/front/core/components/array-model/array-model.js +++ b/front/core/components/array-model/array-model.js @@ -75,9 +75,9 @@ export default class ArrayModel extends ModelProxy { }); } - data.sort((a, b) => this.sortFunc(a, b, orderComp)); + data = data.sort((a, b) => this.sortFunc(a, b, orderComp)); } else if (typeof order === 'function') - data.sort(order); + data = data.sort(order); this.skip = skip; diff --git a/front/core/components/check/check.html b/front/core/components/check/check.html index 67545b67c6..55a2f9c8c9 100644 --- a/front/core/components/check/check.html +++ b/front/core/components/check/check.html @@ -1,13 +1,13 @@ {{::$ctrl.label}} + ng-if="::$ctrl.hasInfo" + vn-tooltip="{{::$ctrl.info}}"> info_outline \ No newline at end of file diff --git a/front/core/components/check/style.scss b/front/core/components/check/style.scss index 696e1dc0c9..0804a57500 100644 --- a/front/core/components/check/style.scss +++ b/front/core/components/check/style.scss @@ -14,4 +14,8 @@ vn-check { md-checkbox.md-checked .md-icon { background-color: $color-main; } + + md-checkbox { + margin-bottom: 0 + } } diff --git a/front/core/components/fetched-tags/index.html b/front/core/components/fetched-tags/index.html index 3b1dc54f6d..546e5d67d3 100644 --- a/front/core/components/fetched-tags/index.html +++ b/front/core/components/fetched-tags/index.html @@ -4,8 +4,8 @@
+ ng-repeat="fetchedTag in $ctrl.tags track by $index" + title="{{::fetchedTag.name}}: {{::fetchedTag.value}}"> {{::fetchedTag.value}}
diff --git a/front/core/components/log/index.html b/front/core/components/log/index.html index eb065c6cb4..8211a8e085 100644 --- a/front/core/components/log/index.html +++ b/front/core/components/log/index.html @@ -77,9 +77,6 @@ - - No results - diff --git a/front/salix/styles/variables.scss b/front/salix/styles/variables.scss index b794d56109..36a1a14db4 100644 --- a/front/salix/styles/variables.scss +++ b/front/salix/styles/variables.scss @@ -32,6 +32,7 @@ $color-font: #222222; $color-font-secondary: #9b9b9b; $color-font-dark: white; $color-font-bg: rgba(0, 0, 0, .7); +$color-font-link: #005a9a; $color-active: #3d3d3d; $color-active-font: white; $color-bg-panel: white; @@ -40,6 +41,7 @@ $color-secondary: #ccc; $color-success: #a3d131; $color-notice: #32b1ce; $color-alert: #f42121; + $color-spacer: rgba(0, 0, 0, .3); $color-spacer-light: rgba(0, 0, 0, .12); $color-input-underline: rgba(0, 0, 0, .12); @@ -49,7 +51,6 @@ $color-hover-cd: rgba(0, 0, 0, .1); $color-hover-dc: .7; $color-disabled: .6; -$color-font-link: darken($color-main, 10%); $color-main-medium: lighten($color-main, 20%); $color-main-light: lighten($color-main, 35%); $color-success-medium: lighten($color-success, 20%); @@ -68,6 +69,7 @@ $color-font: white; $color-font-secondary: #777; $color-font-dark: white; $color-font-bg: rgba(0, 0, 0, .8); +$color-font-link: #005a9a; $color-active: #666; $color-active-font: white; $color-bg-panel: #3c3b3b; diff --git a/loopback/locale/en.json b/loopback/locale/en.json index b56b03a38b..ac9e6b1324 100644 --- a/loopback/locale/en.json +++ b/loopback/locale/en.json @@ -36,5 +36,6 @@ "The warehouse can't be repeated": "The warehouse can't be repeated", "Barcode must be unique": "Barcode must be unique", "You don't have enough privileges to do that": "You don't have enough privileges to do that", - "You can't create a ticket for a frozen client": "You can't create a ticket for a frozen client" + "You can't create a ticket for a frozen client": "You can't create a ticket for a frozen client", + "can't be blank": "can't be blank" } \ No newline at end of file diff --git a/modules/claim/front/index/index.html b/modules/claim/front/index/index.html index 535fbc2148..67aedec4b4 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 - @@ -76,7 +70,7 @@ + user-id="$ctrl.selectedWorker"> diff --git a/modules/claim/front/summary/index.html b/modules/claim/front/summary/index.html index 4a04ae4e2c..dd50d4933b 100644 --- a/modules/claim/front/summary/index.html +++ b/modules/claim/front/summary/index.html @@ -149,5 +149,5 @@ + user-id="$ctrl.selectedWorker"> \ No newline at end of file diff --git a/modules/client/front/credit/index/index.html b/modules/client/front/credit/index/index.html index a68e31d2ff..3a9244f862 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/index/index.html b/modules/client/front/index/index.html index 32f01c7e4e..5a964cfe5c 100644 --- a/modules/client/front/index/index.html +++ b/modules/client/front/index/index.html @@ -22,14 +22,6 @@ ng-repeat="client in clients track by client.id" client="::client"> - - No results - - - Enter a new search - diff --git a/modules/client/front/mandate/index.html b/modules/client/front/mandate/index.html index 69beeaa02f..4b290d2057 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 b130d73c2a..1e80094292 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/item/back/methods/item/getCard.js b/modules/item/back/methods/item/getCard.js index b9be274e1e..9780c5601e 100644 --- a/modules/item/back/methods/item/getCard.js +++ b/modules/item/back/methods/item/getCard.js @@ -60,16 +60,6 @@ module.exports = Self => { }; [item] = await Self.app.models.Item.find(filter); - // Visible Avaible - let query = ` - CALL vn.getItemVisibleAvailable(?,curdate(),?,?)`; - - let options = [item.id, item.itemType().warehouseFk, false]; - let [res] = await Self.rawSql(query, options); - - item.available = res[0].available ? res[0].available : '-'; - item.visible = res[0].visible ? res[0].visible : '-'; - return item; }; }; diff --git a/modules/item/back/methods/item/getVisibleAvailable.js b/modules/item/back/methods/item/getVisibleAvailable.js new file mode 100644 index 0000000000..fecdb736ba --- /dev/null +++ b/modules/item/back/methods/item/getVisibleAvailable.js @@ -0,0 +1,37 @@ +module.exports = Self => { + Self.remoteMethod('getVisibleAvailable', { + description: 'Returns visible and available for params', + accessType: '', + accepts: [ + { + arg: 'id', + type: 'Number', + required: true, + }, + { + arg: 'warehouseFk', + type: 'Number', + required: true, + }], + returns: { + type: ['object'], + root: true + }, + http: { + path: `/:id/getVisibleAvailable`, + verb: 'GET' + } + }); + + Self.getVisibleAvailable = async(itemFk, warehouseFk) => { + let query = ` + CALL vn.getItemVisibleAvailable(?,curdate(),?,?)`; + + let options = [itemFk, warehouseFk, false]; + [res] = await Self.rawSql(query, options); + + return { + available: res[0].available, + visible: res[0].visible}; + }; +}; diff --git a/modules/item/back/methods/item/regularize.js b/modules/item/back/methods/item/regularize.js index 12c28144ca..a9644cc1dc 100644 --- a/modules/item/back/methods/item/regularize.js +++ b/modules/item/back/methods/item/regularize.js @@ -28,7 +28,7 @@ module.exports = Self => { } }); - Self.regularize = async (ctx, itemFk, quantity, warehouseFk) => { + Self.regularize = async(ctx, itemFk, quantity, warehouseFk) => { const userId = ctx.req.accessToken.userId; const models = Self.app.models; diff --git a/modules/item/back/models/item.js b/modules/item/back/models/item.js index e34b2eec58..628bd5a030 100644 --- a/modules/item/back/models/item.js +++ b/modules/item/back/models/item.js @@ -9,6 +9,7 @@ module.exports = Self => { require('../methods/item/getSummary')(Self); require('../methods/item/getCard')(Self); require('../methods/item/regularize')(Self); + require('../methods/item/getVisibleAvailable')(Self); require('../methods/item/new')(Self); Self.validatesPresenceOf('originFk', {message: 'Cannot be blank'}); diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html index 02e1267dca..a0d6404f54 100644 --- a/modules/item/front/descriptor/index.html +++ b/modules/item/front/descriptor/index.html @@ -34,11 +34,11 @@

Visible

-

{{$ctrl.item.visible}}

+

{{$ctrl.visible | dashIfEmpty}}

Available

-

{{$ctrl.item.available}}

+

{{$ctrl.available | dashIfEmpty}}

 diff --git a/modules/item/front/descriptor/index.js b/modules/item/front/descriptor/index.js index 79e669b870..922ca48146 100644 --- a/modules/item/front/descriptor/index.js +++ b/modules/item/front/descriptor/index.js @@ -25,7 +25,6 @@ class Controller { if (value) this._warehouseFk = value; } - get warehouseFk() { if (!this._warehouseFk) this._warehouseFk = parseInt(window.localStorage.defaultWarehouseFk); @@ -33,6 +32,31 @@ class Controller { return this._warehouseFk; } + set item(value) { + this._item = value; + this.updateStock(); + } + + get item() { + return this._item; + } + + updateStock() { + this.available = null; + this.visible = null; + if (this._item && this._item.id) { + let options = { + params: { + warehouseFk: this._warehouseFk + } + }; + this.$http.get(`/item/api/Items/${this._item.id}/getVisibleAvailable`, options).then(response => { + this.available = response.data.available; + this.visible = response.data.visible; + }); + } + } + onMoreChange(callback) { callback.call(this); } @@ -57,6 +81,7 @@ class Controller { warehouseFk: this.warehouseFk }).then(res => { this.vnApp.showSuccess(this.$translate.instant('Data saved!')); + this.updateStock(); }); } } diff --git a/modules/item/front/diary/index.html b/modules/item/front/diary/index.html index 0e1accd05b..6a03d85057 100644 --- a/modules/item/front/diary/index.html +++ b/modules/item/front/diary/index.html @@ -35,14 +35,14 @@ - + {{::sale.date | date:'dd/MM/yyyy' }} diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html index ec40b37804..997f2fded9 100644 --- a/modules/item/front/index/index.html +++ b/modules/item/front/index/index.html @@ -56,8 +56,8 @@ + item="::item" + title="::item.name"> {{::item.stems}} @@ -78,7 +78,7 @@ + field="::item.isActive"> @@ -119,5 +119,5 @@ + user-id="$ctrl.selectedWorker"> \ No newline at end of file diff --git a/modules/order/back/methods/order/catalogFilter.js b/modules/order/back/methods/order/catalogFilter.js index 7c609ec8d0..9fa74647c1 100644 --- a/modules/order/back/methods/order/catalogFilter.js +++ b/modules/order/back/methods/order/catalogFilter.js @@ -111,6 +111,7 @@ module.exports = Self => { FROM tmp.ticketCalculateItem tci JOIN vn.item i ON i.id = tci.itemFk JOIN vn.itemType it ON it.id = i.typeFk + JOIN vn.ink ON ink.id = i.inkFk JOIN vn.worker w on w.id = it.workerFk`); // Apply order by tag diff --git a/modules/order/front/basic-data/index.html b/modules/order/front/basic-data/index.html index 50e8c99019..672ae92fa3 100644 --- a/modules/order/front/basic-data/index.html +++ b/modules/order/front/basic-data/index.html @@ -29,9 +29,10 @@ diff --git a/modules/order/front/catalog/index.html b/modules/order/front/catalog/index.html index 8fda4bd700..adf7e46cd5 100644 --- a/modules/order/front/catalog/index.html +++ b/modules/order/front/catalog/index.html @@ -19,6 +19,7 @@ initial-data="$ctrl.field" field="$ctrl.field" translate-fields="['name']" + order="name" show-field="name" value-field="field" label="Order by"> diff --git a/modules/order/front/catalog/index.js b/modules/order/front/catalog/index.js index ec28df4202..bc9bd20d58 100644 --- a/modules/order/front/catalog/index.js +++ b/modules/order/front/catalog/index.js @@ -12,7 +12,9 @@ class Controller { {way: 'DESC', name: 'Descendant'}, ]; this.defaultFieldList = [ - {field: 'relevancy DESC, name', name: 'Name'}, + {field: 'relevancy DESC, name', name: 'Default'}, + {field: 'showOrder, price', name: 'Color'}, + {field: 'name', name: 'Name'}, {field: 'price', name: 'Price'} ]; this.fieldList = []; @@ -27,20 +29,18 @@ class Controller { */ onDataChange() { const items = this.$scope.model.data; - + const newFilterList = []; if (!items) return; - this.fieldList = []; - this.fieldList = this.fieldList.concat(this.defaultFieldList); - items.forEach(item => { + // Add new tag filters item.tags.forEach(itemTag => { - const alreadyAdded = this.fieldList.find(order => { - return order.field == itemTag.tagFk; + const alreadyAdded = newFilterList.findIndex(filter => { + return filter.field == itemTag.tagFk; }); - if (!alreadyAdded) { - this.fieldList.push({ + if (alreadyAdded == -1) { + newFilterList.push({ name: itemTag.name, field: itemTag.tagFk, isTag: true @@ -48,6 +48,20 @@ class Controller { } }); }); + + // Add default filters - Replaces tags with same name + this.defaultFieldList.forEach(defaultField => { + const index = newFilterList.findIndex(newfield => { + return newfield.name == defaultField.name; + }); + + if (index > -1) + newFilterList[index] = defaultField; + else + newFilterList.push(defaultField); + }); + + this.fieldList = newFilterList; } /** diff --git a/modules/order/front/catalog/index.spec.js b/modules/order/front/catalog/index.spec.js index 3f3c49c649..98494b3cad 100644 --- a/modules/order/front/catalog/index.spec.js +++ b/modules/order/front/catalog/index.spec.js @@ -17,18 +17,17 @@ describe('Order', () => { describe('onDataChange()', () => { it(`should return an object with order params`, () => { - let expectedList = [ - {field: 'relevancy DESC, name', name: 'Name'}, - {field: 'price', name: 'Price'}, - {field: 4, name: 'Length', isTag: true} - ]; $scope.model.data = [{id: 1, name: 'My Item', tags: [ - {tagFk: 4, name: 'Length'} + {tagFk: 4, name: 'Length'}, + {tagFk: 5, name: 'Color'} ]}]; - + let expectedResult = [{field: 'showOrder, price', name: 'Color'}]; + let unexpectedResult = [{tagFk: 5, name: 'Color'}]; controller.onDataChange(); - expect(controller.fieldList).toEqual(expectedList); + expect(controller.fieldList.length).toEqual(5); + expect(controller.fieldList).toEqual(jasmine.arrayContaining(expectedResult)); + expect(controller.fieldList).not.toEqual(jasmine.arrayContaining(unexpectedResult)); }); }); diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html index 9c738d2e82..b2d934ce48 100644 --- a/modules/order/front/index/index.html +++ b/modules/order/front/index/index.html @@ -66,9 +66,6 @@ - - Enter a new search - @@ -81,7 +78,7 @@ + user-id="$ctrl.selectedWorker"> {{ticket.state.state.name}} - - No results - diff --git a/modules/ticket/front/descriptor/removeStowaway.html b/modules/ticket/front/descriptor/removeStowaway.html index 7653d25b78..515d6b2cc1 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/expedition/index.html b/modules/ticket/front/expedition/index.html index be34e1c248..1b713a9e6c 100644 --- a/modules/ticket/front/expedition/index.html +++ b/modules/ticket/front/expedition/index.html @@ -64,7 +64,7 @@ + user-id="$ctrl.selectedWorker"> + user-id="$ctrl.selectedWorker"> \ No newline at end of file diff --git a/modules/ticket/front/request/index/index.html b/modules/ticket/front/request/index/index.html index f15c4e55ea..e868486af7 100644 --- a/modules/ticket/front/request/index/index.html +++ b/modules/ticket/front/request/index/index.html @@ -86,7 +86,7 @@ + user-id="$ctrl.selectedWorker"> + user-id="$ctrl.selectedWorker"> \ No newline at end of file diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html index 427ea19586..62dc102941 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/ticket/front/tracking/index/index.html b/modules/ticket/front/tracking/index/index.html index 4497fdad25..269fe23acb 100644 --- a/modules/ticket/front/tracking/index/index.html +++ b/modules/ticket/front/tracking/index/index.html @@ -41,5 +41,5 @@ + user-id="$ctrl.selectedWorker"> \ No newline at end of file diff --git a/modules/travel/front/index/index.html b/modules/travel/front/index/index.html index 21750fa8b7..744b0680df 100644 --- a/modules/travel/front/index/index.html +++ b/modules/travel/front/index/index.html @@ -47,9 +47,6 @@ - - Enter a new search - diff --git a/modules/worker/front/descriptor-popover/index.js b/modules/worker/front/descriptor-popover/index.js index 637bfe50c5..0df83ae45b 100644 --- a/modules/worker/front/descriptor-popover/index.js +++ b/modules/worker/front/descriptor-popover/index.js @@ -11,16 +11,16 @@ class Controller extends Component { this.worker = null; } - set workerFk(id) { - if (id == this._workerFk) return; + set userId(id) { + if (id == this._userId) return; - this._workerFk = id; + this._userId = id; this.worker = null; this.loadData(); } - get workerFk() { - return this._workerFk; + get userId() { + return this._userId; } set quicklinks(value = {}) { @@ -37,8 +37,11 @@ class Controller extends Component { } loadData() { - let query = `api/Workers/${this._workerFk}`; + let query = `api/Workers/findOne`; let filter = { + where: { + userFk: this._userId + }, include: [ { relation: 'user', @@ -49,6 +52,13 @@ class Controller extends Component { }, { relation: 'sip', scope: {fields: ['extension']} + }, { + relation: 'department', + scope: { + include: { + relation: 'department' + } + } } ] }; @@ -67,7 +77,7 @@ ngModule.component('vnWorkerDescriptorPopover', { template: require('./index.html'), controller: Controller, bindings: { - workerFk: '<', + userId: '<', quicklinks: '<' } }); diff --git a/modules/worker/front/descriptor-popover/index.spec.js b/modules/worker/front/descriptor-popover/index.spec.js index 246fb9b377..c0267c397d 100644 --- a/modules/worker/front/descriptor-popover/index.spec.js +++ b/modules/worker/front/descriptor-popover/index.spec.js @@ -21,23 +21,23 @@ describe('worker Component vnWorkerDescriptorPopover', () => { describe('workerFk()', () => { it(`should not apply any changes if the received id is the same stored in _workerFk`, () => { controller.worker = 'I exist!'; - controller._workerFk = 1; + controller._userId = 1; spyOn(controller, 'loadData'); - controller.workerFk = 1; + controller.userId = 1; expect(controller.worker).toEqual('I exist!'); - expect(controller._workerFk).toEqual(1); + expect(controller._userId).toEqual(1); expect(controller.loadData).not.toHaveBeenCalled(); }); it(`should set the received id into _workerFk, set the worker to null and then call loadData()`, () => { controller.worker = `Please don't`; - controller._workerFk = 1; + controller._userId = 1; spyOn(controller, 'loadData'); - controller.workerFk = 999; + controller.userId = 999; expect(controller.worker).toBeNull(); - expect(controller._workerFk).toEqual(999); + expect(controller._userId).toEqual(999); expect(controller.loadData).toHaveBeenCalledWith(); }); }); @@ -53,12 +53,15 @@ describe('worker Component vnWorkerDescriptorPopover', () => { describe('loadData()', () => { it(`should perform a get query to store the worker data into the controller`, () => { - controller.workerFk = 1; + controller.userId = 1; controller.canceler = null; let response = {}; let config = { filter: { + where: { + userFk: controller.userId + }, include: [ { relation: 'user', @@ -69,6 +72,13 @@ describe('worker Component vnWorkerDescriptorPopover', () => { }, { relation: 'sip', scope: {fields: ['extension']} + }, { + relation: 'department', + scope: { + include: { + relation: 'department' + } + } } ] } @@ -76,8 +86,8 @@ describe('worker Component vnWorkerDescriptorPopover', () => { let json = $httpParamSerializer(config); - $httpBackend.whenGET(`api/Workers/${controller._workerFk}?${json}`).respond(response); - $httpBackend.expectGET(`api/Workers/${controller._workerFk}?${json}`); + $httpBackend.whenGET(`api/Workers/findOne?${json}`).respond(response); + $httpBackend.expectGET(`api/Workers/findOne?${json}`); controller.loadData(); $httpBackend.flush(); diff --git a/modules/worker/front/index/index.html b/modules/worker/front/index/index.html index a4c2a6f254..53d16ccea3 100644 --- a/modules/worker/front/index/index.html +++ b/modules/worker/front/index/index.html @@ -48,10 +48,6 @@ - - Enter a new search - diff --git a/package-lock.json b/package-lock.json index 292328e112..7d81c13c74 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7840,7 +7840,7 @@ "karma-chrome-launcher": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz", - "integrity": "sha1-zxudBxNswY/iOTJ9JGVMPbw2is8=", + "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", "dev": true, "requires": { "fs-access": "^1.0.0",