Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter
This commit is contained in:
commit
444bc36f31
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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",
|
||||
|
|
Loading…
Reference in New Issue