Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3339-entry_latest-buys-search-panel

front/core/components/field/style.scss

@@ -71,7 +71,7 @@
                     color: $color-font;
 
                     &::placeholder {
-                        color: $color-font-bg;
+                        color: $color-font-bg-marginal;
                     }
                     &[type=time],
                     &[type=date],

front/core/components/input-number/index.html

@@ -15,6 +15,7 @@
     <div class="icons pre">
         <vn-icon
             icon="clear"
+            ng-show="::$ctrl.clearDisabled != true"
             translate-attr="{title: 'Clear'}"
             ng-click="$ctrl.onClear($event)">
         </vn-icon>

front/core/components/input-number/index.js

@@ -85,6 +85,7 @@ ngModule.vnComponent('vnInputNumber', {
         min: '<?',
         max: '<?',
         step: '<?',
-        displayControls: '<?'
+        displayControls: '<?',
+        clearDisabled: '<?'
     }
 });

modules/client/front/consumption/index.html

@@ -5,7 +5,7 @@
     limit="20"
     user-params="::$ctrl.filterParams"
     data="sales"
-    order="itemTypeFk, itemName, itemSize">
+    order="itemTypeFk, itemName, itemSize, description">
 </vn-crud-model>
 <vn-portal slot="topbar">
     <vn-searchbar
@@ -42,7 +42,7 @@
                     <vn-th field="itemFk" number>Item</vn-th>
                     <vn-th field="ticketFk" number>Ticket</vn-th>
                     <vn-th field="shipped" expand>Fecha</vn-th>
-                    <vn-th expand>Description</vn-th>
+                    <vn-th field="description" expand>Description</vn-th>
                     <vn-th field="quantity" number>Quantity</vn-th>
                 </vn-tr>
             </vn-thead>

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

@@ -109,18 +109,21 @@
                 on-change="itemTag.value = null">
             </vn-autocomplete>
             <vn-textfield
-                ng-show="tag.selection.isFree !== false"
+                ng-show="tag.selection.isFree || tag.selection.isFree == undefined"
                 vn-id="text"
                 label="Value"
                 ng-model="itemTag.value">
             </vn-textfield>
             <vn-autocomplete 
+                vn-one
                 ng-show="tag.selection.isFree === false"
-                url="{{$ctrl.getSourceTable(tag.selection)}}"
+                url="{{'Tags/' + itemTag.tagFk + '/filterValue'}}"
+                search-function="{value: $search}"
                 label="Value"
                 ng-model="itemTag.value"
-                show-field="name"
+                show-field="value"
-                value-field="name">
+                value-field="value"
+                rule>
             </vn-autocomplete>
             <vn-icon-button
                 vn-none

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

@@ -55,21 +55,9 @@ class Controller extends SearchPanel {
         this.$.filter = value;
     }
 
-    getSourceTable(selection) {
-        if (!selection || selection.isFree === true)
-            return null;
-
-        if (selection.sourceTable) {
-            return ''
-                + selection.sourceTable.charAt(0).toUpperCase()
-                + selection.sourceTable.substring(1) + 's';
-        } else if (selection.sourceTable == null)
-            return `ItemTags/filterItemTags/${selection.id}`;
-    }
-
     removeField(index, field) {
         this.fieldFilters.splice(index, 1);
-        this.$.filter[field] = undefined;
+        delete this.$.filter[field];
     }
 }
 

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

@@ -12,33 +12,48 @@ describe('Entry', () => {
             controller = $componentController('vnLatestBuysSearchPanel', {$element});
         }));
 
