dates fixed, deleted tricks to change the hours
gitea/salix/test This commit looks good Details

This commit is contained in:
Gerard 2019-02-26 12:51:01 +01:00
parent 43f26d1bc9
commit d404fc92c8
6 changed files with 8 additions and 12 deletions

View File

@ -19,7 +19,7 @@
icon="keyboard_arrow_right"
class="pointer"
ng-click="$ctrl.moveNext($ctrl.skip)"
ng-show="$ctrl.displayControls"
ng-show="$ctrl.displayControls">
</vn-icon>
</vn-auto>
</vn-horizontal>

View File

@ -424,7 +424,8 @@ function dockerWait() {
user: dbConf.username,
password: dbConf.password,
host: dbConf.host,
port: dbConf.port
port: dbConf.port,
dateStrings: true
};
log('Waiting for MySQL init process...');

View File

@ -28,9 +28,6 @@ class VnMySQL extends MySQL {
return MySQL.prototype.fromColumnValue.call(this, prop, val);
let date = new Date(val);
let locale = new Date(val);
let offset = locale.getTimezoneOffset() * 60000;
date.setTime(date.getTime() + offset);
return date;
}
@ -57,7 +54,6 @@ class VnMySQL extends MySQL {
let locale = new Date(param);
let offset = locale.getTimezoneOffset() * 60000;
param.setTime(param.getTime() - offset);
console.log(param);
}
}
}
@ -245,6 +241,7 @@ class VnMySQL extends MySQL {
exports.VnMySQL = VnMySQL;
exports.initialize = function initialize(dataSource, callback) {
console.log(dataSource);
dataSource.driver = mysql;
dataSource.connector = new VnMySQL(dataSource.settings);
dataSource.connector.dataSource = dataSource;

View File

@ -4,7 +4,7 @@
},
"vn": {
"connector": "vn-mysql",
"timezone": "CET",
"timezone": "local",
"database": "vn",
"debug": false,
"host": "localhost",

View File

@ -1,5 +1,4 @@
import ngModule from '../../module';
import {toJsonDate} from 'core/lib/date';
import './style.scss';
class Controller {
@ -66,7 +65,7 @@ class Controller {
onChangeShipped(value) {
let data = {
shipped: toJsonDate(value),
shipped: value,
addressFk: this.ticket.addressFk,
agencyModeFk: this.ticket.agencyModeFk,
warehouseFk: this.ticket.warehouseFk
@ -128,7 +127,7 @@ class Controller {
let query = `/ticket/api/sales/${this.ticket.id}/priceDifference`;
let data = {
landed: toJsonDate(this.ticket.landed),
landed: this.ticket.landed,
addressFk: this.ticket.addressFk,
agencyModeFk: this.ticket.agencyModeFk,
warehouseFk: this.ticket.warehouseFk

View File

@ -1,5 +1,4 @@
import './index.js';
import {toJsonDate} from 'core/lib/date';
describe('Ticket', () => {
describe('Component vnTicketDataStepOne', () => {
@ -68,7 +67,7 @@ describe('Ticket', () => {
warehouseFk: 1
};
let data = {
shipped: toJsonDate(shipped),
shipped: shipped,
addressFk: 121,
agencyModeFk: 2,
warehouseFk: 1