Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter

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

@@ -23,12 +23,15 @@ export default class InputTime extends Field {
         let date = null;
         let value = this.input.value;
 
+        if (this.field && !this.modelDate)
+            this.modelDate = this.field;
+
         if (value) {
             let split = value.split(':').map(i => parseInt(i) || null);
 
-            date = this.field instanceof Date
-                ? this.field
-                : new Date(this.field || null);
+            date = this.modelDate
+                ? new Date(this.modelDate)
+                : new Date();
             date.setHours(split[0], split[1], 0, 0);
         }
 

modules/route/front/basic-data/index.html

@@ -21,7 +21,7 @@
                     <div>{{name}} - {{nickname}}</div>
                 </tpl-item>
             </vn-autocomplete>
-            <vn-autocomplete 
+            <vn-autocomplete
                 vn-one
                 ng-model="$ctrl.route.vehicleFk"
                 url="Vehicles"
@@ -32,8 +32,8 @@
         </vn-horizontal>
         <vn-horizontal>
             <vn-date-picker
-                vn-one 
-                label="Created" 
+                vn-one
+                label="Created"
                 ng-model="$ctrl.route.created">
             </vn-date-picker>
             <vn-autocomplete
@@ -61,7 +61,7 @@
         </vn-horizontal>
         <vn-horizontal>
             <vn-input-time
-                label="Hour started" 
+                label="Hour started"
                 ng-model="$ctrl.route.started">
             </vn-input-time>
             <vn-input-time
@@ -71,8 +71,8 @@
         </vn-horizontal>
         <vn-horizontal>
             <vn-textArea
-                vn-one 
-                label="Description" 
+                vn-one
+                label="Description"
                 ng-model="$ctrl.route.description"
                 rule
                 vn-focus>

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "8.6.0",
+    "version": "8.8.0",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",
@@ -37,7 +37,7 @@
         "node-ssh": "^11.0.0",
         "object-diff": "0.0.4",
         "object.pick": "^1.3.0",
-        "puppeteer": "^7.1.0",
+        "puppeteer": "^18.0.5",
         "read-chunk": "^3.2.0",
         "require-yaml": "0.0.1",
         "sharp": "^0.27.1",