Merge branch 'test' of verdnatura/salix into dev

.vscode/settings.json

@@ -3,5 +3,8 @@
     // Carácter predeterminado de final de línea.
     "files.eol": "\n",
     "vsicons.presets.angular": false,
-    "eslint.autoFixOnSave": true
+    "eslint.autoFixOnSave": true,
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": true
+    }
 }

front/core/components/autocomplete/index.js

@@ -253,7 +253,7 @@ export default class Autocomplete extends Field {
     }
 
     showDropDown(search) {
-        if (this.readonly) return;
+        if (!this.editable) return;
         this.assignDropdownProps();
         this.$.dropDown.show(this.container, search);
     }

front/core/components/range/index.js

@@ -6,6 +6,16 @@ export default class Range extends FormInput {
     constructor($element, $scope) {
         super($element, $scope);
         this.input = this.element.querySelector('input');
+        this.input.addEventListener('change', () => this.onValueUpdate());
+    }
+
+    get field() {
+        return super.field;
+    }
+
+    set field(value) {
+        this.input.value = value;
+        super.field = value;
     }
 
     get max() {
@@ -35,6 +45,11 @@ export default class Range extends FormInput {
     refreshTabIndex() {
         this.input.tabIndex = this.disabled ? -1 : this.tabIndex;
     }
+
+    onValueUpdate() {
+        this.change(this.input.value);
+        this.$.$applyAsync();
+    }
 }
 
 ngModule.vnComponent('vnRange', {

modules/claim/front/index/index.html

@@ -11,7 +11,7 @@
 </vn-auto-search>
 <vn-data-viewer
     model="model"
-    class="vn-w-md">
+    class="vn-w-lg">
     <vn-card>
     <vn-table model="model">
         <vn-thead>

modules/claim/front/summary/index.html

@@ -87,7 +87,7 @@
                 <section class="photo" ng-repeat="photo in photos">
                     <section class="image" on-error-src 
                         ng-style="{'background': 'url(/api/dms/' + photo.dmsFk + '/downloadFile?access_token=' + $ctrl.accessToken + ')'}"
-                        zoom-image="dms/{{::photo.dmsFk}}/downloadFile?access_token={{::$ctrl.accessToken}}">
+                        zoom-image="/api/dms/{{::photo.dmsFk}}/downloadFile?access_token={{::$ctrl.accessToken}}">
                     </section>
                 </section>
             </vn-horizontal>

modules/item/front/diary/index.html

@@ -6,7 +6,7 @@
     auto-load="false">
 </vn-crud-model>
 <vn-vertical>
-    <vn-card class="vn-pa-lg vn-w-md">
+    <vn-card class="vn-pa-lg vn-w-lg">
     <vn-vertical>
         <vn-horizontal>
             <vn-autocomplete

modules/ticket/front/sale/index.js

@@ -11,28 +11,25 @@ class Controller {
         this.$http = $http;
         this.edit = {};
         this.moreOptions = [
-            {name: 'Send SMS', callback: this.showSMSDialog},
             {
+                name: 'Send SMS',
+                callback: this.showSMSDialog
+            }, {
                 name: 'Mark as reserved',
                 callback: this.markAsReserved,
                 show: () => this.isEditable
-            },
-            {
+            }, {
                 name: 'Unmark as reserved',
                 callback: this.unmarkAsReserved,
                 show: () => this.isEditable
-            },
-            {
+            }, {
                 name: 'Update discount',
                 callback: this.showEditDialog,
                 show: () => this.isEditable
-            },
-            {
+            }, {
                 name: 'Add claim',
-                callback: this.createClaim,
-                show: () => this.isEditable
-            },
-            {
+                callback: this.createClaim
+            }, {
                 name: 'Recalculate price',
                 callback: this.calculateSalePrice,
                 show: () => this.hasOneSaleSelected()

modules/travel/front/routes.json

@@ -24,8 +24,7 @@
             "url": "/index?q",
             "state": "travel.index",
             "component": "vn-travel-index",
-            "description": "Travels",
-            "acl": ["developer"]
+            "description": "Travels"
         }, {
             "url": "/:id",
             "state": "travel.card",

modules/worker/front/department/index.html

@@ -16,9 +16,6 @@
             {{::item.name}}
         </vn-treeview>
     </vn-card>
-    <vn-button-bar>
-        <vn-button ui-sref="worker.index" label="Back"></vn-button>
-    </vn-button-bar>
 </form>
 <vn-confirm
     vn-id="deleteNode"

modules/worker/front/routes.json

@@ -51,7 +51,7 @@
             "params": {
                 "worker": "$ctrl.worker"
             },
-            "acl": ["developer"]
+            "acl": ["hr"]
         }, {
             "url": "/pbx",
             "state": "worker.card.pbx",
@@ -81,7 +81,8 @@
             "url" : "/department",
             "state": "worker.department",
             "component": "vn-worker-department",
-            "description": "Departments"
+            "description": "Departments",
+            "acl": ["hr"]
         }, {
             "url": "/phones",
             "state": "worker.card.phones",
@@ -89,7 +90,8 @@
             "description": "Phones",
             "params": {
                 "worker": "$ctrl.worker"
-            }
+            },
+            "acl": ["hr"]
         },
         {
             "url": "/dms",
@@ -101,7 +103,8 @@
             "url": "/index",
             "state": "worker.card.dms.index",
             "component": "vn-worker-dms-index",
-            "description": "File management"
+            "description": "File management",
+            "acl": ["hr"]
         },
         {
             "url": "/create",
@@ -110,7 +113,8 @@
             "description": "Upload file",
             "params": {
                 "worker": "$ctrl.worker"
-            }
+            },
+            "acl": ["hr"]
         },
         {
             "url": "/:dmsId/edit",
@@ -119,7 +123,8 @@
             "description": "Edit file",
             "params": {
                 "worker": "$ctrl.worker"
-            }
+            },
+            "acl": ["hr"]
         }
     ]
 }