Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel

back/methods/user-config-view/save.js

@@ -7,8 +7,7 @@ module.exports = function(Self) {
             required: true,
             description: `Code of the table you ask its configuration`,
             http: {source: 'body'}
-        }
+        }],
-        ],
         returns: {
             type: 'object',
             root: true
@@ -29,6 +28,6 @@ module.exports = function(Self) {
 
         config.userFk = ctx.req.accessToken.userId;
 
-        return await Self.app.models.UserConfigView.create(config);
+        return Self.app.models.UserConfigView.create(config);
     };
 };

back/model-config.json

@@ -29,6 +29,9 @@
     "ChatConfig": {
         "dataSource": "vn"
     },
+    "DefaultViewConfig": {
+        "dataSource": "vn"
+    },
     "Delivery": {
         "dataSource": "vn"
     },

back/models/default-view-config.json

@@ -0,0 +1,25 @@
+{
+    "name": "DefaultViewConfig",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "salix.defaultViewConfig"
+        }
+    },
+    "properties": {
+        "tableCode": {
+            "id": true,
+            "type": "string",
+            "required": true
+        },
+        "columns": {
+            "type": "object"
+        }
+    },
+    "acls": [{
+        "accessType": "READ",
+        "principalType": "ROLE",
+        "principalId": "$everyone",
+        "permission": "ALLOW"
+    }]
+}

db/changes/10380-allsaints/00-defaultViewConfig.sql

@@ -0,0 +1,14 @@
+CREATE TABLE `salix`.`defaultViewConfig`
+(
+	tableCode VARCHAR(25) not null,
+	columns JSON not null
+)
+comment 'The default configuration of columns for views';
+
+INSERT INTO `salix`.`defaultViewConfig` (tableCode, columns)
+	VALUES 
+		('itemsIndex', '{"intrastat":false,"stemMultiplier":false,"landed":false}'),
+		('latestBuys', '{"intrastat":false,"description":false,"density":false,"isActive":false,"freightValue":false,"packageValue":false,"isIgnored":false,"price2":false,"minPrice":true,"ektFk":false,"weight":false,"id":true,"packing":true,"grouping":true,"quantity":true,"size":false,"name":true,"code":true,"origin":true,"family":true,"entryFk":true,"buyingValue":true,"comissionValue":false,"price3":true,"packageFk":true,"packingOut":true}'),
+		('ticketsMonitor', '{"id":false}');
+
+		

e2e/helpers/extensions.js

