espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

date fix

Browse Source
This commit is contained in:
Yuri Kuznetsov
2020-08-08 10:33:20 +03:00
parent aa788a17d9
commit bf033c31af
1 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/views/fields/date.js
+44 -31
View File
@@ -98,42 +98,55 @@ define('views/fields/date', 'views/fields/base', function (Dep) {
}
if (this.mode == 'list' || this.mode == 'detail' || this.mode == 'listLink') {
if (this.getConfig().get('readableDateFormatDisabled') || this.params.useNumericFormat) {
return this.getDateTime().toDisplayDate(value);
}
var d = moment.utc(value + ' 00:00:00', this.getDateTime().internalDateTimeFormat);
var today = moment().tz(this.getDateTime().getTimeZone()).startOf('day');
var dt = today.clone();
var ranges = {
'today': [dt.unix(), dt.add(1, 'days').unix()],
'tomorrow': [dt.unix(), dt.add(1, 'days').unix()],
'yesterday': [dt.add(-3, 'days').unix(), dt.add(1, 'days').unix()]
};
if (d.unix() >= ranges['today'][0] && d.unix() < ranges['today'][1]) {
return this.translate('Today');
} else if (d.unix() >= ranges['tomorrow'][0] && d.unix() < ranges['tomorrow'][1]) {
return this.translate('Tomorrow');
} else if (d.unix() >= ranges['yesterday'][0] && d.unix() < ranges['yesterday'][1]) {
return this.translate('Yesterday');
}
var readableFormat = this.getDateTime().getReadableDateFormat();
if (d.format('YYYY') == today.format('YYYY')) {
return d.format(readableFormat);
} else {
return d.format(readableFormat + ', YYYY');
}
return this.convertDateValueForDetail(value);
}
return this.getDateTime().toDisplayDate(value);
},
convertDateValueForDetail: function (value) {
if (this.getConfig().get('readableDateFormatDisabled') || this.params.useNumericFormat) {
return this.getDateTime().toDisplayDate(value);
}
var timezone = this.getDateTime().getTimeZone();
var internalDateTimeFormat = this.getDateTime().internalDateTimeFormat;
var readableFormat = this.getDateTime().getReadableDateFormat();
var valueWithTime = value + ' 00:00:00';
var today = moment().tz(timezone).startOf('day');
var dateTime = moment.tz(valueWithTime, internalDateTimeFormat, timezone);
var temp = today.clone();
var ranges = {
'today': [temp.unix(), temp.add(1, 'days').unix()],
'tomorrow': [temp.unix(), temp.add(1, 'days').unix()],
'yesterday': [temp.add(-3, 'days').unix(), temp.add(1, 'days').unix()],
};
if (dateTime.unix() >= ranges['today'][0] && dateTime.unix() < ranges['today'][1]) {
return this.translate('Today');
}
if (dateTime.unix() >= ranges['tomorrow'][0] && dateTime.unix() < ranges['tomorrow'][1]) {
return this.translate('Tomorrow');
}
if (dateTime.unix() >= ranges['yesterday'][0] && dateTime.unix() < ranges['yesterday'][1]) {
return this.translate('Yesterday');
}
// Need to use UTC, otherwise there's a DST issue with old dates.
var dateTime = moment.utc(valueWithTime, internalDateTimeFormat);
if (dateTime.format('YYYY') == today.format('YYYY')) {
return dateTime.format(readableFormat);
}
return dateTime.format(readableFormat + ', YYYY');
},
getDateStringValue: function () {
if (this.mode === 'detail' && !this.model.has(this.name)) {
return '...';