-        describe('getSourceTable()', () => {
+        describe('filter() setter', () => {
-            it(`should return null if there's no selection`, () => {
+            it(`should set the tags property to the scope filter with an empty array`, () => {
-                let selection = null;
+                const expectedFilter = {
-                let result = controller.getSourceTable(selection);
+                    tags: [{}]
+                };
+                controller.filter = null;
 
-                expect(result).toBeNull();
+                expect(controller.filter).toEqual(expectedFilter);
             });
 
-            it(`should return null if there's a selection but its isFree property is truthy`, () => {
+            it(`should set the tags property to the scope filter with an array of tags`, () => {
-                let selection = {isFree: true};
+                const expectedFilter = {
-                let result = controller.getSourceTable(selection);
+                    description: 'My item',
+                    tags: [{}]
+                };
+                const expectedFieldFilter = [{
+                    info: {
+                        label: 'description',
+                        name: 'description',
+                        type: null
+                    },
+                    name: 'description',
+                    value: 'My item'
+                }];
+                controller.filter = {
+                    description: 'My item'
+                };
 
-                expect(result).toBeNull();
+                expect(controller.filter).toEqual(expectedFilter);
+                expect(controller.fieldFilters).toEqual(expectedFieldFilter);
+            });
         });
 
-            it(`should return the formated sourceTable concatenated to a path`, () => {
+        describe('removeField()', () => {
-                let selection = {sourceTable: 'hello guy'};
+            it(`should remove the description property from the fieldFilters and from the scope filter`, () => {
-                let result = controller.getSourceTable(selection);
+                const expectedFilter = {tags: [{}]};
+                controller.filter = {description: 'My item'};
 
-                expect(result).toEqual('Hello guys');
+                controller.removeField(0, 'description');
-            });
 
-            it(`should return a path if there's no sourceTable and the selection has an id`, () => {
+                expect(controller.filter).toEqual(expectedFilter);
-                let selection = {id: 99};
+                expect(controller.fieldFilters).toEqual([]);
-                let result = controller.getSourceTable(selection);
-
-                expect(result).toEqual(`ItemTags/filterItemTags/${selection.id}`);
             });
         });
     });

modules/item/back/methods/tag/filterValue.js

@@ -47,9 +47,14 @@ module.exports = Self => {
         const where = filter.where;
         if (where && where.value) {
             stmt.merge(conn.makeWhere({value: {like: `%${where.value}%`}}));
-            stmt.merge(`
+
-                ORDER BY value LIKE '${where.value}' DESC, 
+            const orderStmt = new ParameterizedSQL(
-                    value LIKE '${where.value}%' DESC`);
+                `ORDER BY value LIKE ? DESC, 
+                    value LIKE ? DESC`, [
+                    where.value,
+                    `${where.value}%`
+                ]);
+            ParameterizedSQL.append(stmt, orderStmt);
         }
 
         stmt.merge(conn.makeLimit(filter));

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

@@ -83,7 +83,7 @@
             </vn-autocomplete>
             <vn-textfield
                 vn-one
-                ng-show="tag.selection.isFree !== false"
+                ng-show="tag.selection.isFree || tag.selection.isFree == undefined"
                 vn-id="text"
                 label="Value"
                 ng-model="itemTag.value">
@@ -91,11 +91,13 @@
             <vn-autocomplete 
                 vn-one
                 ng-show="tag.selection.isFree === false"
-                url="{{$ctrl.getSourceTable(tag.selection)}}"
+                url="{{'Tags/' + itemTag.tagFk + '/filterValue'}}"
+                search-function="{value: $search}"
                 label="Value"
                 ng-model="itemTag.value"
-                show-field="name"
+                show-field="value"
-                value-field="name">
+                value-field="value"
+                rule>
             </vn-autocomplete>
             <vn-icon-button
                 vn-none

modules/item/front/search-panel/index.js

@@ -55,21 +55,9 @@ class Controller extends SearchPanel {
         this.$.filter = value;
     }
 
-    getSourceTable(selection) {
-        if (!selection || selection.isFree === true)
-            return null;
-
-        if (selection.sourceTable) {
-            return ''
-                + selection.sourceTable.charAt(0).toUpperCase()
-                + selection.sourceTable.substring(1) + 's';
-        } else if (selection.sourceTable == null)
-            return `ItemTags/filterItemTags/${selection.id}`;
-    }
-
     removeField(index, field) {
         this.fieldFilters.splice(index, 1);
-        this.$.filter[field] = undefined;
+        delete this.$.filter[field];
     }
 }
 

modules/item/front/search-panel/index.spec.js

@@ -12,33 +12,48 @@ describe('Item', () => {
             controller = $componentController('vnItemSearchPanel', {$element});
         }));
 
-        describe('getSourceTable()', () => {
+        describe('filter() setter', () => {
-            it(`should return null if there's no selection`, () => {
+            it(`should set the tags property to the scope filter with an empty array`, () => {
-                let selection = null;
+                const expectedFilter = {
-                let result = controller.getSourceTable(selection);
+                    tags: [{}]
+                };
+                controller.filter = null;
 
-                expect(result).toBeNull();
+                expect(controller.filter).toEqual(expectedFilter);
             });
 
-            it(`should return null if there's a selection but its isFree property is truthy`, () => {
+            it(`should set the tags property to the scope filter with an array of tags`, () => {
-                let selection = {isFree: true};
+                const expectedFilter = {
-                let result = controller.getSourceTable(selection);
+                    description: 'My item',
+                    tags: [{}]
+                };
+                const expectedFieldFilter = [{
+                    info: {
+                        label: 'description',
+                        name: 'description',
+                        type: null
+                    },
+                    name: 'description',
+                    value: 'My item'
+                }];
+                controller.filter = {
+                    description: 'My item'
+                };
 
-                expect(result).toBeNull();
+                expect(controller.filter).toEqual(expectedFilter);
+                expect(controller.fieldFilters).toEqual(expectedFieldFilter);
+            });
         });
 
-            it(`should return the formated sourceTable concatenated to a path`, () => {
+        describe('removeField()', () => {
-                let selection = {sourceTable: 'hello guy'};
+            it(`should remove the description property from the fieldFilters and from the scope filter`, () => {
-                let result = controller.getSourceTable(selection);
+                const expectedFilter = {tags: [{}]};
+                controller.filter = {description: 'My item'};
 
-                expect(result).toEqual('Hello guys');
+                controller.removeField(0, 'description');
-            });
 
-            it(`should return a path if there's no sourceTable and the selection has an id`, () => {
+                expect(controller.filter).toEqual(expectedFilter);
-                let selection = {id: 99};
+                expect(controller.fieldFilters).toEqual([]);
-                let result = controller.getSourceTable(selection);
-
-                expect(result).toEqual(`ItemTags/filterItemTags/${selection.id}`);
             });
         });
     });

modules/ticket/front/sale/index.html

@@ -153,7 +153,8 @@
                             <vn-input-number class="dense"
                                 vn-focus
                                 ng-model="sale.quantity"
-                                on-change="$ctrl.changeQuantity(sale)">
+                                on-change="$ctrl.changeQuantity(sale)"
+                                clear-disabled="true">
                             </vn-input-number>
                         </field>
                     </vn-td-editable>
@@ -177,7 +178,8 @@
                             <vn-textfield class="dense" vn-focus
                                 vn-id="concept"
                                 ng-model="sale.concept"
-                                on-change="$ctrl.updateConcept(sale)">
+                                on-change="$ctrl.updateConcept(sale)"
+                                clear-disabled="true">
                             </vn-textfield>
                         </field>
                     </vn-td-editable>
@@ -251,6 +253,7 @@
                     ng-model="$ctrl.edit.price"
                     step="0.01"
                     on-change="$ctrl.updatePrice()"
+                    clear-disabled="true"
                     suffix="€">
                 </vn-input-number>
                 <div class="simulator">
@@ -283,6 +286,7 @@
                     label="Discount"
                     ng-model="$ctrl.edit.discount"
                     on-change="$ctrl.changeDiscount()"
+                    clear-disabled="true"
                     suffix="%">
                 </vn-input-number>
                 <div class="simulator">
@@ -311,6 +315,7 @@
                     label="Discount"
                     ng-model="$ctrl.edit.discount"
                     on-change="$ctrl.changeMultipleDiscount()"
+                    clear-disabled="true"
                     suffix="%">
                 </vn-input-number>
             </div>