[SOLVED] time zone issue
This commit is contained in:
parent
840acaf8ba
commit
ffd039ee84
|
|
@ -2,9 +2,9 @@ odoo.define('web_hijri_datepicker.datepicker', function (require) {
|
||||||
|
|
||||||
var core = require('web.core');
|
var core = require('web.core');
|
||||||
var datepicker = require('web.datepicker');
|
var datepicker = require('web.datepicker');
|
||||||
|
var field_utils = require('web.field_utils');
|
||||||
var time = require('web.time');
|
var time = require('web.time');
|
||||||
var FieldDate = require('web.basic_fields').FieldDate;
|
var FieldDate = require('web.basic_fields').FieldDate;
|
||||||
|
|
||||||
var _t = core._t;
|
var _t = core._t;
|
||||||
|
|
||||||
var hijriMonths = {
|
var hijriMonths = {
|
||||||
|
|
@ -83,7 +83,7 @@ odoo.define('web_hijri_datepicker.datepicker', function (require) {
|
||||||
});
|
});
|
||||||
var jd = $.calendars.instance('islamic').toJD(parseInt(date[0].year()), parseInt(date[0].month()), parseInt(date[0].day()));
|
var jd = $.calendars.instance('islamic').toJD(parseInt(date[0].year()), parseInt(date[0].month()), parseInt(date[0].day()));
|
||||||
var formatted_date = $.calendars.instance('gregorian').fromJD(jd);
|
var formatted_date = $.calendars.instance('gregorian').fromJD(jd);
|
||||||
var date_value = moment(time.str_to_date(formatted_date)).add(1, 'days');
|
var date_value = moment(time.str_to_date(formatted_date)).tz(Intl.DateTimeFormat().resolvedOptions().timeZone).add(1, 'days');
|
||||||
this.setValue(this._parseClient(date_value));
|
this.setValue(this._parseClient(date_value));
|
||||||
this.trigger("datetime_changed");
|
this.trigger("datetime_changed");
|
||||||
|
|
||||||
|
|
@ -109,16 +109,20 @@ odoo.define('web_hijri_datepicker.datepicker', function (require) {
|
||||||
return this._super();
|
return this._super();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
_formatClients: function (v) {
|
||||||
|
return field_utils.format[this.type_of_date](v, null, {timezone: true});
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
FieldDate.include({
|
FieldDate.include({
|
||||||
_renderReadonly: function () {
|
_renderReadonly: function () {
|
||||||
var self = this;
|
var self = this;
|
||||||
this._super.apply(this, arguments);
|
this._super.apply(this, arguments);
|
||||||
if (this.value) {
|
if (this.value) {
|
||||||
console.log('thiiiis', this)
|
window.dv = this.value;
|
||||||
this.datewidget = this._makeDatePicker();
|
this.datewidget = this._makeDatePicker();
|
||||||
var $div = $('<div/>');
|
var $div = $('<div/>');
|
||||||
var value = this.value ? this.datewidget._formatClient(this.value) : '';
|
var value = this.value ? this.datewidget._formatClients(this.value) : '';
|
||||||
var parsed_date = this.value ? this.datewidget._parseDate(this.value) : '';
|
var parsed_date = this.value ? this.datewidget._parseDate(this.value) : '';
|
||||||
var hijri_value = parsed_date ? this.datewidget._convertGregorianToHijri(parsed_date) : '';
|
var hijri_value = parsed_date ? this.datewidget._convertGregorianToHijri(parsed_date) : '';
|
||||||
$('<div>', {
|
$('<div>', {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue