From ea077e8d4a66896075b4eea105936e4737037b02 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Thu, 17 Sep 2020 20:12:52 +0200 Subject: [PATCH 1/4] added auto-load to some combos --- modules/claim/front/action/index.html | 3 +- modules/claim/front/basic-data/index.html | 7 ++++- .../client/front/address/create/index.html | 28 +++++++++++++------ .../client/front/balance/create/index.html | 16 +++++++++-- modules/client/front/balance/index/index.html | 8 +++++- modules/client/front/basic-data/index.html | 7 ++++- modules/client/front/billing-data/index.html | 7 ++++- modules/client/front/create/index.html | 8 +++++- modules/client/front/dms/create/index.html | 24 ++++++++++++++-- modules/client/front/fiscal-data/index.html | 16 +++++++++-- modules/client/front/greuge/create/index.html | 7 ++++- modules/client/front/sample/create/index.html | 8 +++++- modules/item/front/basic-data/index.html | 9 +++++- modules/item/front/create/index.html | 9 +++++- modules/item/front/diary/index.html | 9 +++++- modules/item/front/niche/index.html | 15 +++++++--- modules/order/front/basic-data/index.html | 4 +-- .../front/basic-data/step-one/index.html | 24 ++++++++++++++-- modules/ticket/front/create/card.html | 8 +++++- modules/ticket/front/dms/create/index.html | 24 ++++++++++++++-- .../ticket/front/request/create/index.html | 8 +++++- modules/ticket/front/services/index.html | 16 +++++++++-- modules/ticket/front/tracking/edit/index.html | 7 ++++- modules/travel/front/basic-data/index.html | 10 +++++-- .../front/thermograph/create/index.html | 24 ++++++++++++++-- modules/zone/front/create/index.html | 16 +++++++++-- modules/zone/front/delivery-days/index.html | 7 ++++- modules/zone/front/warehouses/index.html | 8 +++++- 28 files changed, 284 insertions(+), 53 deletions(-) diff --git a/modules/claim/front/action/index.html b/modules/claim/front/action/index.html index f7a43bd2e..25343b310 100644 --- a/modules/claim/front/action/index.html +++ b/modules/claim/front/action/index.html @@ -7,7 +7,8 @@ auto-save="true" on-save="$ctrl.onSave()"> - diff --git a/modules/claim/front/basic-data/index.html b/modules/claim/front/basic-data/index.html index 710068196..e6c9ec2f9 100644 --- a/modules/claim/front/basic-data/index.html +++ b/modules/claim/front/basic-data/index.html @@ -5,6 +5,11 @@ url="Claims/{{$ctrl.$params.id}}/updateClaim" save="post"> + +
@@ -36,7 +41,7 @@ + auto-load="true" + url="Provinces/location" + data="provincesLocation" + order="id"> + + + + @@ -79,7 +89,7 @@ diff --git a/modules/client/front/balance/create/index.html b/modules/client/front/balance/create/index.html index 6cfdc0666..09adfe912 100644 --- a/modules/client/front/balance/create/index.html +++ b/modules/client/front/balance/create/index.html @@ -2,13 +2,25 @@ New payment + + + + + +
diff --git a/modules/client/front/basic-data/index.html b/modules/client/front/basic-data/index.html index 8c00f7a18..07b24db89 100644 --- a/modules/client/front/basic-data/index.html +++ b/modules/client/front/basic-data/index.html @@ -5,6 +5,11 @@ form="form" save="patch"> + + @@ -60,7 +65,7 @@ diff --git a/modules/client/front/billing-data/index.html b/modules/client/front/billing-data/index.html index ca188955c..0e61f4d16 100644 --- a/modules/client/front/billing-data/index.html +++ b/modules/client/front/billing-data/index.html @@ -5,6 +5,11 @@ form="form" save="patch"> + + @@ -13,7 +18,7 @@ label="Billing data" vn-acl="salesAssistant" ng-model="$ctrl.client.payMethodFk" - url="PayMethods" + data="paymethods" fields="['ibanRequired']" initial-data="$ctrl.client.payMethod"> diff --git a/modules/client/front/create/index.html b/modules/client/front/create/index.html index b2ef42beb..3fe6a8c00 100644 --- a/modules/client/front/create/index.html +++ b/modules/client/front/create/index.html @@ -5,6 +5,12 @@ form="form" save="post"> + + @@ -77,7 +83,7 @@ label="City" ng-model="$ctrl.client.city" selection="$ctrl.town" - url="Towns/location" + data="townsLocation" fields="['id', 'name', 'provinceFk']" show-field="name" value-field="name"> diff --git a/modules/client/front/dms/create/index.html b/modules/client/front/dms/create/index.html index 4ed221ae8..e585dc398 100644 --- a/modules/client/front/dms/create/index.html +++ b/modules/client/front/dms/create/index.html @@ -3,6 +3,24 @@ vn-id="watcher" data="$ctrl.dms"> + + + + + + @@ -30,14 +48,14 @@ diff --git a/modules/client/front/fiscal-data/index.html b/modules/client/front/fiscal-data/index.html index 3fb2563f9..b3789b34a 100644 --- a/modules/client/front/fiscal-data/index.html +++ b/modules/client/front/fiscal-data/index.html @@ -6,6 +6,18 @@ form="form" save="patch"> + + + + @@ -76,7 +88,7 @@ label="Province" ng-model="$ctrl.client.provinceFk" selection="$ctrl.province" - url="Provinces/location" + data="provincesLocation" fields="['id', 'name', 'countryFk']" show-field="name" value-field="id" @@ -85,7 +97,7 @@ + + @@ -32,7 +37,7 @@ diff --git a/modules/client/front/sample/create/index.html b/modules/client/front/sample/create/index.html index 22f95eb20..52518e817 100644 --- a/modules/client/front/sample/create/index.html +++ b/modules/client/front/sample/create/index.html @@ -4,6 +4,12 @@ data="companiesData" order="code"> + + diff --git a/modules/item/front/basic-data/index.html b/modules/item/front/basic-data/index.html index 99146deb0..b6c1e23c8 100644 --- a/modules/item/front/basic-data/index.html +++ b/modules/item/front/basic-data/index.html @@ -9,6 +9,13 @@ form="form" save="patch"> + + @@ -70,7 +77,7 @@ initial-data="$ctrl.item.expense"> + + @@ -49,7 +56,7 @@ + + + + - + vn-acl="buyer,replenisher"> + vn-id="address-model"> + + + + + + @@ -41,7 +59,7 @@ + diff --git a/modules/ticket/front/dms/create/index.html b/modules/ticket/front/dms/create/index.html index 8e6af2b87..54758aa83 100644 --- a/modules/ticket/front/dms/create/index.html +++ b/modules/ticket/front/dms/create/index.html @@ -2,6 +2,24 @@ vn-id="watcher" data="$ctrl.dms"> + + + + + + @@ -29,14 +47,14 @@ diff --git a/modules/ticket/front/request/create/index.html b/modules/ticket/front/request/create/index.html index 46d96ca44..c6ca8d3d9 100644 --- a/modules/ticket/front/request/create/index.html +++ b/modules/ticket/front/request/create/index.html @@ -5,6 +5,12 @@ form="form" save="post"> + +
@@ -19,7 +25,7 @@ + + + + @@ -13,7 +25,7 @@ + + diff --git a/modules/travel/front/basic-data/index.html b/modules/travel/front/basic-data/index.html index 85a5fad2b..7e12949fd 100644 --- a/modules/travel/front/basic-data/index.html +++ b/modules/travel/front/basic-data/index.html @@ -5,6 +5,12 @@ form="form" save="patch"> + + @@ -38,7 +44,7 @@ @@ -46,7 +52,7 @@ diff --git a/modules/travel/front/thermograph/create/index.html b/modules/travel/front/thermograph/create/index.html index 0232c1b12..c965c9867 100644 --- a/modules/travel/front/thermograph/create/index.html +++ b/modules/travel/front/thermograph/create/index.html @@ -2,6 +2,24 @@ vn-id="watcher" data="$ctrl.dms"> + + + + + + @@ -54,14 +72,14 @@ diff --git a/modules/zone/front/create/index.html b/modules/zone/front/create/index.html index 07ac38477..0ecf8646c 100644 --- a/modules/zone/front/create/index.html +++ b/modules/zone/front/create/index.html @@ -5,6 +5,18 @@ form="form" save="post"> + + + + +
diff --git a/modules/zone/front/warehouses/index.html b/modules/zone/front/warehouses/index.html index c22890958..acd85f182 100644 --- a/modules/zone/front/warehouses/index.html +++ b/modules/zone/front/warehouses/index.html @@ -26,13 +26,19 @@ ng-click="$ctrl.onCreate()" fixed-bottom-right> + + From 5d461b119c959c0d255df1b8c852a9ca9d3f777b Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Fri, 18 Sep 2020 11:50:20 +0200 Subject: [PATCH 2/4] tests fix --- e2e/helpers/selectors.js | 2 +- e2e/paths/02-client/14_balance.spec.js | 1 + e2e/paths/04-item/02_basic_data.spec.js | 2 +- modules/client/front/balance/create/index.html | 12 +++--------- modules/ticket/front/request/create/index.html | 8 +------- 5 files changed, 7 insertions(+), 18 deletions(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index e1189ca50..91961c5e3 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -276,7 +276,7 @@ export default { relevancy: 'vn-item-basic-data vn-input-number[ng-model="$ctrl.item.relevancy"]', origin: 'vn-autocomplete[ng-model="$ctrl.item.originFk"]', compression: 'vn-item-basic-data vn-input-number[ng-model="$ctrl.item.compression"]', - isFragile: 'vn-check[label="isFragile"]', + isFragile: 'vn-check[ng-model="$ctrl.item.isFragile"]', longName: 'vn-textfield[ng-model="$ctrl.item.longName"]', isActiveCheckbox: 'vn-check[label="Active"]', priceInKgCheckbox: 'vn-check[label="Price in kg"]', diff --git a/e2e/paths/02-client/14_balance.spec.js b/e2e/paths/02-client/14_balance.spec.js index 6c16d455d..8fb2eb40c 100644 --- a/e2e/paths/02-client/14_balance.spec.js +++ b/e2e/paths/02-client/14_balance.spec.js @@ -45,6 +45,7 @@ describe('Client balance path', () => { }); it('should create a new payment that clears the debt', async() => { + await page.closePopup(); await page.waitToClick(selectors.clientBalance.newPaymentButton); await page.autocompleteSearch(selectors.clientBalance.newPaymentBank, 'Pay on receipt'); await page.waitToClick(selectors.clientBalance.saveButton); diff --git a/e2e/paths/04-item/02_basic_data.spec.js b/e2e/paths/04-item/02_basic_data.spec.js index 836efaa2e..f04031480 100644 --- a/e2e/paths/04-item/02_basic_data.spec.js +++ b/e2e/paths/04-item/02_basic_data.spec.js @@ -113,7 +113,7 @@ describe('Item Edit basic data path', () => { const result = await page .checkboxState(selectors.itemBasicData.isFragile); - expect(result).toBe('unchecked'); + expect(result).toBe('checked'); }); it('should confirm isActive checkbox is unchecked', async() => { diff --git a/modules/client/front/balance/create/index.html b/modules/client/front/balance/create/index.html index 09adfe912..a2775164d 100644 --- a/modules/client/front/balance/create/index.html +++ b/modules/client/front/balance/create/index.html @@ -2,12 +2,6 @@ New payment - - + selection="$ctrl.bankSelection" + order="id"> {{id}}: {{bank}} - -
@@ -25,7 +19,7 @@ Date: Mon, 21 Sep 2020 10:57:59 +0200 Subject: [PATCH 3/4] corrected a typo --- modules/item/front/diary/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/item/front/diary/index.html b/modules/item/front/diary/index.html index 282131599..080cc0f36 100644 --- a/modules/item/front/diary/index.html +++ b/modules/item/front/diary/index.html @@ -8,7 +8,7 @@ @@ -18,7 +18,7 @@ Date: Mon, 21 Sep 2020 11:17:40 +0200 Subject: [PATCH 4/4] removed autoload for where/searchF --- modules/item/front/niche/index.html | 4 ++-- .../front/basic-data/step-one/index.html | 24 +++---------------- modules/zone/front/delivery-days/index.html | 7 +----- 3 files changed, 6 insertions(+), 29 deletions(-) diff --git a/modules/item/front/niche/index.html b/modules/item/front/niche/index.html index e41a6007a..cb616a409 100644 --- a/modules/item/front/niche/index.html +++ b/modules/item/front/niche/index.html @@ -14,7 +14,7 @@ @@ -22,7 +22,7 @@ - - - - - - @@ -59,7 +41,7 @@ -