From f2730dd51c033d89feb1a740e6a71585831a5bbe Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Mon, 20 Jul 2020 11:31:47 +0200 Subject: [PATCH 01/13] some parts of latestsBuys WIP --- front/core/directives/index.js | 2 +- .../directives/{uvc.html => smart-table.html} | 13 +- .../directives/{uvc.js => smart-table.js} | 29 ++-- .../directives/{uvc.scss => smart-table.scss} | 2 +- front/core/styles/icons/salixfont.css | 4 +- front/core/styles/icons/salixfont.svg | 1 + front/core/styles/icons/salixfont.ttf | Bin 32980 -> 33496 bytes front/core/styles/icons/salixfont.woff | Bin 33056 -> 33572 bytes .../back/methods/entry/latestBuysFilter.js | 111 ++++++++++++ .../entry/specs/latestBuysFilter.spec.js | 15 ++ modules/entry/back/models/entry.js | 2 +- modules/entry/front/index.js | 2 + modules/entry/front/index/locale/es.yml | 4 +- .../front/latest-buys-search-panel/index.html | 162 ++++++++++++++++++ .../front/latest-buys-search-panel/index.js | 79 +++++++++ .../latest-buys-search-panel/index.spec.js | 45 +++++ .../latest-buys-search-panel/locale/es.yml | 8 + modules/entry/front/latest-buys/index.html | 120 +++++++++++++ modules/entry/front/latest-buys/index.js | 31 ++++ modules/entry/front/latest-buys/locale/es.yml | 1 + modules/entry/front/locale/es.yml | 1 + modules/entry/front/routes.json | 8 +- modules/item/back/methods/item/filter.js | 2 +- modules/item/front/index/index.html | 2 +- 24 files changed, 615 insertions(+), 29 deletions(-) rename front/core/directives/{uvc.html => smart-table.html} (77%) rename front/core/directives/{uvc.js => smart-table.js} (81%) rename front/core/directives/{uvc.scss => smart-table.scss} (76%) create mode 100644 modules/entry/back/methods/entry/latestBuysFilter.js create mode 100644 modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js create mode 100644 modules/entry/front/latest-buys-search-panel/index.html create mode 100644 modules/entry/front/latest-buys-search-panel/index.js create mode 100644 modules/entry/front/latest-buys-search-panel/index.spec.js create mode 100644 modules/entry/front/latest-buys-search-panel/locale/es.yml create mode 100644 modules/entry/front/latest-buys/index.html create mode 100644 modules/entry/front/latest-buys/index.js create mode 100644 modules/entry/front/latest-buys/locale/es.yml diff --git a/front/core/directives/index.js b/front/core/directives/index.js index 4377afe8c..af05c9b38 100644 --- a/front/core/directives/index.js +++ b/front/core/directives/index.js @@ -11,7 +11,7 @@ import './visible-by'; import './bind'; import './repeat-last'; import './title'; -import './uvc'; +import './smart-table'; import './droppable'; import './http-click'; import './http-submit'; diff --git a/front/core/directives/uvc.html b/front/core/directives/smart-table.html similarity index 77% rename from front/core/directives/uvc.html rename to front/core/directives/smart-table.html index 9de13b675..6808b5618 100644 --- a/front/core/directives/uvc.html +++ b/front/core/directives/smart-table.html @@ -1,12 +1,13 @@
-
+
+ class="vn-pt-sm" + icon="more_vert" + ng-click="$ctrl.showSmartTable($event)"> -
@@ -24,6 +25,6 @@
- +
diff --git a/front/core/directives/uvc.js b/front/core/directives/smart-table.js similarity index 81% rename from front/core/directives/uvc.js rename to front/core/directives/smart-table.js index e464a93ab..2d5a24ade 100644 --- a/front/core/directives/uvc.js +++ b/front/core/directives/smart-table.js @@ -1,6 +1,6 @@ import ngModule from '../module'; -import template from './uvc.html'; -import './uvc.scss'; +import template from './smart-table.html'; +import './smart-table.scss'; directive.$inject = ['$http', '$compile', 'vnApp', '$translate']; export function directive($http, $compile, vnApp, $translate) { @@ -42,30 +42,29 @@ export function directive($http, $compile, vnApp, $translate) { return (el.getAttribute('th-id') == key || el.getAttribute('field') == key); }); - let baseSelector = `vn-table[vn-uvc=${userConfig.tableCode}] > div`; + let baseSelector = `vn-table[vn-smart-table=${userConfig.tableCode}] > div`; selectors.push(`${baseSelector} vn-thead > vn-tr > vn-th:nth-child(${index + 1})`); selectors.push(`${baseSelector} vn-tbody > vn-tr > vn-td:nth-child(${index + 1})`); selectors.push(`${baseSelector} vn-tbody > .vn-tr > vn-td:nth-child(${index + 1})`); } }); - - if (document.querySelector('style[id="uvc"]')) { - let child = document.querySelector('style[id="uvc"]'); + if (document.querySelector('style[id="smart-table"]')) { + let child = document.querySelector('style[id="smart-table"]'); child.parentNode.removeChild(child); } if (selectors.length) { let rule = selectors.join(', ') + '{display: none;}'; $scope.css = document.createElement('style'); - $scope.css.setAttribute('id', 'uvc'); + $scope.css.setAttribute('id', 'smart-table'); document.head.appendChild($scope.css); $scope.css.appendChild(document.createTextNode(rule)); } $scope.$on('$destroy', () => { - if ($scope.css && document.querySelector('style[id="uvc"]')) { - let child = document.querySelector('style[id="uvc"]'); + if ($scope.css && document.querySelector('style[id="smart-table"]')) { + let child = document.querySelector('style[id="smart-table"]'); child.parentNode.removeChild(child); } }); @@ -80,13 +79,13 @@ export function directive($http, $compile, vnApp, $translate) { restrict: 'A', link: async function($scope, $element, $attrs) { let cTemplate = $compile(template)($scope)[0]; - $scope.$ctrl.showUvc = event => { + $scope.$ctrl.showSmartTable = event => { event.preventDefault(); event.stopImmediatePropagation(); - $scope.uvc.show(); + $scope.smartTable.show(event.target); }; - let tableCode = $attrs.vnUvc.trim(); + let tableCode = $attrs.vnSmartTable.trim(); let headerList = getHeaderList($element, $scope); let defaultConfigView = {tableCode: tableCode, configuration: {}}; @@ -98,16 +97,16 @@ export function directive($http, $compile, vnApp, $translate) { addHideClass($scope, headerList, config); - let table = document.querySelector(`vn-table[vn-uvc=${tableCode}]`); + let table = document.querySelector(`vn-table[vn-smart-table=${tableCode}]`); table.insertBefore(cTemplate, table.firstChild); $scope.$ctrl.saveConfiguration = async tableConfiguration => { let newConfig = await saveConfiguration(tableConfiguration); vnApp.showSuccess($translate.instant('Data saved!')); addHideClass($scope, headerList, newConfig.data); - $scope.uvc.hide(); + $scope.smartTable.hide(); }; } }; } -ngModule.directive('vnUvc', directive); +ngModule.directive('vnSmartTable', directive); diff --git a/front/core/directives/uvc.scss b/front/core/directives/smart-table.scss similarity index 76% rename from front/core/directives/uvc.scss rename to front/core/directives/smart-table.scss index 0cdf0ba1a..a156c060b 100644 --- a/front/core/directives/uvc.scss +++ b/front/core/directives/smart-table.scss @@ -1,4 +1,4 @@ -vn-table vn-dialog[vn-id="uvc"]{ +vn-table vn-popover[vn-id="smart-table"]{ & > div { min-width: 288px; align-items: center; diff --git a/front/core/styles/icons/salixfont.css b/front/core/styles/icons/salixfont.css index 8805815e8..52a2308b4 100644 --- a/front/core/styles/icons/salixfont.css +++ b/front/core/styles/icons/salixfont.css @@ -22,7 +22,9 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } - +.icon-latestBuys:before { + content: "\e95f"; +} .icon-zone:before { content: "\e95d"; } diff --git a/front/core/styles/icons/salixfont.svg b/front/core/styles/icons/salixfont.svg index 9ca57000d..7e8695d63 100644 --- a/front/core/styles/icons/salixfont.svg +++ b/front/core/styles/icons/salixfont.svg @@ -102,6 +102,7 @@ + diff --git a/front/core/styles/icons/salixfont.ttf b/front/core/styles/icons/salixfont.ttf index ab5de35ff5704093f92f0a42ab96502a9010e385..608dd7c80c653928df2a89af6a5851ad8237c19d 100644 GIT binary patch delta 739 zcmYjPOKTHR6h0?+m`Nr{lQ_xDB&O3m+8HHiY92Fbo1_63TCj_hR;h?3wKWl%w%95a zLeq*x7X_^WS6UT81y_=V6dxvC2VAE5XH#Fh9Ujov7NXK}yto$oxp#eKDEdb4J_ z7OeI>+Xg^C08AAN3-c76l&?@U7iTVMdORi~ZOEcQDD20c5bJS^@tB@WsH8TS_g6!z z7B-}?f`5zQ5X)&C?bp=AAnLI$q)U@@Sq2mO0LH{lx;ug%1tp`cif#ug=n>hl@!!q3 zA#n;mF}>IUm9?-D&dia?h~3@%7?7l3P?7@ZYJET#F;`h{>l^ww4u>o@n}xSItXV_P zOR_BGbtC&<-amB45>5=L?9sl=_;@Csw|iWy*Xbj~POQY|+$)$_j$_j-4U41+A%>?4 z@rs>fb~w7*E%^NcXJw+EC_&Q~Ro%%WA(yJn3PEgOqcv%9?0l92e+=R+%`R}QhQ(qF;Kw7&$rj~ux7 k4{M_p1B>`)1FhMZ8~^|S delta 247 zcmcc7%5ke8U7DiIfc)185#UIeINUO|3w2?H}wilJf4#2u3v<0kts z$}|5K`>{EXQN3vM)Y8QqGF80aF30oRd}ZKf0V!m-)mx?pqbG;dnKPzs?y2i%oGjmP WiFbjum2C)6k`aj0Hven5#RveSx=3>X diff --git a/front/core/styles/icons/salixfont.woff b/front/core/styles/icons/salixfont.woff index d9ade1e3129ece954807ff792cef7900670c114b..ecea37f50a42ae1cf1d2f2b11bd78a1956797899 100644 GIT binary patch delta 782 zcmYjP-Ahwp9DaX$59e$NW?3<%PsV3nP-5HUp=URtCeR z_Hh|9h@di~sGzG@5JeY*u7bcW3ar5B4~VWJg1Pz~EAR);`@HY-`+6?k)kVXDs|Lq~ zBRxF?2*y$y;dNeIUv{L+?XT7f`I%`#;4Ny#f3OuME}lm1Jt3vXI-aa_d>tRlj}kIp z!kUB*_qj(e#!*D=8NS{@%pYDXhCRi#6|b^tBgH6!UY_ zy9rr1h=OkmR}AMT^TjdLa1pHNIC<>jq3Nj^Y+PcN>$hOIauasay7;U564bND%_Q)< zM(eaj7}7)>I7cOWNCz1tcga&i1i#ZCrx8)I2kjY%0+I~iV1ofA9!o?cB49xVG>Wtr z+5@c9Ax0yKcub*{1-Ye61Bx2dq@WCc)nI_-R1O_G^$CQ49^X3Hi^QT*bryr=t#)wsDJTElHV^$KCm}7z)s6X z*4_9C9*%=vlf_~(TblWdmdHsimy}CrnQiyZ-ZQ3PtV>~!cBF@f($SpNX=mLw52aSh zQ;%(zU}QOtO|cjzNfiQ&88g%^w$jPIaEn9mdIgSW!p<-S!*@m5%mJn4%k>fks6nkU zVrt&}Ci%7u!X4EraE+R37H;rn-5A#ds>{`%L`zAn--XeyB{NwqnR7`EX81rh8$CRb zP7QYNldYm^bD||&?lIeBmffLS!b7A@R+(WejG1wJvP$1nP2ka#;AO&MnDW()nTJNN zv7T5PZchCmJcB=mkk6t0_y2QcwWL9zx?Z{t5U7mKf3UJ$tEtY+z}CMnRC~&w;16&b BpuGS9 delta 295 zcmZ3|#80l;MD4 zf%KfpG@#fO28OB?ApC8<_~DGy#1saGni`-QGZ2=rGT5I16a}Z!qk7Tihoy@-WU6?-U5@9s`O3h} v0yKt!;Z|>%8jPO2pw65zZS#$~e#Xh!4VQQqSX { + Self.remoteMethodCtx('latestBuysFilter', { + description: 'Find all instances of the model matched by filter from the data source.', + accessType: 'READ', + accepts: [ + { + arg: 'filter', + type: 'Object', + description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string', + http: {source: 'query'} + }, + { + arg: 'tags', + type: ['Object'], + description: 'List of tags to filter with', + http: {source: 'query'} + }, { + arg: 'search', + type: 'String', + description: `If it's and integer searchs by id, otherwise it searchs by name`, + http: {source: 'query'} + }, { + arg: 'id', + type: 'Integer', + description: 'Item id', + http: {source: 'query'} + }, { + arg: 'categoryFk', + type: 'Integer', + description: 'Category id', + http: {source: 'query'} + }, { + arg: 'typeFk', + type: 'Integer', + description: 'Type id', + http: {source: 'query'} + }, { + arg: 'isActive', + type: 'Boolean', + description: 'Whether the the item is or not active', + http: {source: 'query'} + }, { + arg: 'salesPersonFk', + type: 'Integer', + description: 'The buyer of the item', + http: {source: 'query'} + } + ], + returns: { + type: ['Object'], + root: true + }, + http: { + path: `/latestBuysFilter`, + verb: 'GET' + } + }); + + Self.latestBuysFilter = async(ctx, filter) => { + let conn = Self.dataSource.connector; + let where = buildFilter(ctx.args, (param, value) => { + // switch (param) { + // case 'search': + // return /^\d+$/.test(value) + // ? {or: [{'i.id': value}]} + // : {or: [{'i.name': {like: `%${value}%`}}]}; + // case 'id': + // return {'i.id': value}; + // case 'description': + // return {'i.description': {like: `%${value}%`}}; + // case 'categoryFk': + // return {'ic.id': value}; + // case 'salesPersonFk': + // return {'t.workerFk': value}; + // case 'typeFk': + // return {'i.typeFk': value}; + // case 'isActive': + // return {'i.isActive': value}; + // } + }); + filter = mergeFilters(ctx.args.filter, {where}); + + let stmts = []; + let stmt; + + stmt = new ParameterizedSQL('CALL cache.last_buy_refresh(FALSE)'); + stmts.push(stmt); + + stmt = new ParameterizedSQL(` + SELECT + size + FROM cache.last_buy lb + JOIN item i ON i.id = lb.item_id + JOIN itemType it ON it.id = i.typeFk AND lb.warehouse_id = it.warehouseFk + JOIN buy b ON b.id = lb.buy_id` + ); + + stmt.merge(conn.makeSuffix(filter)); + let buysIndex = stmts.push(stmt) - 1; + + let sql = ParameterizedSQL.join(stmts, ';'); + let result = await conn.executeStmt(sql); + return buysIndex === 0 ? result : result[buysIndex]; + }; +}; + diff --git a/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js b/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js new file mode 100644 index 000000000..2e2cab346 --- /dev/null +++ b/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js @@ -0,0 +1,15 @@ +const app = require('vn-loopback/server/server'); + +fdescribe('Entry latests buys filter()', () => { + it('should return the entry matching "search"', async() => { + let ctx = { + args: { + search: 1 + } + }; + + let result = await app.models.Entry.latestBuysFilter(ctx); + + expect(result[0].size).toEqual(300); + }); +}); diff --git a/modules/entry/back/models/entry.js b/modules/entry/back/models/entry.js index b1f71b4bd..40f89ebf0 100644 --- a/modules/entry/back/models/entry.js +++ b/modules/entry/back/models/entry.js @@ -1,5 +1,5 @@ - module.exports = Self => { + require('../methods/entry/latestBuysFilter')(Self); require('../methods/entry/filter')(Self); require('../methods/entry/getEntry')(Self); }; diff --git a/modules/entry/front/index.js b/modules/entry/front/index.js index f0c845b14..eb2c823c4 100644 --- a/modules/entry/front/index.js +++ b/modules/entry/front/index.js @@ -2,7 +2,9 @@ export * from './module'; import './main'; import './index/'; +import './latest-buys'; import './search-panel'; +import './latest-buys-search-panel'; import './descriptor'; import './card'; import './summary'; diff --git a/modules/entry/front/index/locale/es.yml b/modules/entry/front/index/locale/es.yml index 8ef9b2c7a..2770ccfe9 100644 --- a/modules/entry/front/index/locale/es.yml +++ b/modules/entry/front/index/locale/es.yml @@ -12,4 +12,6 @@ Reference: Referencia Created: Creado Booked: Facturado Is inventory: Inventario -Notes: Notas \ No newline at end of file +Notes: Notas +Status: Estado +Selection: Selección \ No newline at end of file diff --git a/modules/entry/front/latest-buys-search-panel/index.html b/modules/entry/front/latest-buys-search-panel/index.html new file mode 100644 index 000000000..f30442ec6 --- /dev/null +++ b/modules/entry/front/latest-buys-search-panel/index.html @@ -0,0 +1,162 @@ + +
+
+ + + + + + + + + +
{{name}}
+
+ {{category.name}} +
+ > + + + + + + + + + Tags + + + + + + + + + + + + + + + + + More fields + + + + + + + + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+ + + + + + + +
+
diff --git a/modules/entry/front/latest-buys-search-panel/index.js b/modules/entry/front/latest-buys-search-panel/index.js new file mode 100644 index 000000000..bcb1ca23b --- /dev/null +++ b/modules/entry/front/latest-buys-search-panel/index.js @@ -0,0 +1,79 @@ +import ngModule from '../module'; +import SearchPanel from 'core/components/searchbar/search-panel'; + +class Controller extends SearchPanel { + constructor($element, $) { + super($element, $); + let model = 'Item'; + let moreFields = ['id', 'description', 'name', 'isActive']; + + let properties; + let validations = window.validations; + + if (validations && validations[model]) + properties = validations[model].properties; + else + properties = {}; + + this.moreFields = []; + for (let field of moreFields) { + let prop = properties[field]; + this.moreFields.push({ + name: field, + label: prop ? prop.description : field, + type: prop ? prop.type : null + }); + } + } + + get filter() { + let filter = this.$.filter; + + for (let fieldFilter of this.fieldFilters) + filter[fieldFilter.name] = fieldFilter.value; + + return filter; + } + + set filter(value) { + if (!value) + value = {}; + if (!value.tags) + value.tags = [{}]; + + this.fieldFilters = []; + for (let field of this.moreFields) { + if (value[field.name] != undefined) { + this.fieldFilters.push({ + name: field.name, + value: value[field.name], + info: field + }); + } + } + + this.$.filter = value; + } + + getSourceTable(selection) { + if (!selection || selection.isFree === true) + return null; + + if (selection.sourceTable) { + return '' + + selection.sourceTable.charAt(0).toUpperCase() + + selection.sourceTable.substring(1) + 's'; + } else if (selection.sourceTable == null) + return `ItemTags/filterItemTags/${selection.id}`; + } + + removeField(index, field) { + this.fieldFilters.splice(index, 1); + this.$.filter[field] = undefined; + } +} + +ngModule.component('vnLatestBuysSearchPanel', { + template: require('./index.html'), + controller: Controller +}); diff --git a/modules/entry/front/latest-buys-search-panel/index.spec.js b/modules/entry/front/latest-buys-search-panel/index.spec.js new file mode 100644 index 000000000..cc0cf0375 --- /dev/null +++ b/modules/entry/front/latest-buys-search-panel/index.spec.js @@ -0,0 +1,45 @@ +import './index.js'; + +describe('Item', () => { + describe('Component vnItemSearchPanel', () => { + let $element; + let controller; + + beforeEach(ngModule('item')); + + beforeEach(angular.mock.inject($componentController => { + $element = angular.element(`
`); + controller = $componentController('vnItemSearchPanel', {$element}); + })); + + describe('getSourceTable()', () => { + it(`should return null if there's no selection`, () => { + let selection = null; + let result = controller.getSourceTable(selection); + + expect(result).toBeNull(); + }); + + it(`should return null if there's a selection but its isFree property is truthy`, () => { + let selection = {isFree: true}; + let result = controller.getSourceTable(selection); + + expect(result).toBeNull(); + }); + + it(`should return the formated sourceTable concatenated to a path`, () => { + let selection = {sourceTable: 'hello guy'}; + let result = controller.getSourceTable(selection); + + expect(result).toEqual('Hello guys'); + }); + + it(`should return a path if there's no sourceTable and the selection has an id`, () => { + let selection = {id: 99}; + let result = controller.getSourceTable(selection); + + expect(result).toEqual(`ItemTags/filterItemTags/${selection.id}`); + }); + }); + }); +}); diff --git a/modules/entry/front/latest-buys-search-panel/locale/es.yml b/modules/entry/front/latest-buys-search-panel/locale/es.yml new file mode 100644 index 000000000..197da0695 --- /dev/null +++ b/modules/entry/front/latest-buys-search-panel/locale/es.yml @@ -0,0 +1,8 @@ +Ink: Tinta +Origin: Origen +Producer: Productor. +With visible: Con visible +Field: Campo +More fields: Más campos +Add field: Añadir campo +Remove field: Quitar campo \ No newline at end of file diff --git a/modules/entry/front/latest-buys/index.html b/modules/entry/front/latest-buys/index.html new file mode 100644 index 000000000..ecf36c63b --- /dev/null +++ b/modules/entry/front/latest-buys/index.html @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + Id + Landed + Reference + Supplier + Currency + Company + Booked + Confirmed + Ordered + Notes + + + + + + + + + + + + + + + {{::buy.size}} + + + {{::buy.landed | date:'dd/MM/yyyy'}} + + + {{::buy.ref}} + {{::buy.supplierName}} + {{::buy.currencyCode}} + {{::buy.companyCode}} + + + + + + + + + + + + +
+ + + + +
+ + \ No newline at end of file diff --git a/modules/entry/front/latest-buys/index.js b/modules/entry/front/latest-buys/index.js new file mode 100644 index 000000000..7f2de4185 --- /dev/null +++ b/modules/entry/front/latest-buys/index.js @@ -0,0 +1,31 @@ +import ngModule from '../module'; +import Section from 'salix/components/section'; + +export default class Controller extends Section { + constructor($element, $) { + super($element, $); + this.showFields = { + id: false, + actions: false + }; + } + get checked() { + const buys = this.$.model.data || []; + const checkedBuys = []; + for (let buy of buys) { + if (buy.checked) + checkedBuys.push(buy); + } + + return checkedBuys; + } + + get totalChecked() { + return this.checked.length; + } +} + +ngModule.component('vnEntryLatestBuys', { + template: require('./index.html'), + controller: Controller +}); diff --git a/modules/entry/front/latest-buys/locale/es.yml b/modules/entry/front/latest-buys/locale/es.yml new file mode 100644 index 000000000..9eeab7bce --- /dev/null +++ b/modules/entry/front/latest-buys/locale/es.yml @@ -0,0 +1 @@ +Edit buys: Editar compras \ No newline at end of file diff --git a/modules/entry/front/locale/es.yml b/modules/entry/front/locale/es.yml index 0858bb7f9..b28cbe735 100644 --- a/modules/entry/front/locale/es.yml +++ b/modules/entry/front/locale/es.yml @@ -1,5 +1,6 @@ #Ordenar alfabeticamente entry: entrada +Latest buys: Últimas compras # Sections diff --git a/modules/entry/front/routes.json b/modules/entry/front/routes.json index 084ff7bb2..32c046a3d 100644 --- a/modules/entry/front/routes.json +++ b/modules/entry/front/routes.json @@ -6,7 +6,8 @@ "validations": true, "menus": { "main": [ - {"state": "entry.index", "icon": "icon-entry"} + {"state": "entry.index", "icon": "icon-entry"}, + {"state": "entry.latestBuys", "icon": "icon-latestBuys"} ], "card": [ {"state": "entry.card.buy", "icon": "icon-lines"}, @@ -25,6 +26,11 @@ "state": "entry.index", "component": "vn-entry-index", "description": "Entries" + }, { + "url": "/latest-buys?q", + "state": "entry.latestBuys", + "component": "vn-entry-latest-buys", + "description": "Latest buys" }, { "url": "/:id", "state": "entry.card", diff --git a/modules/item/back/methods/item/filter.js b/modules/item/back/methods/item/filter.js index ad7edfa8c..5d9ae9e0f 100644 --- a/modules/item/back/methods/item/filter.js +++ b/modules/item/back/methods/item/filter.js @@ -41,7 +41,7 @@ module.exports = Self => { }, { arg: 'isActive', type: 'Boolean', - description: 'Whether the the item is o not active', + description: 'Whether the the item is or not active', http: {source: 'query'} }, { arg: 'salesPersonFk', diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html index 0ee6a8815..296ac9747 100644 --- a/modules/item/front/index/index.html +++ b/modules/item/front/index/index.html @@ -8,7 +8,7 @@ + vn-smart-table="itemIndex"> From f9da489a96cd5ca2419377faf4d5fe8cb458ad88 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Mon, 20 Jul 2020 11:50:21 +0200 Subject: [PATCH 02/13] excluded unfinished tests WIP --- modules/entry/front/latest-buys-search-panel/index.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/entry/front/latest-buys-search-panel/index.spec.js b/modules/entry/front/latest-buys-search-panel/index.spec.js index cc0cf0375..0fb8b2128 100644 --- a/modules/entry/front/latest-buys-search-panel/index.spec.js +++ b/modules/entry/front/latest-buys-search-panel/index.spec.js @@ -1,6 +1,6 @@ import './index.js'; -describe('Item', () => { +xdescribe('Item', () => { describe('Component vnItemSearchPanel', () => { let $element; let controller; @@ -9,7 +9,7 @@ describe('Item', () => { beforeEach(angular.mock.inject($componentController => { $element = angular.element(`
`); - controller = $componentController('vnItemSearchPanel', {$element}); + controller = $componentController('vnLatestBuysSearchPanel', {$element}); })); describe('getSourceTable()', () => { From 3a82ef0e06739f4af46726fbad84c81a1091141d Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Wed, 26 Aug 2020 16:33:47 +0200 Subject: [PATCH 03/13] 2375 entry lastBuy seccion --- db/changes/10210-summer/00-ACL.sql | 2 + front/core/directives/smart-table.js | 14 +- .../back/methods/entry/editLatestBuys.js | 78 ++++++++ .../back/methods/entry/latestBuysFilter.js | 135 +++++++++---- modules/entry/back/model-config.json | 3 + modules/entry/back/models/buy.js | 4 + modules/entry/back/models/buy.json | 64 +++++++ modules/entry/back/models/entry.js | 1 - modules/entry/front/card/index.js | 9 +- .../entry/front/descriptor-popover/index.html | 3 + .../entry/front/descriptor-popover/index.js | 9 + modules/entry/front/descriptor/index.js | 60 +++++- modules/entry/front/index.js | 1 + .../front/latest-buys-search-panel/index.html | 21 ++- .../front/latest-buys-search-panel/index.js | 2 +- modules/entry/front/latest-buys/index.html | 178 +++++++++++------- modules/entry/front/latest-buys/index.js | 53 ++++++ modules/entry/front/routes.json | 8 +- modules/item/back/methods/item/filter.js | 12 +- modules/item/front/index/index.html | 28 +-- modules/route/front/index/index.html | 12 +- 21 files changed, 539 insertions(+), 158 deletions(-) create mode 100644 db/changes/10210-summer/00-ACL.sql create mode 100644 modules/entry/back/methods/entry/editLatestBuys.js create mode 100644 modules/entry/back/models/buy.js create mode 100644 modules/entry/back/models/buy.json create mode 100644 modules/entry/front/descriptor-popover/index.html create mode 100644 modules/entry/front/descriptor-popover/index.js diff --git a/db/changes/10210-summer/00-ACL.sql b/db/changes/10210-summer/00-ACL.sql new file mode 100644 index 000000000..755b148d7 --- /dev/null +++ b/db/changes/10210-summer/00-ACL.sql @@ -0,0 +1,2 @@ +INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) + VALUES ('Buy', '*', '*', 'ALLOW', 'ROLE', 'buyer'); diff --git a/front/core/directives/smart-table.js b/front/core/directives/smart-table.js index 2d5a24ade..c7072c09e 100644 --- a/front/core/directives/smart-table.js +++ b/front/core/directives/smart-table.js @@ -2,22 +2,26 @@ import ngModule from '../module'; import template from './smart-table.html'; import './smart-table.scss'; +/** + * Directive to hide/show selected columns of a table, don't use with rowspan. + */ directive.$inject = ['$http', '$compile', 'vnApp', '$translate']; export function directive($http, $compile, vnApp, $translate) { function getHeaderList($element, $scope) { - let allHeaders = $element[0].querySelectorAll(`vn-th[field], vn-th[th-id]`); - let headerList = Array.from(allHeaders); + let filtrableHeaders = $element[0].querySelectorAll('vn-th[field]'); + let headerList = Array.from(filtrableHeaders); let ids = []; let titles = {}; headerList.forEach(header => { - let id = header.getAttribute('th-id') || header.getAttribute('field'); + let id = header.getAttribute('field'); ids.push(id); titles[id] = header.innerText || id.charAt(0).toUpperCase() + id.slice(1); }); $scope.fields = ids; $scope.titles = titles; + $scope.allHeaders = Array.from($element[0].querySelectorAll('vn-th')); return headerList; } @@ -38,8 +42,8 @@ export function directive($http, $compile, vnApp, $translate) { Object.keys(userConfig.configuration).forEach(key => { let index; if (userConfig.configuration[key] === false) { - index = headerList.findIndex(el => { - return (el.getAttribute('th-id') == key || el.getAttribute('field') == key); + index = $scope.allHeaders.findIndex(el => { + return el.getAttribute('field') == key; }); let baseSelector = `vn-table[vn-smart-table=${userConfig.tableCode}] > div`; diff --git a/modules/entry/back/methods/entry/editLatestBuys.js b/modules/entry/back/methods/entry/editLatestBuys.js new file mode 100644 index 000000000..acda6ed1c --- /dev/null +++ b/modules/entry/back/methods/entry/editLatestBuys.js @@ -0,0 +1,78 @@ +module.exports = Self => { + Self.remoteMethod('editLatestBuys', { + description: 'Updates a column for one of more buys', + accessType: 'WRITE', + accepts: [{ + arg: 'column', + type: 'Object', + required: true, + description: `the column to edit and it's new value` + }, + { + arg: 'buys', + type: ['Object'], + required: true, + description: `the buys which will be modified` + }], + returns: { + type: 'Object', + root: true + }, + http: { + path: `/editLatestBuys`, + verb: 'POST' + } + }); + + Self.editLatestBuys = async(column, buys) => { + let modelName; + let identifier; + switch (column.field) { + case 'size': + case 'density': + modelName = 'Item'; + identifier = 'itemFk'; + break; + case 'quantity': + case 'buyingValue': + case 'freightValue': + case 'packing': + case 'grouping': + case 'groupingMode': + case 'comissionValue': + case 'packageValue': + case 'price2': + case 'price3': + case 'minPrice': + case 'weight': + modelName = 'Buy'; + identifier = 'id'; + } + + const models = Self.app.models; + const model = models[modelName]; + + let tx = await model.beginTransaction({}); + + try { + let promises = []; + let options = {transaction: tx}; + + let targets = buys.map(buy => { + return buy[identifier]; + }); + + let value = {}; + value[column.field] = column.newValue; + + for (let target of targets) + promises.push(model.upsertWithWhere({id: target}, value, options)); + + await Promise.all(promises); + await tx.commit(); + } catch (error) { + await tx.rollback(); + throw error; + } + }; +}; diff --git a/modules/entry/back/methods/entry/latestBuysFilter.js b/modules/entry/back/methods/entry/latestBuysFilter.js index edfc46e3b..50cd8cf3c 100644 --- a/modules/entry/back/methods/entry/latestBuysFilter.js +++ b/modules/entry/back/methods/entry/latestBuysFilter.js @@ -12,43 +12,44 @@ module.exports = Self => { arg: 'filter', type: 'Object', description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string', - http: {source: 'query'} }, { + arg: 'search', + type: 'String', + description: `If it's and integer searchs by id, otherwise it searchs by name`, + }, { + arg: 'id', + type: 'Integer', + description: 'Item id', + }, { arg: 'tags', type: ['Object'], description: 'List of tags to filter with', http: {source: 'query'} - }, { - arg: 'search', - type: 'String', - description: `If it's and integer searchs by id, otherwise it searchs by name`, - http: {source: 'query'} - }, { - arg: 'id', - type: 'Integer', - description: 'Item id', - http: {source: 'query'} }, { arg: 'categoryFk', type: 'Integer', description: 'Category id', - http: {source: 'query'} }, { arg: 'typeFk', type: 'Integer', description: 'Type id', - http: {source: 'query'} }, { - arg: 'isActive', + arg: 'active', type: 'Boolean', description: 'Whether the the item is or not active', - http: {source: 'query'} + }, { + arg: 'visible', + type: 'Boolean', + description: 'Whether the the item is or not visible', }, { arg: 'salesPersonFk', type: 'Integer', description: 'The buyer of the item', - http: {source: 'query'} + }, { + arg: 'description', + type: 'String', + description: 'The item description', } ], returns: { @@ -64,42 +65,100 @@ module.exports = Self => { Self.latestBuysFilter = async(ctx, filter) => { let conn = Self.dataSource.connector; let where = buildFilter(ctx.args, (param, value) => { - // switch (param) { - // case 'search': - // return /^\d+$/.test(value) - // ? {or: [{'i.id': value}]} - // : {or: [{'i.name': {like: `%${value}%`}}]}; - // case 'id': - // return {'i.id': value}; - // case 'description': - // return {'i.description': {like: `%${value}%`}}; - // case 'categoryFk': - // return {'ic.id': value}; - // case 'salesPersonFk': - // return {'t.workerFk': value}; - // case 'typeFk': - // return {'i.typeFk': value}; - // case 'isActive': - // return {'i.isActive': value}; - // } + switch (param) { + case 'search': + return /^\d+$/.test(value) + ? {'i.id': value} + : {'i.name': {like: `%${value}%`}}; + case 'id': + return {'i.id': value}; + case 'description': + return {'i.description': {like: `%${value}%`}}; + case 'categoryFk': + return {'ic.id': value}; + case 'salesPersonFk': + return {'it.workerFk': value}; + case 'typeFk': + return {'i.typeFk': value}; + case 'active': + return {'i.isActive': value}; + case 'visible': + if (value) + return {'v.visible': {gt: 0}}; + else if (!value) + return {'v.visible': {lte: 0}}; + } }); filter = mergeFilters(ctx.args.filter, {where}); let stmts = []; let stmt; - stmt = new ParameterizedSQL('CALL cache.last_buy_refresh(FALSE)'); - stmts.push(stmt); + stmts.push('CALL cache.last_buy_refresh(FALSE)'); + stmts.push('CALL cache.visible_refresh(@calc_id, FALSE, 1)'); stmt = new ParameterizedSQL(` SELECT - size + i.image, + i.id AS itemFk, + i.size, + i.density, + i.typeFk, + t.name AS type, + i.family, + intr.description AS intrastat, + ori.code AS origin, + i.isActive, + b.entryFk, + b.id, + b.quantity, + b.buyingValue, + b.freightValue, + b.isIgnored, + b.packing, + b.grouping, + b.groupingMode, + b.comissionValue, + b.packageValue, + b.price2, + b.price3, + b.minPrice, + b.ektFk, + b.weight FROM cache.last_buy lb + LEFT JOIN cache.visible v ON v.item_id = lb.item_id + AND v.calc_id = @calc_id JOIN item i ON i.id = lb.item_id JOIN itemType it ON it.id = i.typeFk AND lb.warehouse_id = it.warehouseFk - JOIN buy b ON b.id = lb.buy_id` + JOIN buy b ON b.id = lb.buy_id + LEFT JOIN itemCategory ic ON ic.id = it.categoryFk + LEFT JOIN itemType t ON t.id = i.typeFk + LEFT JOIN intrastat intr ON intr.id = i.intrastatFk + LEFT JOIN origin ori ON ori.id = i.originFk` ); + if (ctx.args.tags) { + let i = 1; + for (const tag of ctx.args.tags) { + const tAlias = `it${i++}`; + + if (tag.tagFk) { + stmt.merge({ + sql: `JOIN vn.itemTag ${tAlias} ON ${tAlias}.itemFk = i.id + AND ${tAlias}.tagFk = ? + AND ${tAlias}.value LIKE ?`, + params: [tag.tagFk, `%${tag.value}%`], + }); + } else { + stmt.merge({ + sql: `JOIN vn.itemTag ${tAlias} ON ${tAlias}.itemFk = i.id + AND ${tAlias}.value LIKE ?`, + params: [`%${tag.value}%`], + }); + } + } + } + stmt.merge(conn.makeSuffix(filter)); let buysIndex = stmts.push(stmt) - 1; diff --git a/modules/entry/back/model-config.json b/modules/entry/back/model-config.json index c8c8babad..0e37b947f 100644 --- a/modules/entry/back/model-config.json +++ b/modules/entry/back/model-config.json @@ -2,6 +2,9 @@ "Entry": { "dataSource": "vn" }, + "Buy": { + "dataSource": "vn" + }, "EntryLog": { "dataSource": "vn" } diff --git a/modules/entry/back/models/buy.js b/modules/entry/back/models/buy.js new file mode 100644 index 000000000..e110164e8 --- /dev/null +++ b/modules/entry/back/models/buy.js @@ -0,0 +1,4 @@ +module.exports = Self => { + require('../methods/entry/editLatestBuys')(Self); + require('../methods/entry/latestBuysFilter')(Self); +}; diff --git a/modules/entry/back/models/buy.json b/modules/entry/back/models/buy.json new file mode 100644 index 000000000..14f2490d8 --- /dev/null +++ b/modules/entry/back/models/buy.json @@ -0,0 +1,64 @@ +{ + "name": "Buy", + "base": "Loggable", + "log": { + "model": "EntryLog", + "relation": "entry" + }, + "options": { + "mysql": { + "table": "buy" + } + }, + "properties": { + "id": { + "type": "number", + "id": true, + "description": "Identifier" + }, + "quantity": { + "type": "number" + }, + "buyingValue": { + "type": "number" + }, + "freightValue": { + "type": "number" + }, + "packing": { + "type": "number" + }, + "grouping": { + "type": "number" + }, + "groupingMode": { + "type": "number" + }, + "comissionValue": { + "type": "number" + }, + "packageValue": { + "type": "number" + }, + "price2": { + "type": "number" + }, + "price3": { + "type": "number" + }, + "minPrice": { + "type": "number" + }, + "weight": { + "type": "number" + } + }, + "relations": { + "entry": { + "type": "belongsTo", + "model": "Entry", + "foreignKey": "entryFk", + "required": true + } + } +} \ No newline at end of file diff --git a/modules/entry/back/models/entry.js b/modules/entry/back/models/entry.js index 40f89ebf0..713154d1b 100644 --- a/modules/entry/back/models/entry.js +++ b/modules/entry/back/models/entry.js @@ -1,5 +1,4 @@ module.exports = Self => { - require('../methods/entry/latestBuysFilter')(Self); require('../methods/entry/filter')(Self); require('../methods/entry/getEntry')(Self); }; diff --git a/modules/entry/front/card/index.js b/modules/entry/front/card/index.js index f9ab6187c..eafed171b 100644 --- a/modules/entry/front/card/index.js +++ b/modules/entry/front/card/index.js @@ -10,7 +10,8 @@ class Controller extends ModuleCard { scope: { fields: ['id', 'code'] } - }, { + }, + { relation: 'travel', scope: { fields: ['id', 'landed', 'agencyFk', 'warehouseOutFk'], @@ -35,12 +36,14 @@ class Controller extends ModuleCard { } ] } - }, { + }, + { relation: 'supplier', scope: { fields: ['id', 'nickname'] } - }, { + }, + { relation: 'currency' } ] diff --git a/modules/entry/front/descriptor-popover/index.html b/modules/entry/front/descriptor-popover/index.html new file mode 100644 index 000000000..465a9bf51 --- /dev/null +++ b/modules/entry/front/descriptor-popover/index.html @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/entry/front/descriptor-popover/index.js b/modules/entry/front/descriptor-popover/index.js new file mode 100644 index 000000000..d79aed03e --- /dev/null +++ b/modules/entry/front/descriptor-popover/index.js @@ -0,0 +1,9 @@ +import ngModule from '../module'; +import DescriptorPopover from 'salix/components/descriptor-popover'; + +class Controller extends DescriptorPopover {} + +ngModule.vnComponent('vnEntryDescriptorPopover', { + slotTemplate: require('./index.html'), + controller: Controller +}); diff --git a/modules/entry/front/descriptor/index.js b/modules/entry/front/descriptor/index.js index dd417a842..fed3787d4 100644 --- a/modules/entry/front/descriptor/index.js +++ b/modules/entry/front/descriptor/index.js @@ -11,15 +11,23 @@ class Controller extends Descriptor { } get travelFilter() { - return this.entry && JSON.stringify({ - agencyFk: this.entry.travel.agencyFk - }); + let travelFilter; + const entryTravel = this.entry && this.entry.travel; + + if (entryTravel && entryTravel.agencyFk) { + travelFilter = this.entry && JSON.stringify({ + agencyFk: entryTravel.agencyFk + }); + } + return travelFilter; } get entryFilter() { - if (!this.entry) return null; + let entryTravel = this.entry && this.entry.travel; - const date = new Date(this.entry.travel.landed); + if (!entryTravel || !entryTravel.landed) return null; + + const date = new Date(entryTravel.landed); date.setHours(0, 0, 0, 0); const from = new Date(date.getTime()); @@ -35,6 +43,48 @@ class Controller extends Descriptor { }); } + loadData() { + const filter = { + include: [ + { + relation: 'travel', + scope: { + fields: ['id', 'landed', 'agencyFk', 'warehouseOutFk'], + include: [ + { + relation: 'agency', + scope: { + fields: ['name'] + } + }, + { + relation: 'warehouseOut', + scope: { + fields: ['name'] + } + }, + { + relation: 'warehouseIn', + scope: { + fields: ['name'] + } + } + ] + } + }, + { + relation: 'supplier', + scope: { + fields: ['id', 'nickname'] + } + } + ] + }; + + return this.getData(`Entries/${this.id}`, {filter}) + .then(res => this.entity = res.data); + } + showEntryReport() { this.vnReport.show('entry-order', { entryId: this.entry.id diff --git a/modules/entry/front/index.js b/modules/entry/front/index.js index eb2c823c4..fc24e3efb 100644 --- a/modules/entry/front/index.js +++ b/modules/entry/front/index.js @@ -6,6 +6,7 @@ import './latest-buys'; import './search-panel'; import './latest-buys-search-panel'; import './descriptor'; +import './descriptor-popover'; import './card'; import './summary'; import './log'; diff --git a/modules/entry/front/latest-buys-search-panel/index.html b/modules/entry/front/latest-buys-search-panel/index.html index f30442ec6..67fa7f0c2 100644 --- a/modules/entry/front/latest-buys-search-panel/index.html +++ b/modules/entry/front/latest-buys-search-panel/index.html @@ -3,7 +3,6 @@
- + + + + + + Tags @@ -65,7 +74,6 @@ + data="$ctrl.buys"> - @@ -33,72 +24,98 @@ vn-smart-table="latestBuys"> - - + - - Id - Landed - Reference - Supplier - Currency - Company - Booked - Confirmed - Ordered - Notes + Picture + Id + Grouping + Packing + Size + Type + Intrastat + Origin + Density + Active + Family + Entry + Quantity + Buying value + Freight value + Comission value + Package value + Is ignored + Grouping mode + price2 + price3 + Min price + Ekt + Weight + ui-sref="entry.card.buy({id: {{::buy.entryFk}}})"> - - - - - + + - {{::buy.size}} - - - {{::buy.landed | date:'dd/MM/yyyy'}} + + + {{::buy.itemFk | zeroFill:6}} - {{::buy.ref}} - {{::buy.supplierName}} - {{::buy.currencyCode}} - {{::buy.companyCode}} - - - - - - + {{::buy.grouping}} + {{::buy.packing}} + {{::buy.size}} + + {{::buy.type}} + + {{::buy.intrastat}} + + {{::buy.origin}} + {{::buy.density}} + + + + + {{::buy.family}} + + + {{::buy.entryFk}} + + + {{::buy.quantity}} + {{::buy.buyingValue | currency: 'EUR':2}} + {{::buy.freightValue | currency: 'EUR':2}} + {{::buy.comissionValue | currency: 'EUR':2}} + {{::buy.packageValue | currency: 'EUR':2}} + {{::buy.isIgnored}} + {{::buy.groupingMode}} + {{::buy.price2 | currency: 'EUR':2}} + {{::buy.price3 | currency: 'EUR':2}} + {{::buy.minPrice | currency: 'EUR':2}} + {{::buy.ektFk | dashIfEmpty}} + {{::buy.weight}} @@ -109,12 +126,41 @@
- - \ No newline at end of file + + + + + + + + + + + + + + + + + + diff --git a/modules/entry/front/latest-buys/index.js b/modules/entry/front/latest-buys/index.js index 7f2de4185..b3b120af8 100644 --- a/modules/entry/front/latest-buys/index.js +++ b/modules/entry/front/latest-buys/index.js @@ -8,7 +8,33 @@ export default class Controller extends Section { id: false, actions: false }; + this.editedColumn; } + + get columns() { + if (this._columns) return this._columns; + + this._columns = [ + {field: 'quantity', displayName: 'quantity'}, + {field: 'buyingValue', displayName: 'buyingValue'}, + {field: 'freightValue', displayName: 'freightValue'}, + {field: 'packing', displayName: 'packing'}, + {field: 'grouping', displayName: 'grouping'}, + {field: 'groupingMode', displayName: 'groupingMode'}, + {field: 'comissionValue', displayName: 'comissionValue'}, + {field: 'packageValue', displayName: 'packageValue'}, + {field: 'price2', displayName: 'price2'}, + {field: 'price3', displayName: 'price3'}, + {field: 'minPrice', displayName: 'minPrice'}, + {field: 'weight', displayName: 'weight'}, + {field: 'size', displayName: 'size'}, + {field: 'density', displayName: 'density'}, + {field: 'description', displayName: 'description'} + ]; + + return this._columns; + } + get checked() { const buys = this.$.model.data || []; const checkedBuys = []; @@ -20,9 +46,36 @@ export default class Controller extends Section { return checkedBuys; } + uncheck() { + console.log('clicked!'); + const lines = this.checked; + for (let line of lines) { + if (line.checked) + line.checked = false; + } + } + get totalChecked() { return this.checked.length; } + + onEditAccept() { + let data = { + column: this.editedColumn, + buys: this.checked + }; + + this.$http.post('Buys/editLatestBuys', data) + .then(() => { + this.$.edit.hide(); + this.uncheck(); + this.$.model.refresh(); + }); + + this.editedColumn = null; + + return false; + } } ngModule.component('vnEntryLatestBuys', { diff --git a/modules/entry/front/routes.json b/modules/entry/front/routes.json index 32c046a3d..cdaaebc7d 100644 --- a/modules/entry/front/routes.json +++ b/modules/entry/front/routes.json @@ -2,7 +2,7 @@ "module": "entry", "name": "Entries", "icon": "icon-entry", - "dependencies": ["travel"], + "dependencies": ["travel", "item"], "validations": true, "menus": { "main": [ @@ -25,12 +25,14 @@ "url": "/index?q", "state": "entry.index", "component": "vn-entry-index", - "description": "Entries" + "description": "Entries", + "acl": ["buyer"] }, { "url": "/latest-buys?q", "state": "entry.latestBuys", "component": "vn-entry-latest-buys", - "description": "Latest buys" + "description": "Latest buys", + "acl": ["buyer"] }, { "url": "/:id", "state": "entry.card", diff --git a/modules/item/back/methods/item/filter.js b/modules/item/back/methods/item/filter.js index 5d9ae9e0f..a38a06713 100644 --- a/modules/item/back/methods/item/filter.js +++ b/modules/item/back/methods/item/filter.js @@ -12,42 +12,38 @@ module.exports = Self => { arg: 'filter', type: 'Object', description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string', - http: {source: 'query'} }, { arg: 'tags', type: ['Object'], description: 'List of tags to filter with', - http: {source: 'query'} }, { arg: 'search', type: 'String', description: `If it's and integer searchs by id, otherwise it searchs by name`, - http: {source: 'query'} }, { arg: 'id', type: 'Integer', description: 'Item id', - http: {source: 'query'} }, { arg: 'categoryFk', type: 'Integer', description: 'Category id', - http: {source: 'query'} }, { arg: 'typeFk', type: 'Integer', description: 'Type id', - http: {source: 'query'} }, { arg: 'isActive', type: 'Boolean', description: 'Whether the the item is or not active', - http: {source: 'query'} }, { arg: 'salesPersonFk', type: 'Integer', description: 'The buyer of the item', - http: {source: 'query'} + }, { + arg: 'description', + type: 'String', + description: 'The item description', } ], returns: { diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html index 296ac9747..b34445d36 100644 --- a/modules/item/front/index/index.html +++ b/modules/item/front/index/index.html @@ -11,21 +11,21 @@ vn-smart-table="itemIndex"> - + Id - Grouping - Packing - Description - Stems - Size - Niche - Type - Category - Intrastat - Origin - Buyer - Density - Active + Grouping + Packing + Description + Stems + Size + Niche + Type + Category + Intrastat + Origin + Buyer + Density + Active diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html index 7258018f1..909d78249 100644 --- a/modules/route/front/index/index.html +++ b/modules/route/front/index/index.html @@ -14,12 +14,12 @@ Id - Worker - Agency - Vehicle - Date - m³ - Description + Worker + Agency + Vehicle + Date + m³ + Description From d156ca95ba399942f9be38c259e88824cccf6195 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Thu, 27 Aug 2020 15:14:30 +0200 Subject: [PATCH 04/13] front and back unit tests --- db/dump/fixtures.sql | 34 ++--- .../entry/specs/editLatestBuys.spec.js | 30 ++++ .../entry/specs/latestBuysFilter.spec.js | 132 +++++++++++++++++- modules/entry/front/descriptor/index.spec.js | 18 ++- .../latest-buys-search-panel/index.spec.js | 8 +- modules/entry/front/latest-buys/index.js | 3 - modules/entry/front/latest-buys/index.spec.js | 91 ++++++++++++ 7 files changed, 287 insertions(+), 29 deletions(-) create mode 100644 modules/entry/back/methods/entry/specs/editLatestBuys.spec.js create mode 100644 modules/entry/front/latest-buys/index.spec.js diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 2b70cf2be..301f0a256 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -735,23 +735,23 @@ INSERT INTO `vn`.`intrastat`(`id`, `description`, `taxClassFk`, `taxCodeFk`) INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `isOnOffer`, `expenceFk`, `isBargain`, `comment`, `relevancy`, `image`, `taxClassFk`, `subName`) VALUES - (1, 2, 70, 'AMA', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 66540, 1, NULL), - (2, 2, 70, 'AZL', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 65540, 1, NULL), - (3, 1, 60, 'AMR', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, 61692, 1, NULL), - (4, 1, 60, 'AMR', 1, 1, NULL, 1, 05080000, 1, 4751000000, 0, NULL, 0, 66090, 2, NULL), - (5, 3, 30, 'GRE', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, NULL), - (6, 5, 30, 'GRE', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL), - (7, 5, 90, 'AZL', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL), - (8, 2, 70, 'AMA', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 66540, 1, NULL), - (9, 2, 70, 'AZL', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 65540, 1, NULL), - (10, 1, 60, 'AMR', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, 61692, 1, NULL), - (11, 1, 60, 'AMR', 1, 1, NULL, 1, 05080000, 1, 4751000000, 0, NULL, 0, 66090, 2, NULL), - (12, 3, 30, 'GRE', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, NULL), - (13, 5, 30, 'GRE', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL), - (14, 5, 90, 'AZL', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL), - (15, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL), - (16, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL), - (71, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, NULL); + (1, 2, 70, 'AMA', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 66540, 1, NULL), + (2, 2, 70, 'AZL', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 65540, 1, NULL), + (3, 1, 60, 'AMR', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, 61692, 1, NULL), + (4, 1, 60, 'AMR', 1, 1, 'Increases block', 1, 05080000, 1, 4751000000, 0, NULL, 0, 66090, 2, NULL), + (5, 3, 30, 'GRE', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, NULL), + (6, 5, 30, 'GRE', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL), + (7, 5, 90, 'AZL', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL), + (8, 2, 70, 'AMA', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 66540, 1, NULL), + (9, 2, 70, 'AZL', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 65540, 1, NULL), + (10, 1, 60, 'AMR', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, 61692, 1, NULL), + (11, 1, 60, 'AMR', 1, 1, NULL, 1, 05080000, 1, 4751000000, 0, NULL, 0, 66090, 2, NULL), + (12, 3, 30, 'GRE', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, NULL), + (13, 5, 30, 'GRE', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL), + (14, 5, 90, 'AZL', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL), + (15, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL), + (16, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL), + (71, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, NULL); INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `checked`, `workerFk`) VALUES diff --git a/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js b/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js new file mode 100644 index 000000000..c82ca036b --- /dev/null +++ b/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js @@ -0,0 +1,30 @@ +const app = require('vn-loopback/server/server'); +const model = app.models.Buy; + +describe('Buy editLatestsBuys()', () => { + it('should change the value of a given column for the selected buys', async() => { + let ctx = { + args: { + search: 'Ranged weapon longbow 2m' + } + }; + + let [original] = await model.latestBuysFilter(ctx); + + const column = {field: 'size', newValue: 99}; + const buys = [{itemFk: 1, id: 3}]; + + await model.editLatestBuys(column, buys); + + let [result] = await model.latestBuysFilter(ctx); + + expect(result.size).toEqual(99); + + column.newValue = original.size; + await model.editLatestBuys(column, buys); + + let [restoredFixture] = await model.latestBuysFilter(ctx); + + expect(restoredFixture.size).toEqual(original.size); + }); +}); diff --git a/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js b/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js index 2e2cab346..ba18fcf57 100644 --- a/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js +++ b/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js @@ -1,15 +1,139 @@ const app = require('vn-loopback/server/server'); -fdescribe('Entry latests buys filter()', () => { +describe('Buy latests buys filter()', () => { it('should return the entry matching "search"', async() => { let ctx = { args: { - search: 1 + search: 'Ranged weapon longbow 2m' } }; - let result = await app.models.Entry.latestBuysFilter(ctx); + let results = await app.models.Buy.latestBuysFilter(ctx); + let firstBuy = results[0]; - expect(result[0].size).toEqual(300); + expect(results.length).toEqual(1); + expect(firstBuy.size).toEqual(70); + }); + + it('should return the entry matching "id"', async() => { + let ctx = { + args: { + id: 1 + } + }; + + let results = await app.models.Buy.latestBuysFilter(ctx); + + expect(results.length).toEqual(1); + }); + + it('should return results matching "tags"', async() => { + let ctx = { + args: { + tags: [ + {tagFk: 27, value: '2m'} + ] + } + }; + + let results = await app.models.Buy.latestBuysFilter(ctx); + + expect(results.length).toBe(2); + }); + + it('should return results matching "categoryFk"', async() => { + let ctx = { + args: { + categoryFk: 1 + } + }; + + let results = await app.models.Buy.latestBuysFilter(ctx); + + expect(results.length).toBe(4); + }); + + it('should return results matching "typeFk"', async() => { + let ctx = { + args: { + typeFk: 2 + } + }; + + let results = await app.models.Buy.latestBuysFilter(ctx); + + expect(results.length).toBe(4); + }); + + it('should return results matching "active"', async() => { + let ctx = { + args: { + active: true + } + }; + + let results = await app.models.Buy.latestBuysFilter(ctx); + + expect(results.length).toBe(6); + }); + + it('should return results matching "not active"', async() => { + let ctx = { + args: { + active: false + } + }; + + let results = await app.models.Buy.latestBuysFilter(ctx); + + expect(results.length).toBe(0); + }); + + it('should return results matching "visible"', async() => { + let ctx = { + args: { + visible: true + } + }; + + let results = await app.models.Buy.latestBuysFilter(ctx); + + expect(results.length).toBe(5); + }); + + it('should return results matching "not visible"', async() => { + let ctx = { + args: { + visible: false + } + }; + + let results = await app.models.Buy.latestBuysFilter(ctx); + + expect(results.length).toBe(0); + }); + + it('should return results matching "salesPersonFk"', async() => { + let ctx = { + args: { + salesPersonFk: 35 + } + }; + + let results = await app.models.Buy.latestBuysFilter(ctx); + + expect(results.length).toBe(6); + }); + + it('should return results matching "description"', async() => { + let ctx = { + args: { + description: 'Increases block' + } + }; + + let results = await app.models.Buy.latestBuysFilter(ctx); + + expect(results.length).toBe(1); }); }); diff --git a/modules/entry/front/descriptor/index.spec.js b/modules/entry/front/descriptor/index.spec.js index 513425c76..84defea3b 100644 --- a/modules/entry/front/descriptor/index.spec.js +++ b/modules/entry/front/descriptor/index.spec.js @@ -1,12 +1,14 @@ import './index.js'; describe('Entry Component vnEntryDescriptor', () => { + let $httpBackend; let controller; const entry = {id: 2}; beforeEach(ngModule('entry')); - beforeEach(inject($componentController => { + beforeEach(inject(($componentController, _$httpBackend_) => { + $httpBackend = _$httpBackend_; controller = $componentController('vnEntryDescriptor', {$element: null}, {entry}); })); @@ -24,4 +26,18 @@ describe('Entry Component vnEntryDescriptor', () => { expect(controller.vnReport.show).toHaveBeenCalledWith('entry-order', params); }); }); + + describe('loadData()', () => { + it('should perform ask for the entry', () => { + let query = `Entries/${entry.id}`; + jest.spyOn(controller, 'getData'); + + $httpBackend.expectGET(query).respond(); + controller.loadData(); + $httpBackend.flush(); + + expect(controller.getData).toHaveBeenCalledTimes(1); + expect(controller.getData).toHaveBeenCalledWith(query, jasmine.any(Object)); + }); + }); }); diff --git a/modules/entry/front/latest-buys-search-panel/index.spec.js b/modules/entry/front/latest-buys-search-panel/index.spec.js index 0fb8b2128..6d403b9fb 100644 --- a/modules/entry/front/latest-buys-search-panel/index.spec.js +++ b/modules/entry/front/latest-buys-search-panel/index.spec.js @@ -1,14 +1,14 @@ import './index.js'; -xdescribe('Item', () => { - describe('Component vnItemSearchPanel', () => { +describe('Entry', () => { + describe('Component vnLatestBuysSearchPanel', () => { let $element; let controller; - beforeEach(ngModule('item')); + beforeEach(ngModule('entry')); beforeEach(angular.mock.inject($componentController => { - $element = angular.element(`
`); + $element = angular.element(``); controller = $componentController('vnLatestBuysSearchPanel', {$element}); })); diff --git a/modules/entry/front/latest-buys/index.js b/modules/entry/front/latest-buys/index.js index b3b120af8..6ce1995a1 100644 --- a/modules/entry/front/latest-buys/index.js +++ b/modules/entry/front/latest-buys/index.js @@ -47,7 +47,6 @@ export default class Controller extends Section { } uncheck() { - console.log('clicked!'); const lines = this.checked; for (let line of lines) { if (line.checked) @@ -73,8 +72,6 @@ export default class Controller extends Section { }); this.editedColumn = null; - - return false; } } diff --git a/modules/entry/front/latest-buys/index.spec.js b/modules/entry/front/latest-buys/index.spec.js new file mode 100644 index 000000000..ed6d6ca21 --- /dev/null +++ b/modules/entry/front/latest-buys/index.spec.js @@ -0,0 +1,91 @@ +import './index.js'; + +describe('Entry', () => { + describe('Component vnEntryLatestBuys', () => { + let controller; + let $httpBackend; + + beforeEach(ngModule('entry')); + + beforeEach(angular.mock.inject(($componentController, $compile, $rootScope, _$httpBackend_) => { + $httpBackend = _$httpBackend_; + let $element = $compile(' {}}, + edit: {hide: () => {}} + }; + })); + + describe('get columns', () => { + it(`should return a set of columns`, () => { + let result = controller.columns; + + let length = result.length; + let anyColumn = Object.keys(result[Math.floor(Math.random() * Math.floor(length))]); + + expect(anyColumn).toContain('field', 'displayName'); + }); + }); + + describe('get checked', () => { + it(`should return a set of checked lines`, () => { + controller.$.model.data = [ + {checked: true, id: 1}, + {checked: true, id: 2}, + {checked: true, id: 3}, + {checked: false, id: 4}, + ]; + + let result = controller.checked; + + expect(result.length).toEqual(3); + }); + }); + + describe('uncheck()', () => { + it(`should clear the selection of lines on the controller`, () => { + controller.$.model.data = [ + {checked: true, id: 1}, + {checked: true, id: 2}, + {checked: true, id: 3}, + {checked: false, id: 4}, + ]; + + let result = controller.checked; + + expect(result.length).toEqual(3); + + controller.uncheck(); + + result = controller.checked; + + expect(result.length).toEqual(0); + }); + }); + + describe('onEditAccept()', () => { + it(`should perform a query to update columns and then `, () => { + controller.editedColumn = {someColumnName: 'some Value'}; + let query = 'Buys/editLatestBuys'; + controller.$.model.data = [ + {checked: true, id: 1}, + {checked: true, id: 2}, + {checked: true, id: 3}, + {checked: false, id: 4}, + ]; + + expect(controller.editedColumn).toBeDefined(); + + $httpBackend.expectPOST(query).respond(); + controller.onEditAccept(); + $httpBackend.flush(); + + const result = controller.checked; + + expect(result.length).toEqual(0); + expect(controller.editedColumn).toBeNull(); + }); + }); + }); +}); From 5614a39f919b3642cb31fb665d600aa818358012 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Thu, 27 Aug 2020 15:29:48 +0200 Subject: [PATCH 05/13] traductuctions --- modules/entry/front/latest-buys/index.html | 2 +- modules/entry/front/latest-buys/locale/es.yml | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/modules/entry/front/latest-buys/index.html b/modules/entry/front/latest-buys/index.html index 9be216067..dfe272208 100644 --- a/modules/entry/front/latest-buys/index.html +++ b/modules/entry/front/latest-buys/index.html @@ -127,7 +127,7 @@ icon="edit" ng-show="$ctrl.totalChecked > 0" ng-click="edit.show($event)" - vn-tooltip="Edit buys" + vn-tooltip="Edit buy(s)" tooltip-position="left"> diff --git a/modules/entry/front/latest-buys/locale/es.yml b/modules/entry/front/latest-buys/locale/es.yml index 9eeab7bce..572cb272b 100644 --- a/modules/entry/front/latest-buys/locale/es.yml +++ b/modules/entry/front/latest-buys/locale/es.yml @@ -1 +1,12 @@ -Edit buys: Editar compras \ No newline at end of file +Edit buy(s): Editar compra(s) +Buying value: Valor compra +Freight value: Valor envío +Comission value: Valor comisión +Package value: Valor paquete +Is ignored: Ignorado +Grouping mode: Agrupación +price2: Precio 2 +price3: Precio 3 +Min price: Precio min +Weight: Peso +Field to edit: Campo a editar \ No newline at end of file From 58fc25d91f9b967bb15e18fc31013efaa25fff2b Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Thu, 27 Aug 2020 16:40:08 +0200 Subject: [PATCH 06/13] grouping & packaging according to grouping mode --- modules/entry/front/latest-buys/index.html | 14 ++++++++++---- modules/entry/front/latest-buys/index.js | 1 - modules/entry/front/latest-buys/locale/es.yml | 17 ++++++++--------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/modules/entry/front/latest-buys/index.html b/modules/entry/front/latest-buys/index.html index dfe272208..fdf0f50ab 100644 --- a/modules/entry/front/latest-buys/index.html +++ b/modules/entry/front/latest-buys/index.html @@ -47,7 +47,6 @@ Comission value Package value Is ignored - Grouping mode price2 price3 Min price @@ -79,8 +78,16 @@ {{::buy.itemFk | zeroFill:6}} - {{::buy.grouping}} - {{::buy.packing}} + + + {{::buy.grouping | dashIfEmpty}} + + + + + {{::buy.packing | dashIfEmpty}} + + {{::buy.size}} {{::buy.type}} @@ -110,7 +117,6 @@ {{::buy.comissionValue | currency: 'EUR':2}} {{::buy.packageValue | currency: 'EUR':2}} {{::buy.isIgnored}} - {{::buy.groupingMode}} {{::buy.price2 | currency: 'EUR':2}} {{::buy.price3 | currency: 'EUR':2}} {{::buy.minPrice | currency: 'EUR':2}} diff --git a/modules/entry/front/latest-buys/index.js b/modules/entry/front/latest-buys/index.js index 6ce1995a1..7fac10ece 100644 --- a/modules/entry/front/latest-buys/index.js +++ b/modules/entry/front/latest-buys/index.js @@ -20,7 +20,6 @@ export default class Controller extends Section { {field: 'freightValue', displayName: 'freightValue'}, {field: 'packing', displayName: 'packing'}, {field: 'grouping', displayName: 'grouping'}, - {field: 'groupingMode', displayName: 'groupingMode'}, {field: 'comissionValue', displayName: 'comissionValue'}, {field: 'packageValue', displayName: 'packageValue'}, {field: 'price2', displayName: 'price2'}, diff --git a/modules/entry/front/latest-buys/locale/es.yml b/modules/entry/front/latest-buys/locale/es.yml index 572cb272b..148c80e4e 100644 --- a/modules/entry/front/latest-buys/locale/es.yml +++ b/modules/entry/front/latest-buys/locale/es.yml @@ -1,12 +1,11 @@ Edit buy(s): Editar compra(s) -Buying value: Valor compra -Freight value: Valor envío -Comission value: Valor comisión -Package value: Valor paquete +Buying value: Precio +Freight value: Porte +Commission value: Comisión +Package value: Embalaje Is ignored: Ignorado -Grouping mode: Agrupación -price2: Precio 2 -price3: Precio 3 +price 2: Paquete +price 3: Caja Min price: Precio min -Weight: Peso -Field to edit: Campo a editar \ No newline at end of file +Ekt: Ekt +Weight: Peso \ No newline at end of file From 2f81e4188197b39b86ed207b9dadcf68d53385f0 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Thu, 27 Aug 2020 16:42:01 +0200 Subject: [PATCH 07/13] grping and pcking shown as per item last entries --- modules/entry/front/latest-buys/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/entry/front/latest-buys/index.html b/modules/entry/front/latest-buys/index.html index fdf0f50ab..f389ec953 100644 --- a/modules/entry/front/latest-buys/index.html +++ b/modules/entry/front/latest-buys/index.html @@ -31,8 +31,8 @@ Picture Id - Grouping Packing + Grouping Size Type Intrastat @@ -79,13 +79,13 @@ - - {{::buy.grouping | dashIfEmpty}} + + {{::buy.packing | dashIfEmpty}} - - {{::buy.packing | dashIfEmpty}} + + {{::buy.grouping | dashIfEmpty}} {{::buy.size}} From c70ad808a0dc691297ead5cff78f362439b9fa58 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Thu, 27 Aug 2020 17:54:43 +0200 Subject: [PATCH 08/13] refactor --- db/dump/fixtures.sql | 68 +++++++++---------- .../back/methods/entry/editLatestBuys.js | 5 +- .../back/methods/entry/latestBuysFilter.js | 6 +- modules/entry/back/models/buy.json | 3 - modules/entry/front/latest-buys/index.html | 4 +- modules/entry/front/latest-buys/locale/en.yml | 3 + modules/entry/front/latest-buys/locale/es.yml | 7 +- modules/item/back/models/item.json | 3 + 8 files changed, 52 insertions(+), 47 deletions(-) create mode 100644 modules/entry/front/latest-buys/locale/en.yml diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 301f0a256..fa738863c 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -733,25 +733,25 @@ INSERT INTO `vn`.`intrastat`(`id`, `description`, `taxClassFk`, `taxCodeFk`) (05080000, 'Coral y materiales similares', 2, 2), (06021010, 'Plantas vivas: Esqueje/injerto, Vid', 1, 1); -INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `isOnOffer`, `expenceFk`, `isBargain`, `comment`, `relevancy`, `image`, `taxClassFk`, `subName`) +INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `isOnOffer`, `expenceFk`, `isBargain`, `comment`, `relevancy`, `image`, `taxClassFk`, `subName`, `minPrice`) VALUES - (1, 2, 70, 'AMA', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 66540, 1, NULL), - (2, 2, 70, 'AZL', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 65540, 1, NULL), - (3, 1, 60, 'AMR', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, 61692, 1, NULL), - (4, 1, 60, 'AMR', 1, 1, 'Increases block', 1, 05080000, 1, 4751000000, 0, NULL, 0, 66090, 2, NULL), - (5, 3, 30, 'GRE', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, NULL), - (6, 5, 30, 'GRE', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL), - (7, 5, 90, 'AZL', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL), - (8, 2, 70, 'AMA', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 66540, 1, NULL), - (9, 2, 70, 'AZL', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 65540, 1, NULL), - (10, 1, 60, 'AMR', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, 61692, 1, NULL), - (11, 1, 60, 'AMR', 1, 1, NULL, 1, 05080000, 1, 4751000000, 0, NULL, 0, 66090, 2, NULL), - (12, 3, 30, 'GRE', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, NULL), - (13, 5, 30, 'GRE', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL), - (14, 5, 90, 'AZL', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL), - (15, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL), - (16, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL), - (71, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, NULL); + (1, 2, 70, 'AMA', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 66540, 1, NULL, 0), + (2, 2, 70, 'AZL', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 65540, 1, NULL, 0), + (3, 1, 60, 'AMR', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, 61692, 1, NULL, 0), + (4, 1, 60, 'AMR', 1, 1, 'Increases block', 1, 05080000, 1, 4751000000, 0, NULL, 0, 66090, 2, NULL, 0), + (5, 3, 30, 'GRE', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0), + (6, 5, 30, 'GRE', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0), + (7, 5, 90, 'AZL', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0), + (8, 2, 70, 'AMA', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 66540, 1, NULL, 0), + (9, 2, 70, 'AZL', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 65540, 1, NULL, 0), + (10, 1, 60, 'AMR', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, 61692, 1, NULL, 0), + (11, 1, 60, 'AMR', 1, 1, NULL, 1, 05080000, 1, 4751000000, 0, NULL, 0, 66090, 2, NULL, 0), + (12, 3, 30, 'GRE', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0), + (13, 5, 30, 'GRE', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0), + (14, 5, 90, 'AZL', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0), + (15, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0), + (16, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0), + (71, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0); INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `checked`, `workerFk`) VALUES @@ -1233,23 +1233,23 @@ INSERT INTO `bs`.`waste`(`buyer`, `year`, `week`, `family`, `saleTotal`, `saleWa ('HankPym', YEAR(DATE_ADD(CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(CURDATE(), INTERVAL -1 WEEK), 1), 'Miscellaneous Accessories', '186', '0', '0.0'), ('HankPym', YEAR(DATE_ADD(CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(CURDATE(), INTERVAL -1 WEEK), 1), 'Adhesives', '277', '0', '0.0'); -INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packageFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`,`minPrice`,`producer`,`printedStickers`,`isChecked`,`isIgnored`,`weight`, `created`) +INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packageFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`,`producer`,`printedStickers`,`isChecked`,`isIgnored`,`weight`, `created`) VALUES - (1, 1, 1, 50, 5000, 4, 1, 1.500, 1.500, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, 0.00, NULL, 0, 1, 0, 1, DATE_ADD(CURDATE(), INTERVAL -2 MONTH)), - (2, 2, 1, 50, 100, 4, 1, 1.500, 1.500, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, 0.00, NULL, 0, 1, 0, 1, DATE_ADD(CURDATE(), INTERVAL -1 MONTH)), - (3, 3, 1, 50, 100, 4, 1, 1.500, 1.500, 0.000, 1, 1, 0, NULL, 0.00, 99.6, 99.4, 0.00, NULL, 0, 1, 0, 1, CURDATE()), - (4, 2, 2, 5, 450, 3, 1, 1.000, 1.000, 0.000, 10, 10, 0, NULL, 0.00, 7.30, 7.00, 0.00, NULL, 0, 1, 0, 2.5, CURDATE()), - (5, 3, 3, 55, 500, 5, 1, 1.000, 1.000, 0.000, 1, 1, 0, NULL, 0.00, 78.3, 75.6, 0.00, NULL, 0, 1, 0, 2.5, CURDATE()), - (6, 4, 8, 50, 1000, 4, 1, 1.000, 1.000, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, 0.00, NULL, 0, 1, 0, 2.5, CURDATE()), - (7, 4, 9, 20, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 30.50, 29.00, 0.00, NULL, 0, 1, 0, 2.5, CURDATE()), - (8, 4, 4, 1.25, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67, 0.00, NULL, 0, 1, 0, 2.5, CURDATE()), - (9, 4, 4, 1.25, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67, 0.00, NULL, 0, 1, 0, 4, CURDATE()), - (10, 5, 1, 50, 10, 4, 1, 2.500, 2.500, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, 0.00, NULL, 0, 1, 0, 4, CURDATE()), - (11, 5, 4, 1.25, 10, 3, 1, 2.500, 2.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67, 0.00, NULL, 0, 1, 0, 4, CURDATE()), - (12, 6, 4, 1.25, 0, 3, 1, 2.500, 2.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67, 0.00, NULL, 0, 1, 0, 4, CURDATE()), - (13, 7, 1, 50, 0, 3, 1, 2.000, 2.000, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, 0.00, NULL, 0, 1, 0, 4, CURDATE()), - (14, 7, 2, 5, 0, 3, 1, 2.000, 2.000, 0.000, 10, 10, 1, NULL, 0.00, 7.30, 7.00, 0.00, NULL, 0, 1, 0, 4, CURDATE()), - (15, 7, 4, 1.25, 0, 3, 1, 2.000, 2.000, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67, 0.00, NULL, 0, 1, 0, 4, CURDATE()); + (1, 1, 1, 50, 5000, 4, 1, 1.500, 1.500, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, NULL, 0, 1, 0, 1, DATE_ADD(CURDATE(), INTERVAL -2 MONTH)), + (2, 2, 1, 50, 100, 4, 1, 1.500, 1.500, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, NULL, 0, 1, 0, 1, DATE_ADD(CURDATE(), INTERVAL -1 MONTH)), + (3, 3, 1, 50, 100, 4, 1, 1.500, 1.500, 0.000, 1, 1, 0, NULL, 0.00, 99.6, 99.4, NULL, 0, 1, 0, 1, CURDATE()), + (4, 2, 2, 5, 450, 3, 1, 1.000, 1.000, 0.000, 10, 10, 0, NULL, 0.00, 7.30, 7.00, NULL, 0, 1, 0, 2.5, CURDATE()), + (5, 3, 3, 55, 500, 5, 1, 1.000, 1.000, 0.000, 1, 1, 0, NULL, 0.00, 78.3, 75.6, NULL, 0, 1, 0, 2.5, CURDATE()), + (6, 4, 8, 50, 1000, 4, 1, 1.000, 1.000, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, NULL, 0, 1, 0, 2.5, CURDATE()), + (7, 4, 9, 20, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 30.50, 29.00, NULL, 0, 1, 0, 2.5, CURDATE()), + (8, 4, 4, 1.25, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67, NULL, 0, 1, 0, 2.5, CURDATE()), + (9, 4, 4, 1.25, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67, NULL, 0, 1, 0, 4, CURDATE()), + (10, 5, 1, 50, 10, 4, 1, 2.500, 2.500, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, NULL, 0, 1, 0, 4, CURDATE()), + (11, 5, 4, 1.25, 10, 3, 1, 2.500, 2.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67, NULL, 0, 1, 0, 4, CURDATE()), + (12, 6, 4, 1.25, 0, 3, 1, 2.500, 2.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67, NULL, 0, 1, 0, 4, CURDATE()), + (13, 7, 1, 50, 0, 3, 1, 2.000, 2.000, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, NULL, 0, 1, 0, 4, CURDATE()), + (14, 7, 2, 5, 0, 3, 1, 2.000, 2.000, 0.000, 10, 10, 1, NULL, 0.00, 7.30, 7.00, NULL, 0, 1, 0, 4, CURDATE()), + (15, 7, 4, 1.25, 0, 3, 1, 2.000, 2.000, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67, NULL, 0, 1, 0, 4, CURDATE()); INSERT INTO `hedera`.`order`(`id`, `date_send`, `customer_id`, `delivery_method_id`, `agency_id`, `address_id`, `company_id`, `note`, `source_app`, `confirmed`,`total`, `date_make`, `first_row_stamp`, `confirm_date`) VALUES diff --git a/modules/entry/back/methods/entry/editLatestBuys.js b/modules/entry/back/methods/entry/editLatestBuys.js index acda6ed1c..a65764d6f 100644 --- a/modules/entry/back/methods/entry/editLatestBuys.js +++ b/modules/entry/back/methods/entry/editLatestBuys.js @@ -1,6 +1,6 @@ module.exports = Self => { Self.remoteMethod('editLatestBuys', { - description: 'Updates a column for one of more buys', + description: 'Updates a column for one or more buys', accessType: 'WRITE', accepts: [{ arg: 'column', @@ -27,9 +27,11 @@ module.exports = Self => { Self.editLatestBuys = async(column, buys) => { let modelName; let identifier; + switch (column.field) { case 'size': case 'density': + case 'minPrice': modelName = 'Item'; identifier = 'itemFk'; break; @@ -43,7 +45,6 @@ module.exports = Self => { case 'packageValue': case 'price2': case 'price3': - case 'minPrice': case 'weight': modelName = 'Buy'; identifier = 'id'; diff --git a/modules/entry/back/methods/entry/latestBuysFilter.js b/modules/entry/back/methods/entry/latestBuysFilter.js index 50cd8cf3c..efb47e17c 100644 --- a/modules/entry/back/methods/entry/latestBuysFilter.js +++ b/modules/entry/back/methods/entry/latestBuysFilter.js @@ -104,11 +104,12 @@ module.exports = Self => { i.size, i.density, i.typeFk, - t.name AS type, i.family, + i.isActive, + i.minPrice, + t.name AS type, intr.description AS intrastat, ori.code AS origin, - i.isActive, b.entryFk, b.id, b.quantity, @@ -122,7 +123,6 @@ module.exports = Self => { b.packageValue, b.price2, b.price3, - b.minPrice, b.ektFk, b.weight FROM cache.last_buy lb diff --git a/modules/entry/back/models/buy.json b/modules/entry/back/models/buy.json index 14f2490d8..1f3f1b862 100644 --- a/modules/entry/back/models/buy.json +++ b/modules/entry/back/models/buy.json @@ -46,9 +46,6 @@ "price3": { "type": "number" }, - "minPrice": { - "type": "number" - }, "weight": { "type": "number" } diff --git a/modules/entry/front/latest-buys/index.html b/modules/entry/front/latest-buys/index.html index f389ec953..d06a5fe69 100644 --- a/modules/entry/front/latest-buys/index.html +++ b/modules/entry/front/latest-buys/index.html @@ -79,12 +79,12 @@ - + {{::buy.packing | dashIfEmpty}} - + {{::buy.grouping | dashIfEmpty}} diff --git a/modules/entry/front/latest-buys/locale/en.yml b/modules/entry/front/latest-buys/locale/en.yml new file mode 100644 index 000000000..c8b2263c0 --- /dev/null +++ b/modules/entry/front/latest-buys/locale/en.yml @@ -0,0 +1,3 @@ +Minimun amount: Minimun purchase quantity +price2: Package +price3: Box \ No newline at end of file diff --git a/modules/entry/front/latest-buys/locale/es.yml b/modules/entry/front/latest-buys/locale/es.yml index 148c80e4e..7a59f12e7 100644 --- a/modules/entry/front/latest-buys/locale/es.yml +++ b/modules/entry/front/latest-buys/locale/es.yml @@ -4,8 +4,9 @@ Freight value: Porte Commission value: Comisión Package value: Embalaje Is ignored: Ignorado -price 2: Paquete -price 3: Caja +price2: Paquete +price3: Caja Min price: Precio min Ekt: Ekt -Weight: Peso \ No newline at end of file +Weight: Peso +Minimun amount: Cantidad mínima de compra \ No newline at end of file diff --git a/modules/item/back/models/item.json b/modules/item/back/models/item.json index 5d2e47d2a..c5af8890b 100644 --- a/modules/item/back/models/item.json +++ b/modules/item/back/models/item.json @@ -122,6 +122,9 @@ "mysql": { "columnName": "expenceFk" } + }, + "minPrice": { + "type": "number" } }, "relations": { From 0b4f65724ef0e0bde4bd617ceb73809b5a1a47e1 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Fri, 28 Aug 2020 10:40:47 +0200 Subject: [PATCH 09/13] semantics, traductions and small aditions --- .../back/methods/entry/editLatestBuys.js | 9 ++++---- .../back/methods/entry/latestBuysFilter.js | 21 ++++++++++--------- modules/entry/front/latest-buys/index.html | 8 +++++-- modules/entry/front/latest-buys/index.js | 8 +++---- modules/entry/front/latest-buys/locale/en.yml | 4 ++-- modules/entry/front/latest-buys/locale/es.yml | 4 ++-- 6 files changed, 30 insertions(+), 24 deletions(-) diff --git a/modules/entry/back/methods/entry/editLatestBuys.js b/modules/entry/back/methods/entry/editLatestBuys.js index a65764d6f..68a9b9bb4 100644 --- a/modules/entry/back/methods/entry/editLatestBuys.js +++ b/modules/entry/back/methods/entry/editLatestBuys.js @@ -9,7 +9,7 @@ module.exports = Self => { description: `the column to edit and it's new value` }, { - arg: 'buys', + arg: 'lines', type: ['Object'], required: true, description: `the buys which will be modified` @@ -24,7 +24,7 @@ module.exports = Self => { } }); - Self.editLatestBuys = async(column, buys) => { + Self.editLatestBuys = async(column, lines) => { let modelName; let identifier; @@ -32,6 +32,7 @@ module.exports = Self => { case 'size': case 'density': case 'minPrice': + case 'description': modelName = 'Item'; identifier = 'itemFk'; break; @@ -59,8 +60,8 @@ module.exports = Self => { let promises = []; let options = {transaction: tx}; - let targets = buys.map(buy => { - return buy[identifier]; + let targets = lines.map(line => { + return line[identifier]; }); let value = {}; diff --git a/modules/entry/back/methods/entry/latestBuysFilter.js b/modules/entry/back/methods/entry/latestBuysFilter.js index efb47e17c..dffe5793d 100644 --- a/modules/entry/back/methods/entry/latestBuysFilter.js +++ b/modules/entry/back/methods/entry/latestBuysFilter.js @@ -27,13 +27,13 @@ module.exports = Self => { description: 'List of tags to filter with', http: {source: 'query'} }, { - arg: 'categoryFk', - type: 'Integer', - description: 'Category id', + arg: 'description', + type: 'String', + description: 'The item description', }, { - arg: 'typeFk', + arg: 'salesPersonFk', type: 'Integer', - description: 'Type id', + description: 'The buyer of the item', }, { arg: 'active', type: 'Boolean', @@ -43,13 +43,13 @@ module.exports = Self => { type: 'Boolean', description: 'Whether the the item is or not visible', }, { - arg: 'salesPersonFk', + arg: 'typeFk', type: 'Integer', - description: 'The buyer of the item', + description: 'Type id', }, { - arg: 'description', - type: 'String', - description: 'The item description', + arg: 'categoryFk', + type: 'Integer', + description: 'Category id', } ], returns: { @@ -107,6 +107,7 @@ module.exports = Self => { i.family, i.isActive, i.minPrice, + i.description, t.name AS type, intr.description AS intrastat, ori.code AS origin, diff --git a/modules/entry/front/latest-buys/index.html b/modules/entry/front/latest-buys/index.html index d06a5fe69..fcdd32f1a 100644 --- a/modules/entry/front/latest-buys/index.html +++ b/modules/entry/front/latest-buys/index.html @@ -33,6 +33,7 @@ Id Packing Grouping + Description Size Type Intrastat @@ -47,8 +48,8 @@ Comission value Package value Is ignored - price2 - price3 + price2 + price3 Min price Ekt Weight @@ -88,6 +89,9 @@ {{::buy.grouping | dashIfEmpty}} + + {{::buy.description | dashIfEmpty}} + {{::buy.size}} {{::buy.type}} diff --git a/modules/entry/front/latest-buys/index.js b/modules/entry/front/latest-buys/index.js index 7fac10ece..e5ce23603 100644 --- a/modules/entry/front/latest-buys/index.js +++ b/modules/entry/front/latest-buys/index.js @@ -24,11 +24,11 @@ export default class Controller extends Section { {field: 'packageValue', displayName: 'packageValue'}, {field: 'price2', displayName: 'price2'}, {field: 'price3', displayName: 'price3'}, - {field: 'minPrice', displayName: 'minPrice'}, {field: 'weight', displayName: 'weight'}, + {field: 'description', displayName: 'description'}, + {field: 'minPrice', displayName: 'minPrice'}, {field: 'size', displayName: 'size'}, - {field: 'density', displayName: 'density'}, - {field: 'description', displayName: 'description'} + {field: 'density', displayName: 'density'} ]; return this._columns; @@ -60,7 +60,7 @@ export default class Controller extends Section { onEditAccept() { let data = { column: this.editedColumn, - buys: this.checked + lines: this.checked }; this.$http.post('Buys/editLatestBuys', data) diff --git a/modules/entry/front/latest-buys/locale/en.yml b/modules/entry/front/latest-buys/locale/en.yml index c8b2263c0..43101bc65 100644 --- a/modules/entry/front/latest-buys/locale/en.yml +++ b/modules/entry/front/latest-buys/locale/en.yml @@ -1,3 +1,3 @@ Minimun amount: Minimun purchase quantity -price2: Package -price3: Box \ No newline at end of file +price2: Grouping price +price3: Packing price \ No newline at end of file diff --git a/modules/entry/front/latest-buys/locale/es.yml b/modules/entry/front/latest-buys/locale/es.yml index 7a59f12e7..5744016b4 100644 --- a/modules/entry/front/latest-buys/locale/es.yml +++ b/modules/entry/front/latest-buys/locale/es.yml @@ -4,8 +4,8 @@ Freight value: Porte Commission value: Comisión Package value: Embalaje Is ignored: Ignorado -price2: Paquete -price3: Caja +price2: Precio grouping +price3: Precio packing Min price: Precio min Ekt: Ekt Weight: Peso From 5c53c9301e94a763321f14b2e5954e9f367eff72 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Fri, 28 Aug 2020 19:52:54 +0200 Subject: [PATCH 10/13] path e2e + fixes + exclusion --- e2e/helpers/selectors.js | 38 +++++++++------ e2e/paths/02-client/05_add_address.spec.js | 1 + e2e/paths/05-ticket/10_request.spec.js | 2 +- e2e/paths/08-route/03_create.spec.js | 1 + .../09-invoice-out/02_descriptor.spec.js | 5 +- e2e/paths/12-entry/03_latestBuys.spec.js | 46 +++++++++++++++++++ 6 files changed, 76 insertions(+), 17 deletions(-) create mode 100644 e2e/paths/12-entry/03_latestBuys.spec.js diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 6eca623bd..47fcc7edf 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -219,23 +219,23 @@ export default { topbarSearch: 'vn-topbar', searchButton: 'vn-searchbar vn-icon[icon="search"]', closeItemSummaryPreview: '.vn-popup.shown', - fieldsToShowButton: 'vn-item-index vn-table > div > div > vn-icon-button[icon="menu"]', - fieldsToShowForm: '.vn-dialog.shown form', + fieldsToShowButton: 'vn-item-index vn-table > div > div > vn-icon-button[icon="more_vert"]', + fieldsToShowForm: '.vn-popover.shown .content', firstItemImage: 'vn-item-index vn-tbody > a:nth-child(1) > vn-td:nth-child(1) > img', firstItemImageTd: 'vn-item-index vn-table a:nth-child(1) vn-td:nth-child(1)', firstItemId: 'vn-item-index vn-tbody > a:nth-child(1) > vn-td:nth-child(2)', - idCheckbox: '.vn-dialog.shown form vn-horizontal:nth-child(2) > vn-check', - stemsCheckbox: '.vn-dialog.shown form vn-horizontal:nth-child(3) > vn-check', - sizeCheckbox: '.vn-dialog.shown form vn-horizontal:nth-child(4) > vn-check', - nicheCheckbox: '.vn-dialog.shown form vn-horizontal:nth-child(5) > vn-check', - typeCheckbox: '.vn-dialog.shown form vn-horizontal:nth-child(6) > vn-check', - categoryCheckbox: '.vn-dialog.shown form vn-horizontal:nth-child(7) > vn-check', - intrastadCheckbox: '.vn-dialog.shown form vn-horizontal:nth-child(8) > vn-check', - originCheckbox: '.vn-dialog.shown form vn-horizontal:nth-child(9) > vn-check', - buyerCheckbox: '.vn-dialog.shown form vn-horizontal:nth-child(10) > vn-check', - destinyCheckbox: '.vn-dialog.shown form vn-horizontal:nth-child(11) > vn-check', - taxClassCheckbox: '.vn-dialog.shown form vn-horizontal:nth-child(12) > vn-check', - saveFieldsButton: '.vn-dialog.shown vn-horizontal:nth-child(16) > vn-button > button' + idCheckbox: '.vn-popover.shown vn-horizontal:nth-child(2) > vn-check', + stemsCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check', + sizeCheckbox: '.vn-popover.shown vn-horizontal:nth-child(4) > vn-check', + nicheCheckbox: '.vn-popover.shown vn-horizontal:nth-child(5) > vn-check', + typeCheckbox: '.vn-popover.shown vn-horizontal:nth-child(6) > vn-check', + categoryCheckbox: '.vn-popover.shown vn-horizontal:nth-child(7) > vn-check', + intrastadCheckbox: '.vn-popover.shown vn-horizontal:nth-child(8) > vn-check', + originCheckbox: '.vn-popover.shown vn-horizontal:nth-child(9) > vn-check', + buyerCheckbox: '.vn-popover.shown vn-horizontal:nth-child(10) > vn-check', + destinyCheckbox: '.vn-popover.shown vn-horizontal:nth-child(11) > vn-check', + taxClassCheckbox: '.vn-popover.shown vn-horizontal:nth-child(12) > vn-check', + saveFieldsButton: '.vn-popover.shown vn-horizontal:nth-child(16) > vn-button > button' }, itemCreateView: { temporalName: 'vn-item-create vn-textfield[ng-model="$ctrl.item.provisionalName"]', @@ -897,5 +897,15 @@ export default { agency: 'vn-entry-descriptor div.body vn-label-value:nth-child(1) span', travelsQuicklink: 'vn-entry-descriptor vn-quick-link[icon="local_airport"] > a', entriesQuicklink: 'vn-entry-descriptor vn-quick-link[icon="icon-entry"] > a' + }, + entryLatestBuys: { + firstBuy: 'vn-entry-latest-buys vn-tbody > a:nth-child(1)', + allBuysCheckBox: 'vn-entry-latest-buys vn-thead vn-check', + secondBuyCheckBox: 'vn-entry-latest-buys a:nth-child(2) vn-check[ng-model="buy.checked"]', + editBuysButton: 'vn-entry-latest-buys vn-button[icon="edit"]', + fieldAutocomplete: 'vn-autocomplete[ng-model="$ctrl.editedColumn.field"]', + newValueInput: 'vn-textfield[ng-model="$ctrl.editedColumn.newValue"]', + latestBuysSectionButton: 'a[ui-sref="entry.latestBuys"]', + acceptEditBuysDialog: 'button[response="accept"]' } }; diff --git a/e2e/paths/02-client/05_add_address.spec.js b/e2e/paths/02-client/05_add_address.spec.js index f16408b34..c946bc774 100644 --- a/e2e/paths/02-client/05_add_address.spec.js +++ b/e2e/paths/02-client/05_add_address.spec.js @@ -17,6 +17,7 @@ describe('Client Add address path', () => { }); it(`should click on the add new address button to access to the new address form`, async() => { + await page.waitFor(500); await page.waitToClick(selectors.clientAddresses.createAddress); await page.waitForState('client.card.address.create'); }); diff --git a/e2e/paths/05-ticket/10_request.spec.js b/e2e/paths/05-ticket/10_request.spec.js index afab9b9e9..c01964d2b 100644 --- a/e2e/paths/05-ticket/10_request.spec.js +++ b/e2e/paths/05-ticket/10_request.spec.js @@ -18,7 +18,7 @@ describe('Ticket purchase request path', () => { }); it('should add a new request', async() => { - await page.waitFor('.vn-popup', {hidden: true}), + await page.waitFor(500); await page.waitToClick(selectors.ticketRequests.addRequestButton); await page.write(selectors.ticketRequests.descriptionInput, 'New stuff'); await page.write(selectors.ticketRequests.quantity, '9'); diff --git a/e2e/paths/08-route/03_create.spec.js b/e2e/paths/08-route/03_create.spec.js index 80c0071b6..7c6c3f75d 100644 --- a/e2e/paths/08-route/03_create.spec.js +++ b/e2e/paths/08-route/03_create.spec.js @@ -17,6 +17,7 @@ describe('Route create path', () => { describe('as employee', () => { it('should click on the add new route button and open the creation form', async() => { + await page.waitFor(500); await page.waitToClick(selectors.routeIndex.addNewRouteButton); await page.waitForState('route.create'); }); diff --git a/e2e/paths/09-invoice-out/02_descriptor.spec.js b/e2e/paths/09-invoice-out/02_descriptor.spec.js index ade121a8b..b28730b4e 100644 --- a/e2e/paths/09-invoice-out/02_descriptor.spec.js +++ b/e2e/paths/09-invoice-out/02_descriptor.spec.js @@ -1,7 +1,8 @@ import selectors from '../../helpers/selectors.js'; import getBrowser from '../../helpers/puppeteer'; -describe('InvoiceOut descriptor path', () => { +// #2415 e2e fix InvoiceOut descriptor path +xdescribe('InvoiceOut descriptor path', () => { let browser; let page; @@ -63,7 +64,7 @@ describe('InvoiceOut descriptor path', () => { await page.waitForState('ticket.index'); }); - it('should search for tickets with an specific invoiceOut to find no results', async() => { + it('should search now for tickets with an specific invoiceOut to find no results', async() => { await page.doSearch('T2222222'); const nResults = await page.countElement(selectors.ticketsIndex.searchResult); diff --git a/e2e/paths/12-entry/03_latestBuys.spec.js b/e2e/paths/12-entry/03_latestBuys.spec.js new file mode 100644 index 000000000..e3cfadbcc --- /dev/null +++ b/e2e/paths/12-entry/03_latestBuys.spec.js @@ -0,0 +1,46 @@ +import selectors from '../../helpers/selectors.js'; +import getBrowser from '../../helpers/puppeteer'; + +describe('Entry lastest buys path', () => { + let browser; + let page; + + beforeAll(async() => { + browser = await getBrowser(); + page = browser.page; + await page.loginAndModule('buyer', 'entry'); + }); + + afterAll(async() => { + await browser.close(); + }); + + it('should access the latest buys seccion and search not seeing the edit buys button yet', async() => { + await page.waitToClick(selectors.entryLatestBuys.latestBuysSectionButton); + await page.waitFor(250); + await page.keyboard.press('Enter'); + await page.waitForSelector(selectors.entryLatestBuys.editBuysButton, {visible: false}); + }); + + it('should select all lines but one and then check the edit buys button appears', async() => { + await page.waitToClick(selectors.entryLatestBuys.allBuysCheckBox); + await page.waitToClick(selectors.entryLatestBuys.secondBuyCheckBox); + await page.waitForSelector(selectors.entryLatestBuys.editBuysButton, {visible: true}); + }); + + it('should open the edit dialog', async() => { + await page.waitToClick(selectors.entryLatestBuys.editBuysButton); + await page.waitForSelector(selectors.entryLatestBuys.fieldAutocomplete, {visible: true}); + }); + + it('should search for the "Description" field and type a new description for the items in each selected buy', async() => { + await page.autocompleteSearch(selectors.entryLatestBuys.fieldAutocomplete, 'Description'); + await page.write(selectors.entryLatestBuys.newValueInput, 'Crafted item'); + await page.waitToClick(selectors.entryLatestBuys.acceptEditBuysDialog); + }); + + it('should navigate to the entry.buy section by clicking one of the buys', async() => { + await page.waitToClick(selectors.entryLatestBuys.firstBuy); + await page.waitForState('entry.card.buy'); + }); +}); From 742a1c9ea8e7ead19c28cc719d769a4b0e7ec566 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Wed, 2 Sep 2020 09:42:10 +0200 Subject: [PATCH 11/13] removed focus on test --- modules/ticket/front/descriptor/index.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ticket/front/descriptor/index.spec.js b/modules/ticket/front/descriptor/index.spec.js index 4904f2ff1..1a38ed6a9 100644 --- a/modules/ticket/front/descriptor/index.spec.js +++ b/modules/ticket/front/descriptor/index.spec.js @@ -135,7 +135,7 @@ describe('Ticket Component vnTicketDescriptor', () => { }); describe('canStowaway()', () => { - fit('should make a query and return if the ticket can be stowawayed', () => { + it('should make a query and return if the ticket can be stowawayed', () => { controller.canStowaway(); $httpBackend.flush(); From 605fbe799943f9d69a29d7e88e54ae1e290c1f0f Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Wed, 2 Sep 2020 13:09:30 +0200 Subject: [PATCH 12/13] refactor --- front/core/directives/smart-table.js | 3 +- .../back/methods/entry/editLatestBuys.js | 19 ++++++---- .../entry/specs/editLatestBuys.spec.js | 11 +++--- .../front/latest-buys-search-panel/index.js | 2 +- .../latest-buys-search-panel/locale/es.yml | 8 ----- modules/entry/front/latest-buys/index.html | 15 ++++---- modules/entry/front/latest-buys/index.js | 36 +++++++++---------- modules/entry/front/latest-buys/index.spec.js | 13 ++----- modules/entry/front/latest-buys/locale/en.yml | 4 +-- modules/entry/front/latest-buys/locale/es.yml | 7 ++-- modules/item/front/index/index.html | 2 +- modules/route/front/index/index.html | 12 +++---- modules/ticket/front/descriptor/index.spec.js | 13 +++---- 13 files changed, 66 insertions(+), 79 deletions(-) delete mode 100644 modules/entry/front/latest-buys-search-panel/locale/es.yml diff --git a/front/core/directives/smart-table.js b/front/core/directives/smart-table.js index c7072c09e..08d1b6463 100644 --- a/front/core/directives/smart-table.js +++ b/front/core/directives/smart-table.js @@ -4,11 +4,12 @@ import './smart-table.scss'; /** * Directive to hide/show selected columns of a table, don't use with rowspan. + * Property smart-table-ignore ignores one or more vn-th with prop field. */ directive.$inject = ['$http', '$compile', 'vnApp', '$translate']; export function directive($http, $compile, vnApp, $translate) { function getHeaderList($element, $scope) { - let filtrableHeaders = $element[0].querySelectorAll('vn-th[field]'); + let filtrableHeaders = $element[0].querySelectorAll('vn-th[field]:not([smart-table-ignore])'); let headerList = Array.from(filtrableHeaders); let ids = []; let titles = {}; diff --git a/modules/entry/back/methods/entry/editLatestBuys.js b/modules/entry/back/methods/entry/editLatestBuys.js index 68a9b9bb4..bd5358e31 100644 --- a/modules/entry/back/methods/entry/editLatestBuys.js +++ b/modules/entry/back/methods/entry/editLatestBuys.js @@ -3,10 +3,16 @@ module.exports = Self => { description: 'Updates a column for one or more buys', accessType: 'WRITE', accepts: [{ - arg: 'column', - type: 'Object', + arg: 'field', + type: 'String', required: true, - description: `the column to edit and it's new value` + description: `the column to edit` + }, + { + arg: 'newValue', + type: 'Any', + required: true, + description: `The new value to save` }, { arg: 'lines', @@ -24,11 +30,11 @@ module.exports = Self => { } }); - Self.editLatestBuys = async(column, lines) => { + Self.editLatestBuys = async(field, newValue, lines) => { let modelName; let identifier; - switch (column.field) { + switch (field) { case 'size': case 'density': case 'minPrice': @@ -65,8 +71,9 @@ module.exports = Self => { }); let value = {}; - value[column.field] = column.newValue; + value[field] = newValue; + // intentarlo con updateAll for (let target of targets) promises.push(model.upsertWithWhere({id: target}, value, options)); diff --git a/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js b/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js index c82ca036b..5d1bd5a0d 100644 --- a/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js +++ b/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js @@ -11,17 +11,18 @@ describe('Buy editLatestsBuys()', () => { let [original] = await model.latestBuysFilter(ctx); - const column = {field: 'size', newValue: 99}; - const buys = [{itemFk: 1, id: 3}]; + const field = 'size'; + let newValue = 99; + const lines = [{itemFk: original.itemFk, id: original.id}]; - await model.editLatestBuys(column, buys); + await model.editLatestBuys(field, newValue, lines); let [result] = await model.latestBuysFilter(ctx); expect(result.size).toEqual(99); - column.newValue = original.size; - await model.editLatestBuys(column, buys); + newValue = original.size; + await model.editLatestBuys(field, newValue, lines); let [restoredFixture] = await model.latestBuysFilter(ctx); diff --git a/modules/entry/front/latest-buys-search-panel/index.js b/modules/entry/front/latest-buys-search-panel/index.js index 187fe9171..adc95f43d 100644 --- a/modules/entry/front/latest-buys-search-panel/index.js +++ b/modules/entry/front/latest-buys-search-panel/index.js @@ -5,7 +5,7 @@ class Controller extends SearchPanel { constructor($element, $) { super($element, $); let model = 'Item'; - let moreFields = ['id', 'description', 'name']; + let moreFields = ['description', 'name']; let properties; let validations = window.validations; diff --git a/modules/entry/front/latest-buys-search-panel/locale/es.yml b/modules/entry/front/latest-buys-search-panel/locale/es.yml deleted file mode 100644 index 197da0695..000000000 --- a/modules/entry/front/latest-buys-search-panel/locale/es.yml +++ /dev/null @@ -1,8 +0,0 @@ -Ink: Tinta -Origin: Origen -Producer: Productor. -With visible: Con visible -Field: Campo -More fields: Más campos -Add field: Añadir campo -Remove field: Quitar campo \ No newline at end of file diff --git a/modules/entry/front/latest-buys/index.html b/modules/entry/front/latest-buys/index.html index fcdd32f1a..4386971ad 100644 --- a/modules/entry/front/latest-buys/index.html +++ b/modules/entry/front/latest-buys/index.html @@ -24,12 +24,12 @@ vn-smart-table="latestBuys"> - + - Picture + Id Packing Grouping @@ -45,11 +45,11 @@ Quantity Buying value Freight value - Comission value + Commission value Package value Is ignored - price2 - price3 + Grouping price + Packing price Min price Ekt Weight @@ -68,7 +68,7 @@ @@ -145,6 +145,7 @@ @@ -152,8 +153,8 @@ vn-two ng-model="$ctrl.editedColumn.field" data="$ctrl.columns" - show-field="displayName" value-field="field" + show-field="displayName" label="Field to edit"> { - this.$.edit.hide(); this.uncheck(); this.$.model.refresh(); }); - - this.editedColumn = null; } } diff --git a/modules/entry/front/latest-buys/index.spec.js b/modules/entry/front/latest-buys/index.spec.js index ed6d6ca21..658a2dc86 100644 --- a/modules/entry/front/latest-buys/index.spec.js +++ b/modules/entry/front/latest-buys/index.spec.js @@ -65,17 +65,9 @@ describe('Entry', () => { }); describe('onEditAccept()', () => { - it(`should perform a query to update columns and then `, () => { - controller.editedColumn = {someColumnName: 'some Value'}; + it(`should perform a query to update columns`, () => { + controller.editedColumn = {field: 'my field', newValue: 'the new value'}; let query = 'Buys/editLatestBuys'; - controller.$.model.data = [ - {checked: true, id: 1}, - {checked: true, id: 2}, - {checked: true, id: 3}, - {checked: false, id: 4}, - ]; - - expect(controller.editedColumn).toBeDefined(); $httpBackend.expectPOST(query).respond(); controller.onEditAccept(); @@ -84,7 +76,6 @@ describe('Entry', () => { const result = controller.checked; expect(result.length).toEqual(0); - expect(controller.editedColumn).toBeNull(); }); }); }); diff --git a/modules/entry/front/latest-buys/locale/en.yml b/modules/entry/front/latest-buys/locale/en.yml index 43101bc65..4f53d6126 100644 --- a/modules/entry/front/latest-buys/locale/en.yml +++ b/modules/entry/front/latest-buys/locale/en.yml @@ -1,3 +1 @@ -Minimun amount: Minimun purchase quantity -price2: Grouping price -price3: Packing price \ No newline at end of file +Minimun amount: Minimun purchase quantity \ No newline at end of file diff --git a/modules/entry/front/latest-buys/locale/es.yml b/modules/entry/front/latest-buys/locale/es.yml index 5744016b4..7144caa8a 100644 --- a/modules/entry/front/latest-buys/locale/es.yml +++ b/modules/entry/front/latest-buys/locale/es.yml @@ -4,9 +4,10 @@ Freight value: Porte Commission value: Comisión Package value: Embalaje Is ignored: Ignorado -price2: Precio grouping -price3: Precio packing +Grouping price: Precio grouping +Packing price: Precio packing Min price: Precio min Ekt: Ekt Weight: Peso -Minimun amount: Cantidad mínima de compra \ No newline at end of file +Minimun amount: Cantidad mínima de compra +Field to edit: Campo a editar \ No newline at end of file diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html index b34445d36..eaef0f34f 100644 --- a/modules/item/front/index/index.html +++ b/modules/item/front/index/index.html @@ -11,7 +11,7 @@ vn-smart-table="itemIndex"> - + Id Grouping Packing diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html index 909d78249..7258018f1 100644 --- a/modules/route/front/index/index.html +++ b/modules/route/front/index/index.html @@ -14,12 +14,12 @@ Id - Worker - Agency - Vehicle - Date - m³ - Description + Worker + Agency + Vehicle + Date + m³ + Description diff --git a/modules/ticket/front/descriptor/index.spec.js b/modules/ticket/front/descriptor/index.spec.js index 5bdbe3401..a725a2d4a 100644 --- a/modules/ticket/front/descriptor/index.spec.js +++ b/modules/ticket/front/descriptor/index.spec.js @@ -70,7 +70,7 @@ describe('Ticket Component vnTicketDescriptor', () => { window.open = jasmine.createSpy('open'); const params = { - clientId: ticket.client.id, + recipientId: ticket.client.id, ticketId: ticket.id }; controller.showDeliveryNote(); @@ -85,7 +85,7 @@ describe('Ticket Component vnTicketDescriptor', () => { const params = { recipient: ticket.client.email, - clientId: ticket.client.id, + recipientId: ticket.client.id, ticketId: ticket.id }; controller.sendDeliveryNote(); @@ -179,13 +179,10 @@ describe('Ticket Component vnTicketDescriptor', () => { describe('loadData()', () => { it(`should perform a get query to store the ticket data into the controller`, () => { - controller.ticket = null; - - $httpBackend.expectRoute('GET', `Tickets/${ticket.id}`).respond(ticket); - controller.id = ticket.id; + $httpBackend.when('GET', `Tickets/${ticket.id}/isEditable`).respond(); + $httpBackend.expectRoute('GET', `Tickets/${ticket.id}`).respond(); + controller.loadData(); $httpBackend.flush(); - - expect(controller.ticket).toEqual(ticket); }); }); }); From c796132e77aaf9abe72e2e647921ce69c36b90d0 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Wed, 2 Sep 2020 15:20:28 +0200 Subject: [PATCH 13/13] e2e + fixtures amended + refactor --- db/dump/fixtures.sql | 34 +++++++++++----------- e2e/helpers/selectors.js | 24 +++++++-------- e2e/paths/04-item/10_index.spec.js | 1 - modules/entry/front/latest-buys/index.html | 8 ++--- 4 files changed, 33 insertions(+), 34 deletions(-) diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 4dc540955..22fa2076a 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -735,23 +735,23 @@ INSERT INTO `vn`.`intrastat`(`id`, `description`, `taxClassFk`, `taxCodeFk`) INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `isOnOffer`, `expenceFk`, `isBargain`, `comment`, `relevancy`, `image`, `taxClassFk`, `subName`, `minPrice`) VALUES - (1, 2, 70, 'AMA', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 66540, 1, NULL, 0), - (2, 2, 70, 'AZL', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 65540, 1, NULL, 0), - (3, 1, 60, 'AMR', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, 61692, 1, NULL, 0), - (4, 1, 60, 'AMR', 1, 1, 'Increases block', 1, 05080000, 1, 4751000000, 0, NULL, 0, 66090, 2, NULL, 0), - (5, 3, 30, 'GRE', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0), - (6, 5, 30, 'GRE', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0), - (7, 5, 90, 'AZL', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0), - (8, 2, 70, 'AMA', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 66540, 1, NULL, 0), - (9, 2, 70, 'AZL', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 65540, 1, NULL, 0), - (10, 1, 60, 'AMR', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, 61692, 1, NULL, 0), - (11, 1, 60, 'AMR', 1, 1, NULL, 1, 05080000, 1, 4751000000, 0, NULL, 0, 66090, 2, NULL, 0), - (12, 3, 30, 'GRE', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0), - (13, 5, 30, 'GRE', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0), - (14, 5, 90, 'AZL', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0), - (15, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0), - (16, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0), - (71, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0); + (1, 2, 70, 'AMA', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 67, 1, NULL, 0), + (2, 2, 70, 'AZL', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 66, 1, NULL, 0), + (3, 1, 60, 'AMR', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, 65, 1, NULL, 0), + (4, 1, 60, 'AMR', 1, 1, 'Increases block', 1, 05080000, 1, 4751000000, 0, NULL, 0, 69, 2, NULL, 0), + (5, 3, 30, 'GRE', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, 74, 2, NULL, 0), + (6, 5, 30, 'GRE', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 62, 2, NULL, 0), + (7, 5, 90, 'AZL', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 64, 2, NULL, 0), + (8, 2, 70, 'AMA', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 75, 1, NULL, 0), + (9, 2, 70, 'AZL', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, 76, 1, NULL, 0), + (10, 1, 60, 'AMR', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, 77, 1, NULL, 0), + (11, 1, 60, 'AMR', 1, 1, NULL, 1, 05080000, 1, 4751000000, 0, NULL, 0, 78, 2, NULL, 0), + (12, 3, 30, 'GRE', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, 82, 2, NULL, 0), + (13, 5, 30, 'GRE', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 83, 2, NULL, 0), + (14, 5, 90, 'AZL', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 84, 2, NULL, 0), + (15, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0), + (16, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL, 0), + (71, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 1, 4751000000, 0, NULL, 0, 88, 2, NULL, 0); INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `checked`, `workerFk`) VALUES diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 3a48d881e..607ace096 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -225,18 +225,18 @@ export default { firstItemImage: 'vn-item-index vn-tbody > a:nth-child(1) > vn-td:nth-child(1) > img', firstItemImageTd: 'vn-item-index vn-table a:nth-child(1) vn-td:nth-child(1)', firstItemId: 'vn-item-index vn-tbody > a:nth-child(1) > vn-td:nth-child(2)', - idCheckbox: '.vn-popover.shown vn-horizontal:nth-child(2) > vn-check', - stemsCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check', - sizeCheckbox: '.vn-popover.shown vn-horizontal:nth-child(4) > vn-check', - nicheCheckbox: '.vn-popover.shown vn-horizontal:nth-child(5) > vn-check', - typeCheckbox: '.vn-popover.shown vn-horizontal:nth-child(6) > vn-check', - categoryCheckbox: '.vn-popover.shown vn-horizontal:nth-child(7) > vn-check', - intrastadCheckbox: '.vn-popover.shown vn-horizontal:nth-child(8) > vn-check', - originCheckbox: '.vn-popover.shown vn-horizontal:nth-child(9) > vn-check', - buyerCheckbox: '.vn-popover.shown vn-horizontal:nth-child(10) > vn-check', - destinyCheckbox: '.vn-popover.shown vn-horizontal:nth-child(11) > vn-check', - taxClassCheckbox: '.vn-popover.shown vn-horizontal:nth-child(12) > vn-check', - saveFieldsButton: '.vn-popover.shown vn-horizontal:nth-child(16) > vn-button > button' + idCheckbox: '.vn-popover.shown vn-horizontal:nth-child(1) > vn-check', + stemsCheckbox: '.vn-popover.shown vn-horizontal:nth-child(2) > vn-check', + sizeCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check', + nicheCheckbox: '.vn-popover.shown vn-horizontal:nth-child(4) > vn-check', + typeCheckbox: '.vn-popover.shown vn-horizontal:nth-child(5) > vn-check', + categoryCheckbox: '.vn-popover.shown vn-horizontal:nth-child(6) > vn-check', + intrastadCheckbox: '.vn-popover.shown vn-horizontal:nth-child(7) > vn-check', + originCheckbox: '.vn-popover.shown vn-horizontal:nth-child(8) > vn-check', + buyerCheckbox: '.vn-popover.shown vn-horizontal:nth-child(9) > vn-check', + destinyCheckbox: '.vn-popover.shown vn-horizontal:nth-child(10) > vn-check', + taxClassCheckbox: '.vn-popover.shown vn-horizontal:nth-child(11) > vn-check', + saveFieldsButton: '.vn-popover.shown vn-button[label="Save"] > button' }, itemCreateView: { temporalName: 'vn-item-create vn-textfield[ng-model="$ctrl.item.provisionalName"]', diff --git a/e2e/paths/04-item/10_index.spec.js b/e2e/paths/04-item/10_index.spec.js index b4c4b636e..60e807246 100644 --- a/e2e/paths/04-item/10_index.spec.js +++ b/e2e/paths/04-item/10_index.spec.js @@ -55,7 +55,6 @@ describe('Item index path', () => { }); it('should mark all unchecked boxes to leave the index as it was', async() => { - await page.waitFor(3000); // otherwise the snackbar doesnt appear some times. await page.waitToClick(selectors.itemsIndex.fieldsToShowButton); await page.waitToClick(selectors.itemsIndex.idCheckbox); await page.waitToClick(selectors.itemsIndex.stemsCheckbox); diff --git a/modules/entry/front/latest-buys/index.html b/modules/entry/front/latest-buys/index.html index 4386971ad..4aa3aeae2 100644 --- a/modules/entry/front/latest-buys/index.html +++ b/modules/entry/front/latest-buys/index.html @@ -24,13 +24,13 @@ vn-smart-table="latestBuys"> - + - - Id + Picture + Id Packing Grouping Description @@ -89,7 +89,7 @@ {{::buy.grouping | dashIfEmpty}} - + {{::buy.description | dashIfEmpty}} {{::buy.size}}