@@ -341,48 +341,32 @@ let actions = {
     },
 
     waitForTextInElement: async function(selector, text) {
-        const expectedText = text.toLowerCase();
+        await this.waitForFunction((selector, text) => {
-        return new Promise((resolve, reject) => {
+            if (document.querySelector(selector)) {
-            let attempts = 0;
+                const innerText = document.querySelector(selector).innerText.toLowerCase();
-            const interval = setInterval(async() => {
+                const expectedText = text.toLowerCase();
-                const currentText = await this.evaluate(selector => {
+                if (innerText.includes(expectedText))
-                    return document.querySelector(selector).innerText.toLowerCase();
+                    return innerText;
-                }, selector);
+            }
-
+        }, {}, selector, text);
-                if (currentText === expectedText || attempts === 40) {
-                    clearInterval(interval);
-                    resolve(currentText);
-                }
-                attempts += 1;
-            }, 100);
-        }).then(result => {
-            return expect(result).toContain(expectedText);
-        });
     },
 
     waitForTextInField: async function(selector, text) {
-        let builtSelector = await this.selectorFormater(selector);
+        const builtSelector = await this.selectorFormater(selector);
-        await this.waitForSelector(builtSelector);
+        const expectedValue = text.toLowerCase();
-        const expectedText = text.toLowerCase();
-        return new Promise((resolve, reject) => {
-            let attempts = 0;
-            const interval = setInterval(async() => {
-                const currentText = await this.evaluate(selector => {
-                    return document.querySelector(selector).value.toLowerCase();
-                }, builtSelector);
 
-                if (currentText === expectedText || attempts === 40) {
+        try {
-                    clearInterval(interval);
+            await this.waitForFunction((selector, text) => {
-                    resolve(currentText);
+                const element = document.querySelector(selector);
+                if (element) {
+                    const value = element.value.toLowerCase();
+                    if (value.includes(text))
+                        return true;
                 }
-                attempts += 1;
+            }, {}, builtSelector, expectedValue);
-            }, 100);
+        } catch (error) {
-        }).then(result => {
+            throw new Error(`${text} wasn't the value of ${builtSelector}, ${error}`);
-            if (result === '')
+        }
-                return expect(result).toEqual(expectedText);
-
-            return expect(result).toContain(expectedText);
-        });
     },
 
     selectorFormater: function(selector) {

e2e/helpers/selectors.js

@@ -313,27 +313,26 @@ export default {
     },
     itemsIndex: {
         createItemButton: `vn-float-button`,
-        firstSearchResult: 'vn-item-index a:nth-child(1)',
+        firstSearchResult: 'vn-item-index tbody tr:nth-child(1)',
-        searchResult: 'vn-item-index a.vn-tr',
+        searchResult: 'vn-item-index tbody tr:not(.empty-rows)',
-        firstResultPreviewButton: 'vn-item-index vn-tbody > :nth-child(1) .buttons > [icon="preview"]',
+        firstResultPreviewButton: 'vn-item-index tbody > :nth-child(1) .buttons > [icon="preview"]',
         searchResultCloneButton: 'vn-item-index .buttons > [icon="icon-clone"]',
         acceptClonationAlertButton: '.vn-confirm.shown [response="accept"]',
         closeItemSummaryPreview: '.vn-popup.shown',
-        fieldsToShowButton: 'vn-item-index vn-table > div > div > vn-icon-button[icon="more_vert"]',
+        shownColumns: 'vn-item-index vn-button[id="shownColumns"]',
-        fieldsToShowForm: '.vn-popover.shown .content',
+        shownColumnsList: '.vn-popover.shown .content',
-        firstItemImage: 'vn-item-index vn-tbody > a:nth-child(1) > vn-td:nth-child(1) > img',
+        firstItemImage: 'vn-item-index tbody > tr:nth-child(1) > td:nth-child(1) > img',
-        firstItemImageTd: 'vn-item-index vn-table a:nth-child(1) vn-td:nth-child(1)',
+        firstItemImageTd: 'vn-item-index smart-table tr:nth-child(1) td:nth-child(1)',
-        firstItemId: 'vn-item-index vn-tbody > a:nth-child(1) > vn-td:nth-child(2)',
+        firstItemId: 'vn-item-index tbody > tr:nth-child(1) > td:nth-child(2)',
-        idCheckbox: '.vn-popover.shown vn-horizontal:nth-child(1) > vn-check',
+        idCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check[label="Identifier"]',
-        stemsCheckbox: '.vn-popover.shown vn-horizontal:nth-child(2) > vn-check',
+        stemsCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check[label="Stems"]',
-        sizeCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check',
+        sizeCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check[label="Size"]',
-        typeCheckbox: '.vn-popover.shown vn-horizontal:nth-child(5) > vn-check',
+        typeCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check[label="Type"]',
-        categoryCheckbox: '.vn-popover.shown vn-horizontal:nth-child(6) > vn-check',
+        categoryCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check[label="Category"]',
-        intrastadCheckbox: '.vn-popover.shown vn-horizontal:nth-child(7) > vn-check',
+        intrastadCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check[label="Intrastat"]',
-        originCheckbox: '.vn-popover.shown vn-horizontal:nth-child(8) > vn-check',
+        originCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check[label="Origin"]',
-        buyerCheckbox: '.vn-popover.shown vn-horizontal:nth-child(9) > vn-check',
+        buyerCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check[label="Buyer"]',
-        destinyCheckbox: '.vn-popover.shown vn-horizontal:nth-child(10) > vn-check',
+        densityCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check[label="Density"]',
-        taxClassCheckbox: '.vn-popover.shown vn-horizontal:nth-child(11) > vn-check',
         saveFieldsButton: '.vn-popover.shown vn-button[label="Save"] > button'
     },
     itemFixedPrice: {
@@ -1087,7 +1086,7 @@ export default {
         allBuyCheckbox: 'vn-entry-buy-index thead vn-check',
         firstBuyCheckbox: 'vn-entry-buy-index tbody:nth-child(2) vn-check',
         deleteBuysButton: 'vn-entry-buy-index vn-button[icon="delete"]',
-        addBuyButton: 'vn-entry-buy-index vn-icon[icon="add_circle"]',
+        addBuyButton: 'vn-entry-buy-index vn-icon[icon="add"]',
         secondBuyPackingPrice: 'vn-entry-buy-index tbody:nth-child(3) > tr:nth-child(1) vn-input-number[ng-model="buy.price3"]',
         secondBuyGroupingPrice: 'vn-entry-buy-index tbody:nth-child(3) > tr:nth-child(1) vn-input-number[ng-model="buy.price2"]',
         secondBuyPrice: 'vn-entry-buy-index tbody:nth-child(3) > tr:nth-child(1) vn-input-number[ng-model="buy.buyingValue"]',
@@ -1109,9 +1108,9 @@ export default {
         importBuysButton: 'vn-entry-buy-import button[type="submit"]'
     },
     entryLatestBuys: {
-        firstBuy: 'vn-entry-latest-buys vn-tbody > a:nth-child(1)',
+        firstBuy: 'vn-entry-latest-buys tbody > tr:nth-child(1)',
-        allBuysCheckBox: 'vn-entry-latest-buys vn-thead vn-check',
+        allBuysCheckBox: 'vn-entry-latest-buys thead vn-check',
-        secondBuyCheckBox: 'vn-entry-latest-buys a:nth-child(2) vn-check[ng-model="buy.checked"]',
+        secondBuyCheckBox: 'vn-entry-latest-buys tbody tr: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"]',

e2e/paths/01-salix/01_login.spec.js

@@ -19,7 +19,9 @@ describe('Login path', async() => {
             const message = await page.waitForSnackbar();
             const state = await page.getState();
 
-            expect(message.text).toContain('Invalid login, remember that distinction is made between uppercase and lowercase');
+            const errorMessage = 'Invalid login, remember that distinction is made between uppercase and lowercase';
+
+            expect(message.text).toContain(errorMessage);
             expect(state).toBe('login');
         });
 
@@ -28,7 +30,9 @@ describe('Login path', async() => {
             const message = await page.waitForSnackbar();
             const state = await page.getState();
 
-            expect(message.text).toContain('Invalid login, remember that distinction is made between uppercase and lowercase');
+            const errorMessage = 'Invalid login, remember that distinction is made between uppercase and lowercase';
+
+            expect(message.text).toContain(errorMessage);
             expect(state).toBe('login');
         });
 

e2e/paths/02-client/03_edit_fiscal_data.spec.js

@@ -112,7 +112,7 @@ describe('Client Edit fiscalData path', () => {
             expect(message.text).toContain('Cannot check Equalization Tax in this NIF/CIF');
         });
 
-        it('should finally edit the fixcal data correctly as VIES isnt checked and fiscal id is valid for EQtax', async() => {
+        it('should edit the fiscal data correctly as VIES isnt checked and fiscal id is valid for EQtax', async() => {
             await page.clearInput(selectors.clientFiscalData.fiscalId);
             await page.write(selectors.clientFiscalData.fiscalId, '94980061C');
             await page.waitToClick(selectors.clientFiscalData.saveButton);

e2e/paths/02-client/04_edit_billing_data.spec.js

@@ -38,10 +38,13 @@ describe('Client Edit billing data path', () => {
         await page.autocompleteSearch(selectors.clientBillingData.newBankEntityCountry, 'España');
         await page.write(selectors.clientBillingData.newBankEntityCode, '9999');
         await page.waitToClick(selectors.clientBillingData.acceptBankEntityButton);
+        const message = await page.waitForSnackbar();
         await page.waitForTextInField(selectors.clientBillingData.swiftBic, 'Gotham City Bank');
         const newcode = await page.waitToGetProperty(selectors.clientBillingData.swiftBic, 'value');
 
         expect(newcode).toEqual('GTHMCT Gotham City Bank');
+
+        expect(message.text).toContain('Data saved!');
     });
 
     it(`should confirm the IBAN pay method was sucessfully saved`, async() => {

e2e/paths/04-item/01_summary.spec.js

@@ -16,13 +16,13 @@ describe('Item summary path', () => {
 
     it('should search for an item', async() => {
         await page.doSearch('Ranged weapon');
-        const nResults = await page.countElement(selectors.itemsIndex.searchResult);
+        const resultsCount = await page.countElement(selectors.itemsIndex.searchResult);
 
         await page.waitForTextInElement(selectors.itemsIndex.searchResult, 'Ranged weapon');
         await page.waitToClick(selectors.itemsIndex.firstResultPreviewButton);
         const isVisible = await page.isVisible(selectors.itemSummary.basicData);
 
-        expect(nResults).toBe(3);
+        expect(resultsCount).toBe(3);
         expect(isVisible).toBeTruthy();
     });
 
@@ -61,12 +61,12 @@ describe('Item summary path', () => {
 
     it('should search for other item', async() => {
         await page.doSearch('Melee Reinforced');
-        const nResults = await page.countElement(selectors.itemsIndex.searchResult);
+        const resultsCount = await page.countElement(selectors.itemsIndex.searchResult);
 
         await page.waitToClick(selectors.itemsIndex.firstResultPreviewButton);
         await page.waitForSelector(selectors.itemSummary.basicData, {visible: true});
 
-        expect(nResults).toBe(2);
+        expect(resultsCount).toBe(2);
     });
 
     it(`should now check the item summary preview shows fields from basic data`, async() => {

e2e/paths/04-item/07_create.spec.js

@@ -0,0 +1,71 @@
+import selectors from '../../helpers/selectors.js';
+import getBrowser from '../../helpers/puppeteer';
+
+describe('Item Create', () => {
+    let browser;
+    let page;
+    beforeAll(async() => {
+        browser = await getBrowser();
+        page = browser.page;
+        await page.loginAndModule('buyer', 'item');
+    });
+
+    afterAll(async() => {
+        await browser.close();
+    });
+
+    it(`should search for the item Infinity Gauntlet to confirm it isn't created yet`, async() => {
+        await page.doSearch('Infinity Gauntlet');
+        const resultsCount = await page.countElement(selectors.itemsIndex.searchResult);
+
+        expect(resultsCount).toEqual(0);
+    });
+
+    it('should access to the create item view by clicking the create floating button', async() => {
+        await page.waitToClick(selectors.itemsIndex.createItemButton);
+        await page.waitForState('item.create');
+    });
+
+    it('should return to the item index by clickig the cancel button', async() => {
+        await page.waitToClick(selectors.itemCreateView.cancelButton);
+        await page.waitForState('item.index');
+    });
+
+    it('should now access to the create item view by clicking the create floating button', async() => {
+        await page.waitToClick(selectors.itemsIndex.createItemButton);
+        await page.waitForState('item.create');
+    });
+
+    it('should create the Infinity Gauntlet item', async() => {
+        await page.write(selectors.itemCreateView.temporalName, 'Infinity Gauntlet');
+        await page.autocompleteSearch(selectors.itemCreateView.type, 'Crisantemo');
+        await page.autocompleteSearch(selectors.itemCreateView.intrastat, 'Coral y materiales similares');
+        await page.autocompleteSearch(selectors.itemCreateView.origin, 'Holand');
+        await page.waitToClick(selectors.itemCreateView.createButton);
+        const message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('Data saved!');
+    });
+
+    it('should confirm Infinity Gauntlet item was created', async() => {
+        let result = await page
+            .waitToGetProperty(selectors.itemBasicData.name, 'value');
+
+        expect(result).toEqual('Infinity Gauntlet');
+
+        result = await page
+            .waitToGetProperty(selectors.itemBasicData.type, 'value');
+
+        expect(result).toEqual('Crisantemo');
+
+        result = await page
+            .waitToGetProperty(selectors.itemBasicData.intrastat, 'value');
+
+        expect(result).toEqual('5080000 Coral y materiales similares');
+
+        result = await page
+            .waitToGetProperty(selectors.itemBasicData.origin, 'value');
+
+        expect(result).toEqual('Holand');
+    });
+});

e2e/paths/04-item/07_create_and_clone.spec.js

@@ -1,105 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Item Create/Clone path', () => {
-    let browser;
-    let page;
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('buyer', 'item');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    describe('create', () => {
-        it(`should search for the item Infinity Gauntlet to confirm it isn't created yet`, async() => {
-            await page.doSearch('Infinity Gauntlet');
-            const nResults = await page.countElement(selectors.itemsIndex.searchResult);
-
-            expect(nResults).toEqual(0);
-        });
-
-        it('should access to the create item view by clicking the create floating button', async() => {
-            await page.waitToClick(selectors.itemsIndex.createItemButton);
-            await page.waitForState('item.create');
-        });
-
-        it('should return to the item index by clickig the cancel button', async() => {
-            await page.waitToClick(selectors.itemCreateView.cancelButton);
-            await page.waitForState('item.index');
-        });
-
-        it('should now access to the create item view by clicking the create floating button', async() => {
-            await page.waitToClick(selectors.itemsIndex.createItemButton);
-            await page.waitForState('item.create');
-        });
-
-        it('should create the Infinity Gauntlet item', async() => {
-            await page.write(selectors.itemCreateView.temporalName, 'Infinity Gauntlet');
-            await page.autocompleteSearch(selectors.itemCreateView.type, 'Crisantemo');
-            await page.autocompleteSearch(selectors.itemCreateView.intrastat, 'Coral y materiales similares');
-            await page.autocompleteSearch(selectors.itemCreateView.origin, 'Holand');
-            await page.waitToClick(selectors.itemCreateView.createButton);
-            const message = await page.waitForSnackbar();
-
-            expect(message.text).toContain('Data saved!');
-        });
-
-        it('should confirm Infinity Gauntlet item was created', async() => {
-            let result = await page
-                .waitToGetProperty(selectors.itemBasicData.name, 'value');
-
-            expect(result).toEqual('Infinity Gauntlet');
-
-            result = await page
-                .waitToGetProperty(selectors.itemBasicData.type, 'value');
-
-            expect(result).toEqual('Crisantemo');
-
-            result = await page
-                .waitToGetProperty(selectors.itemBasicData.intrastat, 'value');
-
-            expect(result).toEqual('5080000 Coral y materiales similares');
-
-            result = await page
-                .waitToGetProperty(selectors.itemBasicData.origin, 'value');
-
-            expect(result).toEqual('Holand');
-        });
-    });
-
-    // Issue #2201
-    // When there is just one result you're redirected automatically to it, so
-    // it's not possible to use the clone option.
-    xdescribe('clone', () => {
-        it('should return to the items index by clicking the return to items button', async() => {
-            await page.waitToClick(selectors.itemBasicData.goToItemIndexButton);
-            await page.waitForSelector(selectors.itemsIndex.createItemButton);
-            await page.waitForState('item.index');
-        });
-
-        it(`should search for the item Infinity Gauntlet`, async() => {
-            await page.doSearch('Infinity Gauntlet');
-            const nResults = await page.countElement(selectors.itemsIndex.searchResult);
-
-            expect(nResults).toEqual(1);
-        });
-
-        it(`should clone the Infinity Gauntlet`, async() => {
-            await page.waitForTextInElement(selectors.itemsIndex.searchResult, 'Infinity Gauntlet');
-            await page.waitToClick(selectors.itemsIndex.searchResultCloneButton);
-            await page.waitToClick(selectors.itemsIndex.acceptClonationAlertButton);
-            await page.waitForState('item.tags');
-        });
-
-        it('should search for the item Infinity Gauntlet and find two', async() => {
-            await page.doSearch('Infinity Gauntlet');
-            const nResults = await page.countElement(selectors.itemsIndex.searchResult);
-
-            expect(nResults).toEqual(2);
-        });
-    });
-});

e2e/paths/04-item/09_index.spec.js

@@ -16,8 +16,8 @@ describe('Item index path', () => {
     });
 
     it('should click on the fields to show button to open the list of columns to show', async() => {
-        await page.waitToClick(selectors.itemsIndex.fieldsToShowButton);
+        await page.waitToClick(selectors.itemsIndex.shownColumns);
-        const visible = await page.isVisible(selectors.itemsIndex.fieldsToShowForm);
+        const visible = await page.isVisible(selectors.itemsIndex.shownColumnsList);
 
         expect(visible).toBeTruthy();
     });
@@ -31,7 +31,7 @@ describe('Item index path', () => {
         await page.waitToClick(selectors.itemsIndex.intrastadCheckbox);
         await page.waitToClick(selectors.itemsIndex.originCheckbox);
         await page.waitToClick(selectors.itemsIndex.buyerCheckbox);
-        await page.waitToClick(selectors.itemsIndex.destinyCheckbox);
+        await page.waitToClick(selectors.itemsIndex.densityCheckbox);
         await page.waitToClick(selectors.itemsIndex.saveFieldsButton);
         const message = await page.waitForSnackbar();
 
@@ -39,6 +39,7 @@ describe('Item index path', () => {
     });
 
     it('should navigate forth and back to see the images column is still visible', async() => {
+        await page.closePopup();
         await page.waitToClick(selectors.itemsIndex.firstSearchResult);
         await page.waitToClick(selectors.itemDescriptor.goBackToModuleIndexButton);
         await page.waitToClick(selectors.globalItems.searchButton);
@@ -54,7 +55,7 @@ describe('Item index path', () => {
     });
 
     it('should mark all unchecked boxes to leave the index as it was', async() => {
-        await page.waitToClick(selectors.itemsIndex.fieldsToShowButton);
+        await page.waitToClick(selectors.itemsIndex.shownColumns);
         await page.waitToClick(selectors.itemsIndex.idCheckbox);
         await page.waitToClick(selectors.itemsIndex.stemsCheckbox);
         await page.waitToClick(selectors.itemsIndex.sizeCheckbox);
@@ -63,7 +64,7 @@ describe('Item index path', () => {
         await page.waitToClick(selectors.itemsIndex.intrastadCheckbox);
         await page.waitToClick(selectors.itemsIndex.originCheckbox);
         await page.waitToClick(selectors.itemsIndex.buyerCheckbox);
-        await page.waitToClick(selectors.itemsIndex.destinyCheckbox);
+        await page.waitToClick(selectors.itemsIndex.densityCheckbox);
         await page.waitToClick(selectors.itemsIndex.saveFieldsButton);
         const message = await page.waitForSnackbar();
 
@@ -71,6 +72,7 @@ describe('Item index path', () => {
     });
 
     it('should now navigate forth and back to see the ids column is now visible', async() => {
+        await page.closePopup();
         await page.waitToClick(selectors.itemsIndex.firstSearchResult);
         await page.waitToClick(selectors.itemDescriptor.goBackToModuleIndexButton);
         await page.waitToClick(selectors.globalItems.searchButton);

e2e/paths/05-ticket/04_packages.spec.js

@@ -62,7 +62,7 @@ describe('Ticket Create packages path', () => {
         expect(result).toEqual('7 : Container medical box 1m');
     });
 
-    it(`should confirm the first quantity is just a number and the string part was ignored by the imput number`, async() => {
+    it(`should confirm quantity is just a number and the string part was ignored by the imput number`, async() => {
         await page.waitForTextInField(selectors.ticketPackages.firstQuantity, '-99');
         const result = await page.waitToGetProperty(selectors.ticketPackages.firstQuantity, 'value');
 

e2e/paths/12-entry/03_latestBuys.spec.js

@@ -31,7 +31,7 @@ describe('Entry lastest buys path', () => {
         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() => {
+    it('should search for the "Description" and type a new one 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);

e2e/paths/12-entry/07_buys.spec.js

@@ -28,7 +28,7 @@ describe('Entry import, create and edit buys path', () => {
         await page.waitForState('entry.card.buy.import');
     });
 
-    it('should fill the form, import the designated JSON file and select items for each import and confirm import', async() => {
+    it('should fill the form, import the a JSON file and select items for each import and confirm import', async() => {
         let currentDir = process.cwd();
         let filePath = `${currentDir}/e2e/assets/07_import_buys.json`;
 
@@ -42,7 +42,8 @@ describe('Entry import, create and edit buys path', () => {
         await page.waitForTextInField(selectors.entryBuys.observation, '729-6340 2846');
 
         await page.autocompleteSearch(selectors.entryBuys.firstImportedItem, 'Ranged Reinforced weapon pistol 9mm');
-        await page.autocompleteSearch(selectors.entryBuys.secondImportedItem, 'Melee Reinforced weapon heavy shield 1x0.5m');
+        const itemName = 'Melee Reinforced weapon heavy shield 1x0.5m';
+        await page.autocompleteSearch(selectors.entryBuys.secondImportedItem, itemName);
         await page.autocompleteSearch(selectors.entryBuys.thirdImportedItem, 'Container medical box 1m');
         await page.autocompleteSearch(selectors.entryBuys.fourthImportedItem, 'Container ammo box 1m');
 
@@ -88,37 +89,37 @@ describe('Entry import, create and edit buys path', () => {
 
     it('should edit the newest buy', async() => {
         await page.clearInput(selectors.entryBuys.secondBuyPackingPrice);
-        await page.waitForTextInField(selectors.entryBuys.secondBuyPackingPrice, '');
+        await page.waitForTimeout(250);
         await page.write(selectors.entryBuys.secondBuyPackingPrice, '100');
         await page.waitForSnackbar();
 
         await page.clearInput(selectors.entryBuys.secondBuyGroupingPrice);
-        await page.waitForTextInField(selectors.entryBuys.secondBuyGroupingPrice, '');
+        await page.waitForTimeout(250);
         await page.write(selectors.entryBuys.secondBuyGroupingPrice, '200');
         await page.waitForSnackbar();
 
         await page.clearInput(selectors.entryBuys.secondBuyPrice);
-        await page.waitForTextInField(selectors.entryBuys.secondBuyPrice, '');
+        await page.waitForTimeout(250);
         await page.write(selectors.entryBuys.secondBuyPrice, '300');
         await page.waitForSnackbar();
 
         await page.clearInput(selectors.entryBuys.secondBuyGrouping);
-        await page.waitForTextInField(selectors.entryBuys.secondBuyGrouping, '');
+        await page.waitForTimeout(250);
         await page.write(selectors.entryBuys.secondBuyGrouping, '400');
         await page.waitForSnackbar();
 
         await page.clearInput(selectors.entryBuys.secondBuyPacking);
-        await page.waitForTextInField(selectors.entryBuys.secondBuyPacking, '');
+        await page.waitForTimeout(250);
         await page.write(selectors.entryBuys.secondBuyPacking, '500');
         await page.waitForSnackbar();
 
         await page.clearInput(selectors.entryBuys.secondBuyWeight);
-        await page.waitForTextInField(selectors.entryBuys.secondBuyWeight, '');
+        await page.waitForTimeout(250);
         await page.write(selectors.entryBuys.secondBuyWeight, '600');
         await page.waitForSnackbar();
 
         await page.clearInput(selectors.entryBuys.secondBuyStickers);
-        await page.waitForTextInField(selectors.entryBuys.secondBuyStickers, '');
+        await page.waitForTimeout(250);
         await page.write(selectors.entryBuys.secondBuyStickers, '700');
         await page.waitForSnackbar();
 
@@ -126,7 +127,7 @@ describe('Entry import, create and edit buys path', () => {
         await page.waitForSnackbar();
 
         await page.clearInput(selectors.entryBuys.secondBuyQuantity);
-        await page.waitForTextInField(selectors.entryBuys.secondBuyQuantity, '');
+        await page.waitForTimeout(250);
         await page.write(selectors.entryBuys.secondBuyQuantity, '800');
     });
 

front/core/components/contextmenu/index.js

@@ -49,7 +49,7 @@ export default class Contextmenu {
     get rowIndex() {
         if (!this.row) return null;
 
-        const table = this.row.closest('vn-table, .vn-table');
+        const table = this.row.closest('table, vn-table, .vn-table');
         const rows = table.querySelectorAll('[ng-repeat]');
 
         return Array.from(rows).findIndex(
@@ -67,13 +67,13 @@ export default class Contextmenu {
     get cell() {
         if (!this.target) return null;
 
-        return this.target.closest('vn-td, .vn-td, vn-td-editable');
+        return this.target.closest('td, vn-td, .vn-td, vn-td-editable');
     }
 
     get cellIndex() {
         if (!this.row) return null;
 
-        const cells = this.row.querySelectorAll('vn-td, .vn-td, vn-td-editable');
+        const cells = this.row.querySelectorAll('td, vn-td, .vn-td, vn-td-editable');
         return Array.from(cells).findIndex(
             cellItem => cellItem == this.cell
         );
@@ -82,8 +82,8 @@ export default class Contextmenu {
     get rowHeader() {
         if (!this.row) return null;
 
-        const table = this.row.closest('vn-table, .vn-table');
+        const table = this.row.closest('table, vn-table, .vn-table');
-        const headerCells = table && table.querySelectorAll('vn-thead vn-th');
+        const headerCells = table && table.querySelectorAll('thead th, vn-thead vn-th');
         const headerCell = headerCells && headerCells[this.cellIndex];
 
         return headerCell;
@@ -147,7 +147,7 @@ export default class Contextmenu {
      */
     isActionAllowed() {
         if (!this.target) return false;
-        const isTableCell = this.target.closest('vn-td, .vn-td');
+        const isTableCell = this.target.closest('td, vn-td, .vn-td');
 
         return isTableCell && this.fieldName;
     }
@@ -172,9 +172,28 @@ export default class Contextmenu {
     excludeSelection() {
         let where = {[this.fieldName]: {neq: this.fieldValue}};
         if (this.exprBuilder) {
-            where = buildFilter(where, (param, value) =>
+            where = {[this.fieldName]: this.fieldValue};
-                this.exprBuilder({param, value})
+            where = buildFilter(where, (param, value) => {
-            );
+                const expr = this.exprBuilder({param, value});
+                const props = Object.keys(expr);
+                let newExpr = {};
+                for (let prop of props) {
+                    if (expr[prop].like) {
+                        const operator = expr[prop].like;
+                        newExpr[prop] = {nlike: operator};
+                    } else if (expr[prop].between) {
+                        const operator = expr[prop].between;
+                        newExpr = {
+                            or: [
+                                {[prop]: {lt: operator[0]}},
+                                {[prop]: {gt: operator[1]}},
+                            ]
+                        };
+                    } else
+                        newExpr[prop] = {neq: this.fieldValue};
+                }
+                return newExpr;
+            });
         }
 
         this.model.addFilter({where});
@@ -208,15 +227,22 @@ export default class Contextmenu {
             if (prop == findProp)
                 delete instance[prop];
 
-            if (prop === 'and') {
+            if (prop === 'and' || prop === 'or') {
-                for (let [index, param] of instance[prop].entries()) {
+                const instanceCopy = instance[prop].slice();
+                for (let param of instanceCopy) {
                     const [key] = Object.keys(param);
+                    const index = instance[prop].findIndex(param => {
+                        return Object.keys(param)[0] == key;
+                    });
                     if (key == findProp)
                         instance[prop].splice(index, 1);
 
                     if (param[key] instanceof Array)
                         removeProp(param, filterKey, key);
                 }
+
+                if (instance[prop].length == 0)
+                    delete instance[prop];
             }
         }
 

front/core/components/index.js

@@ -52,3 +52,4 @@ import './wday-picker';
 import './datalist';
 import './contextmenu';
 import './rating';
+import './smart-table';

front/core/components/multi-check/multi-check.js

@@ -145,9 +145,8 @@ export default class MultiCheck extends FormInput {
     toggle() {
         const data = this.model.data;
         if (!data) return;
-        data.forEach(el => {
+        for (let el of data)
             el[this.checkField] = this.checkAll;
-        });
     }
 }
 
@@ -156,8 +155,9 @@ ngModule.vnComponent('vnMultiCheck', {
     controller: MultiCheck,
     bindings: {
         model: '<',
-        checkField: '<?',
+        checkField: '@?',
         checkAll: '=?',
+        checked: '=?',
         disabled: '<?'
     }
 });

front/core/components/smart-table/index.html

@@ -0,0 +1,102 @@
+<div class="vn-pa-md">
+    <vn-horizontal class="actions">
+        <div class="actions-left">
+            <vn-button icon="view_column"
+                id="shownColumns"
+                ng-if="$ctrl.options.activeButtons.shownColumns"
+                ng-click="smartTableColumns.show($event)"
+                vn-tooltip="Shown columns">
+            </vn-button>
+            <div ng-transclude="actions"></div>
+        </div>
+        <div class="actions-right">
+            <div class="totalRows" ng-if="$ctrl.model.data"> 
+                {{model.data.length}} 
+                <span translate>results</span> 
+            </div>
+            <vn-button icon="search"
+                ng-if="$ctrl.options.activeButtons.search"
+                ng-click="$ctrl.displaySearch()"
+                vn-tooltip="Search">
+            </vn-button>
+            <div class="button-group"
+                ng-if="$ctrl.options.activeButtons.crud">
+                <vn-button icon="add"
+                    ng-click="$ctrl.createRow()"
+                    vn-tooltip="Add new row">
+                </vn-button>
+                <vn-button icon="undo"
+                    ng-click="$ctrl.model.undoChanges()"
+                    vn-tooltip="Undo">
+                </vn-button>
+                <vn-button icon="delete"
+                    ng-click="deleteConfirmation.show($event)"
+                    ng-show="$ctrl.checkedRows.length > 0"
+                    vn-tooltip="Remove selected rows">
+                </vn-button>
+                <vn-button icon="save"
+                    ng-click="$ctrl.saveAll()"
+                    vn-tooltip="Save data">
+                </vn-button>
+            </div>
+            <vn-button icon="refresh"
+                ng-click="$ctrl.model.refresh()"
+                vn-tooltip="Refresh">
+            </vn-button>
+        </div>
+    </vn-horizontal>
+    <div id="table"></div>
+    <vn-pagination
+        ng-if="$ctrl.model"
+        model="$ctrl.model"
+        class="vn-pt-md">
+    </vn-pagination>
+</div>
+
+<vn-confirm
+    vn-id="deleteConfirmation"
+    on-accept="$ctrl.deleteAll()"
+    question="Are you sure you want to continue?"
+    message="Remove selected rows">
+</vn-confirm>
+
+<vn-crud-model
+    ng-if="$ctrl.viewConfigId"
+    vn-id="userViewModel" 
+    url="UserConfigViews"
+    link="{tableCode: $ctrl.viewConfigId, userFk: $ctrl.currentUserId}"
+    data="$ctrl.viewConfig"
+    auto-load="true">
+</vn-crud-model>
+<vn-popover vn-id="smart-table-columns" message="Fields to show">
+    <tpl-body>
+        <div class="smart-table-columns vn-pa-md vn-w-sm">
+            <vn-horizontal>
+                <h6 translate style="margin:0">Shown columns</h6>
+                <vn-icon 
+                    vn-none
+                    icon="info" 
+                    color-marginal
+                    vn-tooltip="Check the columns you want to see"/>
+            </vn-horizontal>
+            <div class="vn-mb-md">
+                <vn-check label="Tick all"
+                    ng-model="$ctrl.checkAll">
+                </vn-check>
+            </div>
+
+            <vn-horizontal class="vn-mb-md">
+                <vn-check ng-repeat="column in $ctrl.columns"
+                    label="{{column.caption}}"
+                    ng-model="$ctrl.viewConfig[0].configuration[column.field]">
+                </vn-check>
+            </vn-horizontal>
+            <vn-horizontal>
+                <vn-button
+                    label="Save"
+                    ng-click="$ctrl.saveViewConfig()">
+                </vn-button>
+            </vn-horizontal>
+        </div>
+    </tpl-body>
+</vn-popover>

front/core/components/smart-table/index.js

@@ -0,0 +1,454 @@
+import ngModule from '../../module';
+import Component from '../../lib/component';
+import {buildFilter} from 'vn-loopback/util/filter';
+import angular from 'angular';
+import {camelToKebab} from '../../lib/string';
+import './style.scss';
+import './table.scss';
+
+export default class SmartTable extends Component {
+    constructor($element, $, $transclude) {
+        super($element, $);
+        this.currentUserId = window.localStorage.currentUserWorkerId;
+        this.$transclude = $transclude;
+        this.sortCriteria = [];
+        this.$inputsScope;
+        this.columns = [];
+        this.autoSave = false;
+        this.transclude();
+    }
+
+    $onDestroy() {
+        const styleElement = document.querySelector('style[id="smart-table"]');
+        if (this.$.css && styleElement)
+            styleElement.parentNode.removeChild(styleElement);
+    }
+
+    get options() {
+        return this._options;
+    }
+
+    set options(options) {
+        this._options = options;
+        if (!options) return;
+
+        const activeButtons = options.activeButtons;
+        const missingId = activeButtons && activeButtons.shownColumns && !this.viewConfigId;
+        if (missingId)
+            throw new Error('vnSmartTable: View identifier not defined');
+    }
+
+    get model() {
+        return this._model;
+    }
+
+    set model(value) {
+        this._model = value;
+        if (value)
+            this.$.model = value;
+    }
+
+    get viewConfigId() {
+        return this._viewConfigId;
+    }
+
+    set viewConfigId(value) {
+        this._viewConfigId = value;
+
+        /*         if (value) {
+            this.defaultViewConfig = {};
+
+            const url = 'DefaultViewConfigs';
+            const filter = {where: {tableCode: value}};
+            this.$http.get(url, {filter})
+                .then(res => {
+                    if (res && res.data.length) {
+                        const columns = res.data[0].columns;
+                        this.defaultViewConfig = columns;
+                    }
+                });
+        } */
+    }
+
+    getDefaultViewConfig() {
+        const url = 'DefaultViewConfigs';
+        const filter = {where: {tableCode: this.viewConfigId}};
+        return this.$http.get(url, {filter})
+            .then(res => {
+                if (res && res.data.length)
+                    return res.data[0].columns;
+            });
+    }
+
+    get viewConfig() {
+        return this._viewConfig;
+    }
+
+    set viewConfig(value) {
+        this._viewConfig = value;
+
+        if (!value) return;
+
+        if (!value.length) {
+            this.getDefaultViewConfig().then(columns => {
+                const defaultViewConfig = columns ? columns : {};
+
+                const userViewModel = this.$.userViewModel;
+                for (const column of this.columns) {
+                    if (defaultViewConfig[column.field] == undefined)
+                        defaultViewConfig[column.field] = true;
+                }
+
+                userViewModel.insert({
+                    userFk: this.currentUserId,
+                    tableConfig: this.viewConfigId,
+                    configuration: defaultViewConfig
+                });
+            }).finally(() => this.applyViewConfig());
+        } else
+            this.applyViewConfig();
+    }
+
+    get checkedRows() {
+        const model = this.model;
+        if (model && model.data)
+            return model.data.filter(row => row.$checked);
+
+        return null;
+    }
+
+    get checkAll() {
+        return this._checkAll;
+    }
+
+    set checkAll(value) {
+        this._checkAll = value;
+        if (value !== undefined) {
+            const shownColumns = this.viewConfig[0].configuration;
+            for (let param in shownColumns)
+                shownColumns[param] = value;
+        }
+    }
+
+    transclude() {
+        const slotTable = this.element.querySelector('#table');
+        this.$transclude($clone => {
+            const table = $clone[0];
+            slotTable.appendChild(table);
+            this.registerColumns();
+            this.emptyDataRows();
+        }, null, 'table');
+    }
+
+    saveViewConfig() {
+        const userViewModel = this.$.userViewModel;
+        const [viewConfig] = userViewModel.data;
+        viewConfig.configuration = Object.assign({}, viewConfig.configuration);
+        userViewModel.save()
+            .then(() => this.vnApp.showSuccess(this.$t('Data saved!')))
+            .then(() => this.applyViewConfig())
+            .then(() => this.$.smartTableColumns.hide());
+    }
+
+    applyViewConfig() {
+        const userViewModel = this.$.userViewModel;
+        const [viewConfig] = userViewModel.data;
+
+        const selectors = [];
+        for (const column of this.columns) {
+            if (viewConfig.configuration[column.field] == false) {
+                const baseSelector = `smart-table[view-config-id="${this.viewConfigId}"] table`;
+                selectors.push(`${baseSelector} thead > tr > th:nth-child(${column.index + 1})`);
+                selectors.push(`${baseSelector} tbody > tr > td:nth-child(${column.index + 1})`);
+            }
+        }
+
+        let styleElement = document.querySelector('style[id="smart-table"]');
+
+        if (styleElement)
+            styleElement.parentNode.removeChild(styleElement);
+
+        if (selectors.length) {
+            const rule = selectors.join(', ') + '{display: none}';
+            this.$.css = document.createElement('style');
+            this.$.css.setAttribute('id', 'smart-table');
+            document.head.appendChild(this.$.css);
+            this.$.css.appendChild(document.createTextNode(rule));
+        }
+    }
+
+    registerColumns() {
+        const header = this.element.querySelector('thead > tr');
+        if (!header) return;
+        const columns = header.querySelectorAll('th');
+
+        // Click handler
+        for (const [index, column] of columns.entries()) {
+            const field = column.getAttribute('field');
+            if (field) {
+                const columnElement = angular.element(column);
+                const caption = columnElement.text().trim();
+
+                this.columns.push({field, caption, index});
+
+                column.addEventListener('click', () => this.orderHandler(column));
+            }
+        }
+    }
+
+    emptyDataRows() {
+        const header = this.element.querySelector('thead > tr');
+        const columns = header.querySelectorAll('th');
+        const tbody = this.element.querySelector('tbody');
+        if (tbody) {
+            const noSearch = this.$compile(`
+                    <tr class="empty-rows" ng-if="!model.data">
+                        <td colspan="${columns.length}" translate>Enter a new search</td>
+                    </tr>
+                `)(this.$);
+            tbody.appendChild(noSearch[0]);
+
+            const noRows = this.$compile(`
+                    <tr class="empty-rows" ng-if="model.data.length == 0">
+                        <td colspan="${columns.length}" translate>No data</td>
+                    </tr>
+                `)(this.$);
+            tbody.appendChild(noRows[0]);
+        }
+    }
+
+    orderHandler(element) {
+        const field = element.getAttribute('field');
+        const existingCriteria = this.sortCriteria.find(criteria => {
+            return criteria.field == field;
+        });
+
+        const isASC = existingCriteria && existingCriteria.sortType == 'ASC';
+        const isDESC = existingCriteria && existingCriteria.sortType == 'DESC';
+
+        if (!existingCriteria) {
+            this.sortCriteria.push({field: field, sortType: 'ASC'});
+            element.classList.remove('desc');
+            element.classList.add('asc');
+        }
+
+        if (isDESC) {
+            this.sortCriteria.splice(this.sortCriteria.findIndex(criteria => {
+                return criteria.field == field;
+            }), 1);
+            element.classList.remove('desc');
+            element.classList.remove('asc');
+        }
+
+        if (isASC) {
+            existingCriteria.sortType = 'DESC';
+            element.classList.remove('asc');
+            element.classList.add('desc');
+        }
+
+        this.applySort();
+    }
+
+    displaySearch() {
+        const header = this.element.querySelector('thead > tr');
+        if (!header) return;
+
+        const tbody = this.element.querySelector('tbody');
+        const columns = header.querySelectorAll('th');
+
+        const hasSearchRow = tbody.querySelector('tr#searchRow');
+        if (hasSearchRow) {
+            if (this.$inputsScope)
+                this.$inputsScope.$destroy();
+
+            return hasSearchRow.remove();
+        }
+
+        const searchRow = document.createElement('tr');
+        searchRow.setAttribute('id', 'searchRow');
+
+        this.$inputsScope = this.$.$new();
+
+        for (let column of columns) {
+            const field = column.getAttribute('field');
+            const cell = document.createElement('td');
+            if (field) {
+                let input;
+                let options;
+                const columnOptions = this.options && this.options.columns;
+
+                if (columnOptions)
+                    options = columnOptions.find(column => column.field == field);
+
+                if (options && options.searchable == false) {
+                    searchRow.appendChild(cell);
+                    continue;
+                }
+
+                if (options && options.autocomplete) {
+                    let props = ``;
+
+                    const autocomplete = options.autocomplete;
+                    for (const prop in autocomplete)
+                        props += `${camelToKebab(prop)}="${autocomplete[prop]}"\n`;
+                    input = this.$compile(`
+                    <vn-autocomplete
+                        class="dense"
+                        name="${field}"
+                        ng-model="searchProps['${field}']"
+                        ${props}
+                        on-change="$ctrl.searchByColumn('${field}')"
+                        clear-disabled="true"
+                    />`)(this.$inputsScope);
+                } else {
+                    input = this.$compile(`
+                        <vn-textfield
+                            class="dense"
+                            name="${field}"
+                            ng-model="searchProps['${field}']"
+                            ng-keydown="$ctrl.searchWithEvent($event, '${field}')"
+                            clear-disabled="true"
+                        />`)(this.$inputsScope);
+                }
+                cell.appendChild(input[0]);
+            }
+            searchRow.appendChild(cell);
+        }
+
+        tbody.prepend(searchRow);
+    }
+
+    searchWithEvent($event, field) {
+        if ($event.key != 'Enter') return;
+
+        this.searchByColumn(field);
+    }
+
+    searchByColumn(field) {
+        const searchCriteria = this.$inputsScope.searchProps[field];
+        const emptySearch = searchCriteria == '' || null;
+
+        const filters = this.filterSanitizer(field);
+
+        if (filters && filters.userFilter)
+            this.model.userFilter = filters.userFilter;
+
+        if (!emptySearch)
+            this.addFilter(field, this.$inputsScope.searchProps[field]);
+        else this.model.refresh();
+    }
+
+    addFilter(field, value) {
+        let where = {[field]: value};
+
+        if (this.exprBuilder) {
+            where = buildFilter(where, (param, value) =>
+                this.exprBuilder({param, value})
+            );
+        }
+
+        this.model.addFilter({where});
+    }
+
+    applySort() {
+        let order = this.sortCriteria.map(criteria => `${criteria.field} ${criteria.sortType}`);
+        order = order.join(', ');
+
+        if (order)
+            this.model.order = order;
+
+        this.model.refresh();
+    }
+
+    filterSanitizer(field) {
+        const userFilter = this.model.userFilter;
+        const userParams = this.model.userParams;
+        const where = userFilter && userFilter.where;
+
+        if (this.exprBuilder) {
+            const param = this.exprBuilder({
+                param: field,
+                value: null
+            });
+            if (param) [field] = Object.keys(param);
+        }
+
+        if (!where) return;
+
+        const whereKeys = Object.keys(where);
+        for (let key of whereKeys) {
+            removeProp(where, field, key);
+
+            if (!Object.keys(where))
+                delete userFilter.where;
+        }
+
+        function removeProp(instance, findProp, prop) {
+            if (prop == findProp)
+                delete instance[prop];
+
+            if (prop === 'and') {
+                for (let [index, param] of instance[prop].entries()) {
+                    const [key] = Object.keys(param);
+                    if (key == findProp)
+                        instance[prop].splice(index, 1);
+
+                    if (param[key] instanceof Array)
+                        removeProp(param, field, key);
+                }
+            }
+        }
+
+        return {userFilter, userParams};
+    }
+
+    removeFilter() {
+        this.model.applyFilter(userFilter, userParams);
+    }
+
+    createRow() {
+        let data = {};
+
+        if (this.defaultNewData)
+            data = this.defaultNewData();
+
+        this.model.insert(data);
+    }
+
+    deleteAll() {
+        for (let row of this.checkedRows)
+            this.model.removeRow(row);
+
+        if (this.autoSave)
+            this.saveAll();
+    }
+
+    saveAll() {
+        const model = this.model;
+
+        if (!model.isChanged)
+            return this.vnApp.showError(this.$t('No changes to save'));
+
+        this.model.save()
+            .then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
+    }
+}
+
+SmartTable.$inject = ['$element', '$scope', '$transclude'];
+
+ngModule.vnComponent('smartTable', {
+    template: require('./index.html'),
+    controller: SmartTable,
+    transclude: {
+        table: '?slotTable',
+        actions: '?slotActions'
+    },
+    bindings: {
+        model: '<?',
+        viewConfigId: '@?',
+        autoSave: '<?',
+        exprBuilder: '&?',
+        defaultNewData: '&?',
+        options: '<?'
+    }
+});

front/core/components/smart-table/locale/es.yml

@@ -0,0 +1,9 @@
+Remove selected rows: Eliminar líneas seleccionadas
+Add new row: Añadir nueva fila
+Undo: Deshacer
+Save data: Guardar datos
+Shown columns: Columnas visibles
+Check the columns you want to see: Marca las columnas que quieres ver
+Showing: Mostrando
+results: resultados
+Tick all: Marcar todas

front/core/components/smart-table/style.scss

@@ -0,0 +1,146 @@
+@import "effects";
+@import "variables";
+
+smart-table {
+    th[field] {
+        overflow: visible;
+        cursor: pointer;
+        align-items: center;
+
+    }
+    th[field][number] {
+        & > :before {
+            vertical-align: middle;
+            font-family: 'Material Icons';
+            content: 'arrow_downward';
+            color: $color-spacer;
+            margin-right: 2px;
+            opacity: 0
+        
+        }
+
+        &.asc > :before, &.desc > :before {
+            color: $color-font;
+            opacity: 1;
+        }
+
+        &.asc > :before {
+            content: 'arrow_upward';
+        }
+
+        &.desc > :before {
+            content: 'arrow_downward';
+        }
+
+        &:hover > :before {
+            opacity: 1;
+        }
+    }
+
+    th[field]:not([number]) {
+        & > :after {
+            vertical-align: middle;
+            font-family: 'Material Icons';
+            content: 'arrow_downward';
+            color: $color-spacer;
+            margin-left: 2px;
+            opacity: 0
+        
+        }
+
+        &.asc > :after, &.desc > :after {
+            color: $color-font;
+            opacity: 1;
+        }
+
+        &.asc > :after {
+            content: 'arrow_upward';
+        }
+
+        &.desc > :after {
+            content: 'arrow_downward';
+        }
+
+        &:hover > :after {
+            opacity: 1;
+        }
+    }
+
+    tr[vn-anchor] {
+        @extend %clickable;
+    }
+
+    .totalRows {
+        color: $color-font-secondary;
+    }
+
+    .actions-left, 
+    .actions-right {
+        display: flex;
+        align-items: center;
+
+        .button-group {
+            display: flex;
+            box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .3);
+
+            & > vn-button {
+                box-shadow: 0 0 0 0
+            }
+        }
+    }
+
+    .actions-left {
+        justify-content: flex-start;
+        
+        slot-actions > vn-button,
+        & > vn-button,
+        .button-group {
+            margin-right: 10px
+        }
+
+        slot-actions {
+            display: flex
+        }
+    }
+
+    .actions-right {
+        justify-content: flex-end;
+        & > vn-button,
+        .button-group {
+            margin-left: 10px
+        }
+    }
+
+    #table {
+        overflow-x: auto;
+        margin-top: 15px
+    }
+
+    vn-tbody a[ng-repeat].vn-tr:focus {
+        background-color: $color-primary-light
+    }
+
+    .new-row {
+        background-color: $color-success-light
+    }
+
+    .changed-row {
+        background-color: $color-primary-light
+    }
+}
+
+.smart-table-columns {
+    h6 {
+        color: $color-font-secondary
+    }
+
+    & > vn-horizontal {
+        align-items: flex-start;
+        flex-wrap: wrap;
+    }
+
+    vn-check {
+        flex: initial;
+        width: 33%
+    }
+}

front/core/components/smart-table/table.scss

@@ -0,0 +1,108 @@
+@import "effects";
+@import "variables";
+
+smart-table table {
+    width: 100%;
+    border-collapse: collapse;
+
+    & > thead {
+        border-bottom: 2px solid $color-spacer;
+
+        & > * > th {
+            font-weight: normal;
+        }
+    }
+    & > tfoot {
+        border-top: 2px solid $color-spacer;
+    }
+    thead, tbody, tfoot {
+        & > * {
+            & > th {
+                color: $color-font-light;
+            }
+            & > th,
+            & > td {
+                overflow: hidden;
+            }
+            & > th,
+            & > td {
+                text-align: left;
+                padding: 9px 5px;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+
+                &[number] {
+                    text-align: right;
+                }
+                &[centered] {
+                    text-align: center;
+                }
+                &[shrink] {
+                    width: 1px;
+                    text-align: center;
+                }
+                &[shrink-date] {
+                    width: 100px;
+                    max-width: 100px;
+                }
+                &[shrink-datetime] {
+                    width: 150px;
+                    max-width: 150px;
+                }
+                &[expand] {
+                    max-width: 400px;
+                    min-width: 0;
+                }
+                &[actions] {
+                    width: 1px;
+
+                    & > * {
+                        vertical-align: middle;
+                    }
+                }
+                vn-icon.bright, i.bright {
+                    color: #f7931e;
+                }
+            }
+        }
+    }
+    tbody > * {
+        border-bottom: 1px solid $color-spacer-light;
+
+        &:last-child {
+            border-bottom: none;
+        }
+        & > td {
+            .chip {
+                padding: 4px;
+                border-radius: 4px;
+                color: $color-font-bg;
+
+                &.notice {
+                    background-color: $color-notice-medium
+                }
+                &.success {
+                    background-color: $color-success-medium;
+                }
+                &.warning {
+                    background-color: $color-main-medium;
+                }
+                &.alert {
+                    background-color: $color-alert-medium;
+                }
+                &.message {
+                    color: $color-font-dark;
+                    background-color: $color-bg-dark
+                }
+            }
+        }
+    }
+    .vn-check {
+        margin: 0;
+    }
+    .empty-rows > td {
+        color: $color-font-secondary;
+        font-size: 1.375rem;
+        text-align: center;
+    }
+}

front/core/directives/index.js

@@ -16,3 +16,4 @@ import './droppable';
 import './http-click';
 import './http-submit';
 import './anchor';
+

front/salix/components/log/index.html

@@ -1,5 +1,11 @@
-<vn-crud-model vn-id="model" url="{{$ctrl.url}}" filter="$ctrl.filter" link="{originFk: $ctrl.originId}"
+<vn-crud-model 
-    data="$ctrl.logs" limit="20" auto-load="true">
+    vn-id="model" 
+    url="{{$ctrl.url}}" 
+    filter="$ctrl.filter" 
+    link="{originFk: $ctrl.originId}"
+    data="$ctrl.logs" 
+    limit="20" 
+    auto-load="true">
 </vn-crud-model>
 <vn-data-viewer model="model" class="vn-w-xl">
     <vn-card>

gulpfile.js

@@ -128,7 +128,8 @@ async function launchBackTest(done) {
     if (err)
         throw err;
 }
-launchBackTest.description = `Runs the backend tests once using a random container, can receive --ci arg to save reports on a xml file`;
+launchBackTest.description = `
+    Runs the backend tests once using a random container, can receive --ci arg to save reports on a xml file`;
 
 // Backend tests
 

modules/entry/front/buy/import/index.spec.js

@@ -63,8 +63,21 @@ describe('Entry', () => {
                         }
                     ]}`;
                 const expectedBuys = [
-                    {'buyingValue': 5.77, 'description': 'Bow', 'grouping': 1, 'packing': 1, 'size': 1, 'volume': 1200},
+                    {
-                    {'buyingValue': 2.16, 'description': 'Arrow', 'grouping': 1, 'packing': 1, 'size': 25, 'volume': 1125}
+                        'buyingValue': 5.77,
+                        'description': 'Bow',
+                        'grouping': 1,
+                        'packing': 1,
+                        'size': 1,
+                        'volume': 1200},
+
+                    {
+                        'buyingValue': 2.16,
+                        'description': 'Arrow',
+                        'grouping': 1,
+                        'packing': 1,
+                        'size': 25,
+                        'volume': 1125}
                 ];
                 controller.fillData(rawData);
                 controller.$.$apply();
@@ -81,8 +94,21 @@ describe('Entry', () => {
         describe('fetchBuys()', () => {
             it(`should perform a query to fetch the buys data`, () => {
                 const buys = [
-                    {'buyingValue': 5.77, 'description': 'Bow', 'grouping': 1, 'packing': 1, 'size': 1, 'volume': 1200},
+                    {
-                    {'buyingValue': 2.16, 'description': 'Arrow', 'grouping': 1, 'packing': 1, 'size': 25, 'volume': 1125}
+                        'buyingValue': 5.77,
+                        'description': 'Bow',
+                        'grouping': 1,
+                        'packing': 1,
+                        'size': 1,
+                        'volume': 1200},
+
+                    {
+                        'buyingValue': 2.16,
+                        'description': 'Arrow',
+                        'grouping': 1,
+                        'packing': 1,
+                        'size': 25,
+                        'volume': 1125}
                 ];
 
                 const serializedParams = $httpParamSerializer({buys});
@@ -105,17 +131,31 @@ describe('Entry', () => {
                     observation: '123456',
                     ref: '1, 2',
                     buys: [
-                        {'buyingValue': 5.77, 'description': 'Bow', 'grouping': 1, 'packing': 1, 'size': 1, 'volume': 1200},
+                        {
-                        {'buyingValue': 2.16, 'description': 'Arrow', 'grouping': 1, 'packing': 1, 'size': 25, 'volume': 1125}
+                            'buyingValue': 5.77,
+                            'description': 'Bow',
+                            'grouping': 1,
+                            'packing': 1,
+                            'size': 1,
+                            'volume': 1200},
+                        {
+                            'buyingValue': 2.16,
+                            'description': 'Arrow',
+                            'grouping': 1,
+                            'packing': 1,
+                            'size': 25,
+                            'volume': 1125}
                     ]
                 };
 
                 controller.onSubmit();
 
-                expect(controller.vnApp.showError).toHaveBeenCalledWith(`Some of the imported buys doesn't have an item`);
+                const message = `Some of the imported buys doesn't have an item`;
+
+                expect(controller.vnApp.showError).toHaveBeenCalledWith(message);
             });
 
-            it(`should perform a query to update columns`, () => {
+            it(`should now perform a query to update columns`, () => {
                 jest.spyOn(controller.vnApp, 'showSuccess');
                 controller.$state.go = jest.fn();
 
@@ -123,8 +163,22 @@ describe('Entry', () => {
                     observation: '123456',
                     ref: '1, 2',
                     buys: [
-                        {'itemFk': 10, 'buyingValue': 5.77, 'description': 'Bow', 'grouping': 1, 'packing': 1, 'size': 1, 'volume': 1200},
+                        {
-                        {'itemFk': 11, 'buyingValue': 2.16, 'description': 'Arrow', 'grouping': 1, 'packing': 1, 'size': 25, 'volume': 1125}
+                            'itemFk': 10,
+                            'buyingValue': 5.77,
+                            'description': 'Bow',
+                            'grouping': 1,
+                            'packing': 1,
+                            'size': 1,
+                            'volume': 1200},
+                        {
+                            'itemFk': 11,
+                            'buyingValue': 2.16,
+                            'description': 'Arrow',
+                            'grouping': 1,
+                            'packing': 1,
+                            'size': 25,
+                            'volume': 1125}
                     ]
                 };
                 const params = controller.import;

modules/entry/front/buy/index/index.html

@@ -188,22 +188,19 @@
                     <tr><td></td></tr>
                 </tbody>
             </table>
-            <div>
-                <vn-icon-button
-                    vn-one
-                    vn-tooltip="Add buy"
-                    vn-bind="+"
-                    icon="add_circle"
-                    ng-click="model.insert({})">
-                </vn-icon-button>
-            </div>
         </div>
     </vn-card>
 </vn-data-viewer>
 <div fixed-bottom-right>
     <vn-vertical style="align-items: center;">
-        <a ui-sref="entry.card.buy.import" 
+        <vn-button class="round md vn-mb-sm"
+            ng-click="model.insert({})"
+            icon="add"
+            vn-tooltip="Add buy"
+            tooltip-position="left"
             vn-bind="+">
+        </vn-button>
+        <a ui-sref="entry.card.buy.import" >
             <vn-button class="round md vn-mb-sm"
                 icon="publish"
                 vn-tooltip="Import buys"

modules/entry/front/latest-buys/index.html

@@ -16,146 +16,203 @@
         auto-state="false">
     </vn-searchbar>
 </vn-portal>
-<vn-data-viewer
+<vn-card>
-    model="model"
+    <smart-table
-    class="vn-mb-xl vn-w-xl">
-    <vn-card>
-    <vn-table
         model="model"
-        show-fields="$ctrl.showFields"
+        view-config-id="latestBuys"
-        vn-smart-table="latestBuys">
+        options="$ctrl.smartTableOptions" 
-        <vn-thead>
+        expr-builder="$ctrl.exprBuilder(param, value)">
-            <vn-tr>
+        <slot-table>
-                <vn-th shrink>
+            <table>
-                    <vn-multi-check
+                <thead>
-                        model="model">
+                    <tr>
-                    </vn-multi-check>
+                        <th shrink>
-                </vn-th>
+                            <vn-multi-check
-                <vn-th field="Image">Picture</vn-th>
+                                checked="$ctrl.checkAll"
-                <vn-th smart-table-ignore field="id">Id</vn-th>
+                                model="model"
-                <vn-th field="packing">Packing</vn-th>
+                                check-field="$checked">
-                <vn-th field="grouping">Grouping</vn-th>
+                            </vn-multi-check>
-                <vn-th field="quantity">Quantity</vn-th>
+                        </th>
-                <vn-th field="description" style="text-align: center">Description</vn-th>
+                        <th translate>Picture</th>
-                <vn-th field="size">Size</vn-th>
+                        <th field="id">
-                <vn-th field="name" style="text-align: center">Tags</vn-th>
+                            <span translate>Identifier</span>
-                <vn-th field="code">Type</vn-th>
+                        </th>
-                <vn-th field="intrastat">Intrastat</vn-th>
+                        <th field="packing" number>
-                <vn-th field="origin">Origin</vn-th>
+                            <span translate>Packing</span>
-                <vn-th field="density">Density</vn-th>
+                        </th>
-                <vn-th field="isActive">Active</vn-th>
+                        <th field="grouping" number>
-                <vn-th field="family">Family</vn-th>
+                            <span translate>Grouping</span>
-                <vn-th field="entryFk">Entry</vn-th>
+                        </th>
-                <vn-th field="buyingValue">Buying value</vn-th>
+                        <th field="quantity" number>
-                <vn-th field="freightValue">Freight value</vn-th>
+                            <span translate>Quantity</span>
-                <vn-th field="comissionValue" expand>Commission value</vn-th>
+                        </th>
-                <vn-th field="packageValue" expand>Package value</vn-th>
+                        <th field="description">
-                <vn-th field="isIgnored">Is ignored</vn-th>
+                            <span translate>Description</span>
-                <vn-th expand field="price2">Grouping price</vn-th>
+                        </th>
-                <vn-th expand field="price3">Packing price</vn-th>
+                        <th field="size">
-                <vn-th field="minPrice">Min price</vn-th>
+                            <span translate>Size</span>
-                <vn-th field="ektFk">Ekt</vn-th>
+                        </th>
-                <vn-th field="weight">Weight</vn-th>
+                        <th field="name">
-                <vn-th field="packageFk" expand>PackageName</vn-th>
+                            <span translate>Tags</span>
-                <vn-th field="packingOut" expand>PackingOut</vn-th>
+                        </th>
-            </vn-tr>
+                        <th field="code">
-        </vn-thead>
+                            <span translate>Type</span>
-        <vn-tbody>
+                        </th>
-            <a ng-repeat="buy in $ctrl.buys" 
+                        <th field="intrastat">
-                class="clickable vn-tr search-result"
+                            <span translate>Intrastat</span>
-                ui-sref="entry.card.buy.index({id: {{::buy.entryFk}}})">
+                        </th>
-                <vn-td shrink>
+                        <th field="origin">
-                    <vn-check 
+                            <span translate>Origin</span>
-                        ng-model="buy.checked"
+                        </th>
-                        vn-click-stop>
+                        <th field="density">
-                    </vn-check>
+                            <span translate>Density</span>
-                </vn-td>
+                        </th>
-                <vn-td shrink >
+                        <th field="isActive">
-                    <img 
+                            <span translate>Active</span>
-                        ng-src="{{::$root.imagePath('catalog', '50x50', buy.itemFk)}}"
+                        </th>
-                        zoom-image="{{::$root.imagePath('catalog', '1600x900', buy.itemFk)}}"
+                        <th field="family">
-                        vn-click-stop
+                            <span translate>Family</span>
-                        on-error-src/>
+                        </th>
-                </vn-td>
+                        <th field="entryFk">
-                <vn-td shrink>
+                            <span translate>Entry</span>
-                    <span
+                        </th>
-                        vn-click-stop="itemDescriptor.show($event, buy.itemFk)"
+                        <th field="buyingValue" number>
-                        class="link">
+                            <span translate>Buying value</span>
-                        {{::buy.itemFk | zeroFill:6}}
+                        </th>
-                    </span>
+                        <th field="freightValue" number>
-                </vn-td>
+                            <span translate>Freight value</span>
-                <vn-td number>
+                        </th>
-                    <vn-chip class="transparent" translate-attr="buy.groupingMode == 2 ? {title: 'Minimun amount'} : {title: 'Packing'}" ng-class="{'message': buy.groupingMode == 2}"> 
+                        <th field="comissionValue" number>
-                        <span translate>{{::buy.packing | dashIfEmpty}}</span>
+                            <span translate>Commission value</span>
-                    </vn-chip>
+                        </th>
-                </vn-td>
+                        <th field="packageValue" number>
-                <vn-td number>
+                            <span translate>Package value</span>
-                    <vn-chip class="transparent" translate-attr="buy.groupingMode == 1 ? {title: 'Minimun amount'} : {title: 'Grouping'}" ng-class="{'message': buy.groupingMode == 1}"> 
+                        </th>
-                        <span translate>{{::buy.grouping | dashIfEmpty}}</span>
+                        <th field="isIgnored">
-                    </vn-chip>
+                            <span translate>Is ignored</span>
-                </vn-td>
+                        </th>
-                <vn-td number>{{::buy.quantity}}</vn-td>
+                        <th field="price2" number>
-                <vn-td vn-two title="{{::buy.description}}">
+                            <span translate>Grouping</span>
-                    {{::buy.description | dashIfEmpty}}
+                        </th>
-                </vn-td>
+                        <th field="price3" number>
-                <vn-td number>{{::buy.size}}</vn-td>
+                            <span translate>Packing</span>
-                <vn-td vn-fetched-tags>
+                        </th>
-                    <div>
+                        <th field="minPrice" number>
-                        <vn-one title="{{::buy.name}}">{{::buy.name}}</vn-one>
+                            <span translate>Min</span>
-                        <vn-one ng-if="::buy.subName">
+                        </th>
-                            <h3 title="{{::buy.subName}}">{{::buy.subName}}</h3>
+                        <th field="ektFk">
-                        </vn-one>
+                            <span translate>Ekt</span>
-                    </div>
+                        </th>
-                    <vn-fetched-tags
+                        <th field="weight">
-                        max-length="6"
+                            <span translate>Weight</span>
-                        item="::buy"
+                        </th>
-                        tabindex="-1">
+                        <th field="packageFk">
-                    </vn-fetched-tags>
+                            <span translate>Package</span>
-                </vn-td>
+                        </th>
-                <vn-td shrink title="{{::buy.type}}">
+                        <th field="packingOut">
-                    {{::buy.code}}
+                            <span translate>Package out</span>
-                </vn-td>
+                        </th>
-                <vn-td shrink title="{{::item.intrastat}}">
+                    </tr>
-                    {{::buy.intrastat}}
+                </thead>
-                </vn-td>
+                <tbody>
-                <vn-td shrink>{{::buy.origin}}</vn-td>
+                    <tr ng-repeat="buy in $ctrl.buys"
-                <vn-td shrink>{{::buy.density}}</vn-td>
+                        vn-anchor="::{
-                <vn-td shrink>
+                            state: 'entry.card.buy.index', 
-                    <vn-check
+                            params: {id: {{::buy.entryFk}}}
-                        disabled="true"
+                        }">
-                        ng-model="::buy.isActive">
+                        <td>
-                    </vn-check> 
+                            <vn-check 
-                </vn-td>
+                                ng-model="buy.$checked"
-                <vn-td shrink>{{::buy.family}}</vn-td>
+                                vn-click-stop>
-                <vn-td shrink>
+                            </vn-check>
-                    <span
+                        </td>
-                        vn-click-stop="entryDescriptor.show($event, buy.entryFk)"
+                        <td >
-                        class="link">
+                            <img 
-                        {{::buy.entryFk}}
+                                ng-src="{{::$root.imagePath('catalog', '50x50', buy.itemFk)}}"
-                    </span>
+                                zoom-image="{{::$root.imagePath('catalog', '1600x900', buy.itemFk)}}"
-                </vn-td>
+                                vn-click-stop
-                <vn-td number>{{::buy.buyingValue | currency: 'EUR':2}}</vn-td>
+                                on-error-src/>
-                <vn-td number>{{::buy.freightValue | currency: 'EUR':2}}</vn-td>
+                        </td>
-                <vn-td number>{{::buy.comissionValue | currency: 'EUR':2}}</vn-td>
+                        <td>
-                <vn-td number>{{::buy.packageValue | currency: 'EUR':2}}</vn-td>
+                            <span
-                <vn-td shrink>
+                                vn-click-stop="itemDescriptor.show($event, buy.itemFk)"
-                    <vn-check
+                                class="link">
-                        disabled="true"
+                                {{::buy.itemFk}}
-                        ng-model="::buy.isIgnored">
+                            </span>
-                    </vn-check> 
+                        </td>
-                </vn-td>
+                        <td number>
-                <vn-td number>{{::buy.price2 | currency: 'EUR':2}}</vn-td>
+                            <vn-chip class="transparent" translate-attr="buy.groupingMode == 2 ? {title: 'Minimun amount'} : {title: 'Packing'}" ng-class="{'message': buy.groupingMode == 2}"> 
-                <vn-td number>{{::buy.price3 | currency: 'EUR':2}}</vn-td>
+                                <span translate>{{::buy.packing | dashIfEmpty}}</span>
-                <vn-td number>{{::buy.minPrice | currency: 'EUR':2}}</vn-td>
+                            </vn-chip>
-                <vn-td number>{{::buy.ektFk | dashIfEmpty}}</vn-td>
+                        </td>
-                <vn-td number>{{::buy.weight}}</vn-td>
+                        <td number>
-                <vn-td number>{{::buy.packageFk}}</vn-td>
+                            <vn-chip class="transparent" translate-attr="buy.groupingMode == 1 ? {title: 'Minimun amount'} : {title: 'Grouping'}" ng-class="{'message': buy.groupingMode == 1}"> 
-                <vn-td number>{{::buy.packingOut}}</vn-td>
+                                <span translate>{{::buy.grouping | dashIfEmpty}}</span>
-            </a>
+                            </vn-chip>
-        </vn-tbody>
+                        </td>
-    </vn-table>
+                        <td number>{{::buy.quantity}}</td>
-    </vn-card>
+                        <td vn-two title="{{::buy.description}}">
-</vn-data-viewer>
+                            {{::buy.description | dashIfEmpty}}
+                        </td>
+                        <td number>{{::buy.size}}</td>
+                        <td vn-fetched-tags>
+                            <div>
+                                <vn-one title="{{::buy.name}}">{{::buy.name}}</vn-one>
+                                <vn-one ng-if="::buy.subName">
+                                    <h3 title="{{::buy.subName}}">{{::buy.subName}}</h3>
+                                </vn-one>
+                            </div>
+                            <vn-fetched-tags
+                                max-length="6"
+                                item="::buy"
+                                tabindex="-1">
+                            </vn-fetched-tags>
+                        </td>
+                        <td title="{{::buy.type}}">
+                            {{::buy.code}}
+                        </td>
+                        <td title="{{::item.intrastat}}">
+                            {{::buy.intrastat}}
+                        </td>
+                        <td>{{::buy.origin}}</td>
+                        <td>{{::buy.density}}</td>
+                        <td>
+                            <vn-check
+                                disabled="true"
+                                ng-model="::buy.isActive">
+                            </vn-check> 
+                        </td>
+                        <td>{{::buy.family}}</td>
+                        <td>
+                            <span
+                                vn-click-stop="entryDescriptor.show($event, buy.entryFk)"
+                                class="link">
+                                {{::buy.entryFk}}
+                            </span>
+                        </td>
+                        <td number>{{::buy.buyingValue | currency: 'EUR':2}}</td>
+                        <td number>{{::buy.freightValue | currency: 'EUR':2}}</td>
+                        <td number>{{::buy.comissionValue | currency: 'EUR':2}}</td>
+                        <td number>{{::buy.packageValue | currency: 'EUR':2}}</td>
+                        <td>
+                            <vn-check
+                                disabled="true"
+                                ng-model="::buy.isIgnored">
+                            </vn-check> 
+                        </td>
+                        <td number>{{::buy.price2 | currency: 'EUR':2}}</td>
+                        <td number>{{::buy.price3 | currency: 'EUR':2}}</td>
+                        <td number>{{::buy.minPrice | currency: 'EUR':2}}</td>
+                        <td>{{::buy.ektFk | dashIfEmpty}}</td>
+                        <td>{{::buy.weight}}</td>
+                        <td>{{::buy.packageFk}}</td>
+                        <td>{{::buy.packingOut}}</td>
+                    </tr>
+                </tbody>
+            </table>
+        </slot-table>
+    </smart-table>
+</vn-card>
 <div fixed-bottom-right>
     <vn-vertical style="align-items: center;">
         <vn-button class="round sm vn-mb-sm"

modules/entry/front/latest-buys/index.js

@@ -5,11 +5,64 @@ import './style.scss';
 export default class Controller extends Section {
     constructor($element, $) {
         super($element, $);
-        this.showFields = {
-            id: false,
-            actions: false
-        };
         this.editedColumn;
+        this.$checkAll = false;
+
+        this.smartTableOptions = {
+            activeButtons: {
+                search: true,
+                shownColumns: true,
+            },
+            columns: [
+                {
+                    field: 'code',
+                    autocomplete: {
+                        url: 'ItemTypes',
+                        showField: 'code',
+                        valueField: 'code',
+                    }
+                },
+                {
+                    field: 'origin',
+                    autocomplete: {
+                        url: 'Origins',
+                        showField: 'code',
+                        valueField: 'code'
+                    }
+                },
+                {
+                    field: 'family',
+                    autocomplete: {
+                        url: 'ItemFamilies',
+                        valueField: 'code',
+                        showField: 'code'
+                    }
+                },
+                {
+                    field: 'intrastat',
+                    autocomplete: {
+                        url: 'Intrastats',
+                        showField: 'description',
+                        valueField: 'description'
+                    }
+                },
+                {
+                    field: 'packageFk',
+                    autocomplete: {
+                        url: 'Packagings',
+                        showField: 'id'
+                    }
+                },
+                {
+                    field: 'isActive',
+                    searchable: false
+                },
+                {
+                    field: 'isIgnored',
+                    searchable: false
+                },
+            ]
+        };
     }
 
     get columns() {
@@ -33,21 +86,54 @@ export default class Controller extends Section {
         const buys = this.$.model.data || [];
         const checkedBuys = [];
         for (let buy of buys) {
-            if (buy.checked)
+            if (buy.$checked)
                 checkedBuys.push(buy);
         }
 
         return checkedBuys;
     }
 
-    uncheck() {
+    exprBuilder(param, value) {
-        const lines = this.checked;
+        switch (param) {
-        for (let line of lines) {
+        case 'id':
-            if (line.checked)
+        case 'size':
-                line.checked = false;
+        case 'density':
+        case 'isActive':
+        case 'family':
+        case 'minPrice':
+        case 'packingOut':
+            return {[`i.${param}`]: value};
+        case 'name':
+        case 'description':
+            return {[`i.${param}`]: {like: `%${value}%`}};
+        case 'code':
+            return {'it.code': value};
+        case 'intrastat':
+            return {'intr.description': value};
+        case 'origin':
+            return {'ori.code': value};
+        case 'packing':
+        case 'grouping':
+        case 'quantity':
+        case 'entryFk':
+        case 'buyingValue':
+        case 'freightValue':
+        case 'comissionValue':
+        case 'packageValue':
+        case 'isIgnored':
+        case 'price2':
+        case 'price3':
+        case 'ektFk':
+        case 'weight':
+        case 'packageFk':
+            return {[`b.${param}`]: value};
         }
     }
 
+    uncheck() {
+        this.checkAll = false;
+    }
+
     get totalChecked() {
         return this.checked.length;
     }
@@ -57,7 +143,7 @@ export default class Controller extends Section {
         for (let row of this.checked)
             rowsToEdit.push({id: row.id, itemFk: row.itemFk});
 
-        let data = {
+        const data = {
             field: this.editedColumn.field,
             newValue: this.editedColumn.newValue,
             lines: rowsToEdit

modules/entry/front/latest-buys/index.spec.js

@@ -7,9 +7,9 @@ describe('Entry', () => {
 
         beforeEach(ngModule('entry'));
 
-        beforeEach(angular.mock.inject(($componentController, $compile, $rootScope, _$httpBackend_) => {
+        beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_) => {
             $httpBackend = _$httpBackend_;
-            let $element = $compile('<vn-entry-latest-buys></vn-entry-latest-buys')($rootScope);
+            const $element = angular.element('<vn-entry-latest-buys></vn-entry-latest-buys');
             controller = $componentController('vnEntryLatestBuys', {$element});
             controller.$ = {
                 model: {refresh: () => {}},
@@ -31,10 +31,10 @@ describe('Entry', () => {
         describe('get checked', () => {
             it(`should return a set of checked lines`, () => {
                 controller.$.model.data = [
-                    {checked: true, id: 1},
+                    {$checked: true, id: 1},
-                    {checked: true, id: 2},
+                    {$checked: true, id: 2},
-                    {checked: true, id: 3},
+                    {$checked: true, id: 3},
-                    {checked: false, id: 4},
+                    {$checked: false, id: 4},
                 ];
 
                 let result = controller.checked;
@@ -43,38 +43,10 @@ describe('Entry', () => {
             });
         });
 
-        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`, () => {
-                $httpBackend.whenGET('UserConfigViews/getConfig?tableCode=latestBuys').respond([]);
-                $httpBackend.whenGET('Buys/latestBuysFilter?filter=%7B%22limit%22:20%7D').respond([
-                    {entryFk: 1},
-                    {entryFk: 2},
-                    {entryFk: 3},
-                    {entryFk: 4}
-                ]);
                 controller.editedColumn = {field: 'my field', newValue: 'the new value'};
-                let query = 'Buys/editLatestBuys';
+                const query = 'Buys/editLatestBuys';
 
                 $httpBackend.expectPOST(query).respond();
                 controller.onEditAccept();

modules/entry/front/latest-buys/locale/es.yml

@@ -14,4 +14,4 @@ Field to edit: Campo a editar
 PackageName: Cubo
 Edit: Editar
 buy(s): compra(s)
-PackingOut: Packing envíos
+Package out: Embalaje envíos

modules/item/back/methods/item/filter.js

@@ -113,7 +113,7 @@ module.exports = Self => {
                 return {'i.typeFk': value};
             case 'categoryFk':
                 return {'ic.id': value};
-            case 'salesPersonFk':
+            case 'buyerFk':
                 return {'it.workerFk': value};
             case 'origin':
                 return {'ori.code': value};

modules/item/back/model-config.json

@@ -23,6 +23,9 @@
     "ItemCategory": {
         "dataSource": "vn"
     },
+    "ItemFamily": {
+        "dataSource": "vn"
+    },
     "ItemLog": {
         "dataSource": "vn"
     },

modules/item/back/models/intrastat.json

@@ -8,12 +8,12 @@
     },
     "properties": {
         "id": {
-            "type": "Number",
+            "type": "number",
             "id": true,
             "description": "Identifier"
         },
         "description": {
-            "type": "String"
+            "type": "string"
         }
     },
     "relations": {

modules/item/back/models/item-category.json

@@ -8,18 +8,18 @@
     },
     "properties": {
         "id": {
-            "type": "Number",
+            "type": "number",
             "id": true,
             "description": "Identifier"
         },
         "name": {
-            "type": "String"
+            "type": "string"
         },
         "display": {
-            "type": "Boolean"
+            "type": "boolean"
         },
         "icon": {
-            "type": "String"
+            "type": "string"
         }
     },
     "relations": {

modules/item/back/models/item-family.json

@@ -0,0 +1,27 @@
+{
+    "name": "ItemFamily",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "itemFamily"
+        }
+    },
+    "properties": {
+        "code": {
+            "type": "string",
+            "id": true,
+            "description": "Identifier"
+        },
+        "description": {
+            "type": "string"
+        }
+    },
+    "acls": [
+      {
+        "accessType": "READ",
+        "principalType": "ROLE",
+        "principalId": "$everyone",
+        "permission": "ALLOW"
+      }
+    ]
+}

modules/item/back/models/item-type.json

@@ -8,21 +8,21 @@
     },
     "properties": {
         "id": {
-            "type": "Number",
+            "type": "number",
             "id": true,
             "description": "Identifier"
         },
         "code": {
-            "type": "String"
+            "type": "string"
         },
         "name": {
-            "type": "String"
+            "type": "string"
         },
         "life": {
-            "type": "Number"
+            "type": "number"
         },
         "isPackaging": {
-            "type": "Boolean"
+            "type": "boolean"
         }
     },
     "relations": {

modules/item/back/models/origin.json

@@ -8,15 +8,15 @@
     },
     "properties": {
         "id": {
-            "type": "Number",
+            "type": "number",
             "id": true,
             "description": "Identifier"
         },
         "code": {
-            "type": "String"
+            "type": "string"
         },
         "name": {
-            "type": "String"
+            "type": "string"
         }
     },
     "acls": [

modules/item/front/fixed-price-search-panel/index.html

@@ -44,7 +44,7 @@
             <vn-autocomplete 
                 vn-one
                 ng-model="filter.buyerFk"
-                url="Workers/activeWithRolee"
+                url="Workers/activeWithRole"
                 show-field="nickname"
                 search-function="{firstName: $search}"
                 value-field="id"

modules/item/front/fixed-price/index.html

@@ -116,7 +116,8 @@
                                 class="dense"
                                 vn-focus
                                 ng-model="price.minPrice"
-                                on-change="$ctrl.upsertPrice(price)">
+                                on-change="$ctrl.upsertPrice(price)"
+                                step="0.01">
                             </vn-input-number>
                         </field>
                     </vn-td-editable>
@@ -140,7 +141,7 @@
                         <vn-icon-button
                             icon="delete"
                             vn-tooltip="Delete"
-                            ng-click="$ctrl.removePrice($index)">
+                            ng-click="deleteFixedPrice.show({$index})">
                         </vn-icon-button>
                     </vn-td>
                 </vn-tr>
@@ -154,9 +155,19 @@
                 ng-click="model.insert()">
             </vn-icon-button>
         </div>
+        <vn-pagination
+            model="model"
+            class="vn-pt-md">
+        </vn-pagination>
     </vn-card>
 </div>
 <vn-item-descriptor-popover
     vn-id="item-descriptor"
     warehouse-fk="$ctrl.vnConfig.warehouseFk">
-</vn-item-descriptor-popover>
+</vn-item-descriptor-popover>
+<vn-confirm
+    vn-id="deleteFixedPrice"
+    on-accept="$ctrl.removePrice($data.$index)"
+    question="Are you sure you want to continue?"
+    message="This row will be removed">
+</vn-confirm>

modules/item/front/fixed-price/locale/es.yml

@@ -1,4 +1,5 @@
 Fixed prices: Precios fijados
 Search prices by item ID or code: Buscar por ID de artículo o código
 Search fixed prices: Buscar precios fijados
-Add fixed price: Añadir precio fijado
+Add fixed price: Añadir precio fijado
+This row will be removed: Esta linea se eliminará

modules/item/front/index/index.html

@@ -1,115 +1,148 @@
 <vn-auto-search
     model="model">
 </vn-auto-search>
-<vn-data-viewer
+<vn-card>
-    model="model"
+    <smart-table 
-    class="vn-w-xl vn-mb-xl">
+        model="model" 
-    <vn-card>
+        view-config-id="itemsIndex" 
-        <vn-table
+        options="$ctrl.smartTableOptions" 
-            model="model"
+        expr-builder="$ctrl.exprBuilder(param, value)">
-            show-fields="$ctrl.showFields"
+        <slot-table>
-            vn-smart-table="itemIndex">
+            <table>
-            <vn-thead>
+                <thead>
-                <vn-tr>
+                    <tr>
-                    <vn-th shrink></vn-th>
+                        <th shrink></th>
-                    <vn-th field="id" shrink>Id</vn-th>
+                        <th field="id">
-                    <vn-th field="grouping" shrink>Grouping</vn-th>
+                            <span translate>Identifier</span>
-                    <vn-th field="packing" shrink>Packing</vn-th>
+                        </th>
-                    <vn-th field="name">Description</vn-th>
+                        <th field="grouping">
-                    <vn-th field="stems" shrink>Stems</vn-th>
+                            <span translate>Grouping</span>
-                    <vn-th field="size" shrink>Size</vn-th>
+                        </th>
-                    <vn-th field="typeFk" shrink>Type</vn-th>
+                        <th field="packing">
-                    <vn-th field="category" shrink>Category</vn-th>
+                            <span translate>Packing</span>
-                    <vn-th field="intrastat" shrink>Intrastat</vn-th>
+                        </th>
-                    <vn-th field="origin" shrink>Origin</vn-th>
+                        <th field="name">
-                    <vn-th field="salesperson" shrink>Buyer</vn-th>
+                            <span translate>Description</span>
-                    <vn-th field="density" shrink>Density</vn-th>
+                        </th>
-                    <vn-th field="stemMultiplier" shrink>Multiplier</vn-th>
+                        <th field="stems">
-                    <vn-th field="active" shrink>Active</vn-th>
+                            <span translate>Stems</span>
-                    <vn-th field="landed" shrink-date>Landed</vn-th>
+                        </th>
-                    <vn-th></vn-th>
+                        <th field="size">
-                </vn-tr>
+                            <span translate>Size</span>
-            </vn-thead>
+                        </th>
-            <vn-tbody>
+                        <th field="typeFk">
-                <a ng-repeat="item in model.data"
+                            <span translate>Type</span>
-                    class="clickable vn-tr search-result"
+                        </th>
-                    ui-sref="item.card.summary({id: item.id})">
+                        <th field="category">
-                    <vn-td shrink>
+                            <span translate>Category</span>
-                        <img 
+                        </th>
-                            ng-src="{{::$root.imagePath('catalog', '50x50', item.id)}}"
+                        <th field="intrastat">
-                            zoom-image="{{::$root.imagePath('catalog', '1600x900', item.id)}}"
+                            <span translate>Intrastat</span>
-                            vn-click-stop
+                        </th>
-                            on-error-src/>
+                        <th field="origin">
-                    </vn-td>
+                            <span translate>Origin</span>
-                    <vn-td shrink>
+                        </th>
-                        <span
+                        <th field="buyerFk">
-                            vn-click-stop="itemDescriptor.show($event, item.id)"
+                            <span translate>Buyer</span>
-                            class="link">
+                        </th>
-                            {{::item.id}}
+                        <th field="density">
-                        </span>
+                            <span translate>Density</span>
-                    </vn-td>
+                        </th>
-                    <vn-td shrink>{{::item.grouping | dashIfEmpty}}</vn-td>
+                        <th field="stemMultiplier">
-                    <vn-td shrink>{{::item.packing | dashIfEmpty}}</vn-td>
+                            <span translate>Multiplier</span>
-                    <vn-td vn-fetched-tags>
+                        </th>
-                        <div>
+                        <th field="active">
-                            <vn-one title="{{::item.name}}">{{::item.name}}</vn-one>
+                            <span translate>Active</span>
-                            <vn-one ng-if="::item.subName">
+                        </th>
-                                <h3 title="{{::item.subName}}">{{::item.subName}}</h3>
+                        <th field="landed">
-                            </vn-one>
+                            <span translate>Landed</span>
-                        </div>
+                        </th>
-                        <vn-fetched-tags
+                        <th></th>
-                            max-length="6"
+                    </tr>
-                            item="item"
+                </thead>
-                            tabindex="-1">
+                <tbody>
-                        </vn-fetched-tags>
+                    <tr ng-repeat="item in model.data"
-                    </vn-td>
+                        vn-anchor="::{
-                    <vn-td shrink>{{::item.stems}}</vn-td>
+                            state: 'item.card.summary', 
-                    <vn-td shrink>{{::item.size}}</vn-td>
+                            params: {id: item.id}
-                    <vn-td shrink title="{{::item.typeName}}">
+                        }">
-                        {{::item.typeName}}
+                        <td>
-                    </vn-td>
+                            <img 
-                    <vn-td shrink title="{{::item.category}}">
+                                ng-src="{{::$root.imagePath('catalog', '50x50', item.id)}}"
-                        {{::item.category}}
+                                zoom-image="{{::$root.imagePath('catalog', '1600x900', item.id)}}"
-                    </vn-td>
+                                vn-click-stop
-                    <vn-td shrink title="{{::item.intrastat}}">
+                                on-error-src/>
-                        {{::item.intrastat}}
+                        </td>
-                    </vn-td>
+                        <td>
-                    <vn-td shrink>{{::item.origin}}</vn-td>
+                            <span
-                    <vn-td shrink title="{{::item.userName}}">
+                                vn-click-stop="itemDescriptor.show($event, item.id)"
-                        <span 
+                                class="link">
-                            class="link" 
+                                {{::item.id}}
-                            vn-click-stop="workerDescriptor.show($event, item.buyerFk)">
+                            </span>
-                            {{::item.userName}}
+                        </td>
-                        </span>
+                        <td>{{::item.grouping | dashIfEmpty}}</td>
-                    </vn-td>
+                        <td>{{::item.packing | dashIfEmpty}}</td>
-                    <vn-td shrink>{{::item.density}}</vn-td>
+                        <td vn-fetched-tags>
-                    <vn-td shrink >{{::item.stemMultiplier}}</vn-td>
+                            <div>
-                    <vn-td shrink>
+                                <vn-one title="{{::item.name}}">{{::item.name}}</vn-one>
-                        <vn-check
+                                <vn-one ng-if="::item.subName">
-                            disabled="true"
+                                    <h3 title="{{::item.subName}}">{{::item.subName}}</h3>
-                            ng-model="::item.isActive">
+                                </vn-one>
-                        </vn-check> 
+                            </div>
-                    </vn-td>
+                            <vn-fetched-tags
-                    <vn-td shrink-date>{{::item.landed | date:'dd/MM/yyyy'}}</vn-td> 
+                                max-length="6"
-                    <vn-td shrink>
+                                item="item"
-                        <vn-horizontal class="buttons">
+                                tabindex="-1">
-                            <vn-icon-button
+                            </vn-fetched-tags>
-                                vn-click-stop="clone.show(item.id)"
+                        </td>
-                                vn-tooltip="Clone"
+                        <td>{{::item.stems}}</td>
-                                icon="icon-clone">
+                        <td>{{::item.size}}</td>
-                            </vn-icon-button>
+                        <td title="{{::item.typeName}}">
-                            <vn-icon-button
+                            {{::item.typeName}}
-                                vn-click-stop="$ctrl.preview(item)"
+                        </td>
-                                vn-tooltip="Preview"
+                        <td title="{{::item.category}}">
-                                icon="preview">
+                            {{::item.category}}
-                            </vn-icon-button>
+                        </td>
-                        </vn-horizontal>
+                        <td title="{{::item.intrastat}}">
-                    </vn-td>
+                            {{::item.intrastat}}
-                </a>
+                        </td>
-            </vn-tbody>
+                        <td>{{::item.origin}}</td>
-        </vn-table>
+                        <td title="{{::item.userName}}">
-    </vn-card>
+                            <span 
-</vn-data-viewer>
+                                class="link" 
+                                vn-click-stop="workerDescriptor.show($event, item.buyerFk)">
+                                {{::item.userName}}
+                            </span>
+                        </td>
+                        <td>{{::item.density}}</td>
+                        <td>{{::item.stemMultiplier}}</td>
+                        <td>
+                            <vn-check
+                                disabled="true"
+                                ng-model="::item.isActive">
+                            </vn-check> 
+                        </td>
+                        <td shrink-date>{{::item.landed | date:'dd/MM/yyyy'}}</td> 
+                        <td>
+                            <vn-horizontal class="buttons">
+                                <vn-icon-button
+                                    vn-click-stop="clone.show(item.id)"
+                                    vn-tooltip="Clone"
+                                    icon="icon-clone">
+                                </vn-icon-button>
+                                <vn-icon-button
+                                    vn-click-stop="$ctrl.preview(item)"
+                                    vn-tooltip="Preview"
+                                    icon="preview">
+                                </vn-icon-button>
+                            </vn-horizontal>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </slot-table>
+    </smart-table>
+</vn-card>
 <a ui-sref="item.create" vn-tooltip="New item" vn-bind="+" fixed-bottom-right>
     <vn-float-button icon="add"></vn-float-button>
 </a>
@@ -133,7 +166,7 @@
 </vn-popup>
 <vn-contextmenu 
     vn-id="contextmenu" 
-    targets="['vn-data-viewer']" 
+    targets="['smart-table']" 
     model="model"
     expr-builder="$ctrl.exprBuilder(param, value)">
         <slot-menu>

modules/item/front/index/index.js

@@ -5,9 +5,61 @@ import './style.scss';
 class Controller extends Section {
     constructor($element, $) {
         super($element, $);
-        this.showFields = {
+
-            id: false,
+        this.smartTableOptions = {
-            actions: false
+            activeButtons: {
+                search: true,
+                shownColumns: true,
+            },
+            columns: [
+                {
+                    field: 'category',
+                    autocomplete: {
+                        url: 'ItemCategories',
+                        valueField: 'name',
+                    }
+                },
+                {
+                    field: 'origin',
+                    autocomplete: {
+                        url: 'Origins',
+                        showField: 'code',
+                        valueField: 'code'
+                    }
+                },
+                {
+                    field: 'typeFk',
+                    autocomplete: {
+                        url: 'ItemTypes',
+                    }
+                },
+                {
+                    field: 'intrastat',
+                    autocomplete: {
+                        url: 'Intrastats',
+                        showField: 'description',
+                        valueField: 'description'
+                    }
+                },
+                {
+                    field: 'buyerFk',
+                    autocomplete: {
+                        url: 'Workers/activeWithRole',
+                        where: `{role: {inq: ['logistic', 'buyer']}}`,
+                        searchFunction: '{firstName: $search}',
+                        showField: 'nickname',
+                        valueField: 'id',
+                    }
+                },
+                {
+                    field: 'active',
+                    searchable: false
+                },
+                {
+                    field: 'landed',
+                    searchable: false
+                },
+            ]
         };
     }
 
@@ -15,7 +67,7 @@ class Controller extends Section {
         switch (param) {
         case 'category':
             return {'ic.name': value};
-        case 'salesPersonFk':
+        case 'buyerFk':
             return {'it.workerFk': value};
         case 'grouping':
             return {'b.grouping': value};
@@ -27,9 +79,10 @@ class Controller extends Section {
             return {'i.typeFk': value};
         case 'intrastat':
             return {'intr.description': value};
+        case 'name':
+            return {'i.name': {like: `%${value}%`}};
         case 'id':
         case 'size':
-        case 'name':
         case 'subname':
         case 'isActive':
         case 'density':

modules/item/front/index/style.scss

@@ -23,7 +23,7 @@ vn-item-product {
     }
 }
 
-vn-table {
+table {
     img {
         border-radius: 50%;
         width: 50px;

modules/item/front/last-entries/index.html

@@ -23,7 +23,6 @@
     </vn-horizontal>
 </vn-card>
 
-
 <vn-data-viewer
     model="model"
     class="vn-mb-xl vn-w-xl vn-pa-md">

modules/monitor/front/index/locale/es.yml

@@ -9,5 +9,6 @@ Minimize/Maximize: Minimizar/Maximizar
 Problems: Problemas
 Theoretical: Teórica
 Practical: Práctica
+Preparation: Preparación
 Auto-refresh: Auto-refresco
 Toggle auto-refresh every 2 minutes: Conmuta el refresco automático cada 2 minutos

modules/monitor/front/index/tickets/index.html

@@ -20,155 +20,187 @@
     <vn-one translate>
         Tickets monitor
     </vn-one> 
-    <vn-none>
+</vn-horizontal>
-        <vn-check
+<vn-card>
+    <smart-table 
+        model="model" 
+        view-config-id="ticketsMonitor" 
+        options="$ctrl.smartTableOptions" 
+        expr-builder="$ctrl.exprBuilder(param, value)">
+        <slot-actions><vn-check
             label="Auto-refresh"
             vn-tooltip="Toggle auto-refresh every 2 minutes"
             on-change="$ctrl.autoRefresh(value)">
-        </vn-check>
+        </vn-check></slot-actions>
-        <vn-icon
+        <slot-table>
-            icon="refresh"
+            <table>
-            vn-tooltip="Refresh"
+                <thead>
-            ng-click="model.refresh()">
+                    <tr>
-        </vn-icon>
+                        <th field="totalProblems" menu-enabled="false">
-    </vn-none>
+                            <span translate>Problems</span>
-</vn-horizontal>
+                        </th>
-<vn-card>
+                        <th field="id">
-    <vn-table model="model">
+                            <span translate>Identifier</span>
-        <vn-thead>
+                        </th>
-            <vn-tr>
+                        <th field="nickname">
-                <vn-th field="totalProblems" menu-enabled="false">Problems</vn-th>
+                            <span translate>Client</span>
-                <vn-th field="nickname">Client</vn-th>
+                        </th>
-                <vn-th field="salesPersonFk" class="expendable" shrink>Salesperson</vn-th>
+                        <th field="salesPersonFk">
-                <vn-th field="shipped" shrink-date>Date</vn-th>
+                            <span translate>Salesperson</span>
-                <vn-th field="preparationHour" filter-enabled="false">Prep.</vn-th>
+                        </th>
-                <vn-th field="theoreticalHour">Theoretical</vn-th>
+                        <th field="shipped" shrink-date>
-                <vn-th field="practicalHour">Practical</vn-th>
+                            <span translate>Date</span>
-                <vn-th field="provinceFk" class="expendable">Province</vn-th>
+                        </th>
-                <vn-th field="stateFk">State</vn-th>
+                        <th field="theoreticalHour">
-                <vn-th field="zoneFk">Zone</vn-th>
+                            <span translate>Theoretical</span>
-                <vn-th field="totalWithVat" shrink>Total</vn-th>
+                        </th>
-                <vn-th></vn-th>
+                        <th field="practicalHour">
-            </vn-tr>
+                            <span translate>Practical</span>
-        </vn-thead>
+                        </th>
-        <vn-tbody>
+                        <th field="preparationHour" filter-enabled="false">
-            <a ng-repeat="ticket in model.data"
+                            <span translate>Preparation</span>
-                class="clickable vn-tr search-result"
+                        </th>
-                ui-sref="ticket.card.summary({id: {{::ticket.id}}})" target="_blank">
+                        <th field="provinceFk">
-                <vn-td expand>
+                            <span translate>Province</span>
-                    <vn-icon
+                        </th>
-                        ng-show="::ticket.isTaxDataChecked === 0"
+                        <th field="stateFk">
-                        translate-attr="{title: 'No verified data'}"
+                            <span translate>State</span>
-                        class="bright"
+                        </th>
-                        icon="icon-no036">
+                        <th field="zoneFk">
-                    </vn-icon>
+                            <span translate>Zone</span>
-                    <vn-icon
+                        </th>
-                        ng-show="::ticket.hasTicketRequest"
+                        <th field="totalWithVat" shrink>
-                        translate-attr="{title: 'Purchase request'}"
+                            <span translate>Total</span>
-                        class="bright"
+                        </th>
-                        icon="icon-100">
+                        <th shrink></th>
-                    </vn-icon>
+                    </tr>
-                    <vn-icon
+                </thead>
-                        ng-show="::ticket.isAvailable === 0"
+                <tbody>
-                        translate-attr="{title: 'Not available'}"
+                    <tr ng-repeat="ticket in model.data"
-                        class="bright"
-                        icon="icon-unavailable">
-                    </vn-icon>
-                    <vn-icon
-                        ng-show="::ticket.isFreezed"
-                        translate-attr="{title: 'Client frozen'}"
-                        class="bright"
-                        icon="icon-frozen">
-                    </vn-icon>
-                    <vn-icon
-                        ng-show="::ticket.risk"
-                        ng-class="::{'highRisk': ticket.hasHighRisk}"
-                        title="{{::$ctrl.$t('Risk')}}: {{ticket.risk}}"
-                        class="bright"
-                        icon="icon-risk">
-                    </vn-icon>
-                    <vn-icon
-                        ng-show="::ticket.hasComponentLack"
-                        translate-attr="{title: 'Component lack'}"
-                        class="bright"
-                        icon="icon-components">
-                    </vn-icon>
-                </vn-td>
-                <vn-td name="nickname">
-                    <span
-                        title="{{::ticket.nickname}}"
-                        vn-click-stop="clientDescriptor.show($event, ticket.clientFk)"
-                        class="link">
-                        {{::ticket.nickname}}
-                    </span>
-                </vn-td>
-                <vn-td class="expendable" shrink>
-                    <span
-                        title="{{::ticket.userName}}"
-                        vn-click-stop="workerDescriptor.show($event, ticket.salesPersonFk)"
-                        class="link">
-                        {{::ticket.userName | dashIfEmpty}}
-                    </span>
-                </vn-td>
-                <vn-td shrink-date>
-                    <span class="chip {{::$ctrl.compareDate(ticket.shipped)}}">
-                        {{::ticket.shipped | date: 'dd/MM/yyyy'}}
-                    </span>
-                </vn-td>
-                <vn-td shrink>{{::ticket.shipped | date: 'HH:mm'}}</vn-td>
-                <vn-td shrink>{{::ticket.zoneLanding | date: 'HH:mm'}}</vn-td>
-                <vn-td shrink>{{::ticket.practicalHour | date: 'HH:mm'}}</vn-td>
-                <vn-td class="expendable">{{::ticket.province}}</vn-td>
-                <vn-td class="expendable">
-                    <span
-                        ng-show="::ticket.refFk"
-                        title="{{::ticket.refFk}}"
-                        vn-click-stop="invoiceOutDescriptor.show($event, ticket.invoiceOutId)"
-                        class="link">
-                        {{::ticket.refFk}}
-                    </span>
-                    <span 
-                        ng-show="::!ticket.refFk"
-                        class="chip {{::$ctrl.stateColor(ticket)}}">
-                        {{::ticket.state}}
-                    </span>
-                </vn-td>
-                <vn-td>
-                    <span
-                        title="{{::ticket.zoneName}}"
-                        vn-click-stop="zoneDescriptor.show($event, ticket.zoneFk)"
-                        class="link">
-                        {{::ticket.zoneName | dashIfEmpty}}
-                    </span>
-                </vn-td>
-                <vn-td shrink>
-                    <span class="chip {{::$ctrl.totalPriceColor(ticket)}}">
-                        {{::(ticket.totalWithVat ? ticket.totalWithVat : 0) | currency: 'EUR': 2}}
-                    </span>
-                </vn-td>
-                <vn-td actions>
-                    <vn-icon-button
                         vn-anchor="::{
-                            state: 'ticket.card.sale', 
+                            state: 'ticket.card.summary', 
-                            params: {id: ticket.id}, 
+                            params: {id: ticket.id},
                             target: '_blank'
-                        }"
+                        }">
-                        vn-tooltip="Go to lines"
+                        <td>
-                        icon="icon-lines">
+                            <vn-icon
-                    </vn-icon-button>
+                                ng-show="::ticket.isTaxDataChecked === 0"
-                    <vn-icon-button
+                                translate-attr="{title: 'No verified data'}"
-                        vn-click-stop="$ctrl.preview(ticket)"
+                                class="bright"
-                        vn-tooltip="Preview"
+                                icon="icon-no036">
-                        icon="preview">
+                            </vn-icon>
-                    </vn-icon-button>
+                            <vn-icon
-                </vn-td>
+                                ng-show="::ticket.hasTicketRequest"
-            </a>
+                                translate-attr="{title: 'Purchase request'}"
-        </vn-tbody>
+                                class="bright"
-    </vn-table>
+                                icon="icon-100">
-    <vn-pagination
+                            </vn-icon>
-        model="model"
+                            <vn-icon
-        class="vn-pt-xs">
+                                ng-show="::ticket.isAvailable === 0"
-    </vn-pagination>
+                                translate-attr="{title: 'Not available'}"
+                                class="bright"
+                                icon="icon-unavailable">
+                            </vn-icon>
+                            <vn-icon
+                                ng-show="::ticket.isFreezed"
+                                translate-attr="{title: 'Client frozen'}"
+                                class="bright"
+                                icon="icon-frozen">
+                            </vn-icon>
+                            <vn-icon
+                                ng-show="::ticket.risk"
+                                ng-class="::{'highRisk': ticket.hasHighRisk}"
+                                title="{{::$ctrl.$t('Risk')}}: {{ticket.risk}}"
+                                class="bright"
+                                icon="icon-risk">
+                            </vn-icon>
+                            <vn-icon
+                                ng-show="::ticket.hasComponentLack"
+                                translate-attr="{title: 'Component lack'}"
+                                class="bright"
+                                icon="icon-components">
+                            </vn-icon>
+                        </td>
+                         <td>
+                            <span
+                                vn-click-stop="ticketDescriptor.show($event, ticket.id)"
+                                class="link">
+                                {{::ticket.id}}
+                            </span>
+                        </td>
+                        <td name="nickname">
+                            <span
+                                title="{{::ticket.nickname}}"
+                                vn-click-stop="clientDescriptor.show($event, ticket.clientFk)"
+                                class="link">
+                                {{::ticket.nickname}}
+                            </span>
+                        </td>
+                        <td>
+                            <span
+                                title="{{::ticket.userName}}"
+                                vn-click-stop="workerDescriptor.show($event, ticket.salesPersonFk)"
+                                class="link">
+                                {{::ticket.userName | dashIfEmpty}}
+                            </span>
+                        </td>
+                        <td>
+                            <span class="chip {{::$ctrl.compareDate(ticket.shipped)}}">
+                                {{::ticket.shipped | date: 'dd/MM/yyyy'}}
+                            </span>
+                        </td>
+                        <td>{{::ticket.zoneLanding | date: 'HH:mm'}}</td>
+                        <td>{{::ticket.practicalHour | date: 'HH:mm'}}</td>
+                        <td>{{::ticket.shipped | date: 'HH:mm'}}</td>
+                        <td>{{::ticket.province}}</td>
+                        <td>
+                            <span
+                                ng-show="::ticket.refFk"
+                                title="{{::ticket.refFk}}"
+                                vn-click-stop="invoiceOutDescriptor.show($event, ticket.invoiceOutId)"
+                                class="link">
+                                {{::ticket.refFk}}
+                            </span>
+                            <span 
+                                ng-show="::!ticket.refFk"
+                                class="chip {{::$ctrl.stateColor(ticket)}}">
+                                {{::ticket.state}}
+                            </span>
+                        </td>
+                        <td>
+                            <span
+                                title="{{::ticket.zoneName}}"
+                                vn-click-stop="zoneDescriptor.show($event, ticket.zoneFk)"
+                                class="link">
+                                {{::ticket.zoneName | dashIfEmpty}}
+                            </span>
+                        </td>
+                        <td number>
+                            <span class="chip {{::$ctrl.totalPriceColor(ticket)}}">
+                                {{::(ticket.totalWithVat ? ticket.totalWithVat : 0) | currency: 'EUR': 2}}
+                            </span>
+                        </td>
+                        <td actions>
+                            <vn-icon-button
+                                vn-anchor="::{
+                                    state: 'ticket.card.sale', 
+                                    params: {id: ticket.id}, 
+                                    target: '_blank'
+                                }"
+                                vn-tooltip="Go to lines"
+                                icon="icon-lines">
+                            </vn-icon-button>
+                            <vn-icon-button
+                                vn-click-stop="$ctrl.preview(ticket)"
+                                vn-tooltip="Preview"
+                                icon="preview">
+                            </vn-icon-button>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </slot-table>
+    </smart-table>
 </vn-card>
 <vn-worker-descriptor-popover 
     vn-id="workerDescriptor">
@@ -185,7 +217,7 @@
         model="model">
     </vn-ticket-summary>
 </vn-popup>
-<vn-contextmenu vn-id="contextmenu" targets="['vn-monitor-sales-tickets vn-table']" model="model"
+<vn-contextmenu vn-id="contextmenu" targets="['vn-monitor-sales-tickets smart-table']" model="model"
     expr-builder="$ctrl.exprBuilder(param, value)">
     <slot-menu>
         <vn-item translate

modules/monitor/front/index/tickets/index.js

@@ -7,6 +7,64 @@ export default class Controller extends Section {
         super($element, $);
 
         this.filterParams = this.fetchParams();
+        this.smartTableOptions = {
+            activeButtons: {
+                search: true,
+                shownColumns: true,
+            },
+            columns: [
+                {
+                    field: 'totalProblems',
+                    searchable: false
+                },
+                {
+                    field: 'salesPersonFk',
+                    autocomplete: {
+                        url: 'Workers/activeWithInheritedRole',
+                        where: `{role: 'salesPerson'}`,
+                        searchFunction: '{firstName: $search}',
+                        showField: 'nickname',
+                        valueField: 'id',
+                    }
+                },
+                {
+                    field: 'provinceFk',
+                    autocomplete: {
+                        url: 'Provinces',
+                    }
+                },
+                {
+                    field: 'stateFk',
+                    autocomplete: {
+                        url: 'States',
+                    }
+                },
+                {
+                    field: 'zoneFk',
+                    autocomplete: {
+                        url: 'Zones',
+                    }
+                },
+                {
+                    field: 'warehouseFk',
+                    autocomplete: {
+                        url: 'Warehouses',
+                    }
+                },
+                {
+                    field: 'shipped',
+                    searchable: false
+                },
+                {
+                    field: 'theoreticalHour',
+                    searchable: false
+                },
+                {
+                    field: 'preparationHour',
+                    searchable: false
+                }
+            ]
+        };
     }
 
     $onInit() {
@@ -93,8 +151,10 @@ export default class Controller extends Section {
             return {'t.shipped': {
                 between: this.dateRange(value)}
             };
-        case 'zoneFk':
         case 'nickname':
+            return {[`t.nickname`]: {like: `%${value}%`}};
+        case 'zoneFk':
+        case 'totalWithVat':
             return {[`t.${param}`]: value};
         }
     }

modules/ticket/back/models/packaging.json

@@ -9,29 +9,29 @@
     "properties": {
       "id": {
         "id": true,
-        "type": "String",
+        "type": "string",
         "description": "Identifier"
       },
       "volume": {
-        "type": "Number"
+        "type": "number"
       },
       "width": {
-        "type": "Date"
+        "type": "date"
       },
       "height": {
-        "type": "Number"
+        "type": "number"
       },
       "depth": {
-        "type": "Number"
+        "type": "number"
       },
       "isPackageReturnable": {
-        "type": "Number"
+        "type": "boolean"
       },
       "created": {
-        "type": "Date"
+        "type": "date"
       },
       "price": {
-        "type": "Number"
+        "type": "number"
       }
     },
     "relations": {

print/core/smtp.js

@@ -24,13 +24,24 @@ module.exports = {
 
             throw err;
         }).finally(async() => {
+            const attachments = [];
+            for (let attachment of options.attachments) {
+                const fileName = attachment.filename;
+                const filePath = attachment.path;
+                // if (fileName.includes('.png')) return;
+
+                if (fileName || filePath)
+                    attachments.push(filePath ? filePath : fileName);
+            }
+            const fileNames = attachments.join(',\n');
             await db.rawSql(`
-                INSERT INTO vn.mail (receiver, replyTo, sent, subject, body, status)
+                INSERT INTO vn.mail (receiver, replyTo, sent, subject, body, attachment, status)
-                    VALUES (?, ?, 1, ?, ?, ?)`, [
+                    VALUES (?, ?, 1, ?, ?, ?, ?)`, [
                 options.to,
                 options.replyTo,
                 options.subject,
                 options.text || options.html,
+                fileNames,
                 error && error.message || 'Sent'
             ]);
         });