Merge pull request '4291-fix(vnInputTime): quit new date(null)' (#1031) from 4291-vnInputTime into dev
gitea/salix/pipeline/head There was a failure building this commit Details

Reviewed-on: #1031
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2022-09-28 06:10:55 +00:00
commit 93f5bf089d
3 changed files with 13 additions and 10 deletions

View File

@ -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);
}

View File

@ -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>

View File

@ -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",