fix all-day event duration

This commit is contained in:
Yuri Kuznetsov
2022-05-12 14:33:08 +03:00
parent a0d4fa5b82
commit b5ee03b142
4 changed files with 12 additions and 3 deletions
@@ -36,6 +36,8 @@ define('crm:views/meeting/fields/date-end', 'views/fields/datetime-optional', fu
noneOptionIsHidden: true,
isEnd: true,
setup: function () {
Dep.prototype.setup.call(this);
@@ -34,6 +34,8 @@ Espo.define('crm:views/task/fields/date-end', 'views/fields/datetime-optional',
listTemplate: 'crm:task/fields/date-end/detail',
isEnd: true,
data: function () {
var data = Dep.prototype.data.call(this);
+4 -2
View File
@@ -120,8 +120,10 @@ define('views/fields/datetime-optional', 'views/fields/datetime', function (Dep)
var dateTimeValue = data[this.nameDate] + ' 00:00:00';
dateTimeValue = moment.utc(dateTimeValue)
.tz(this.getConfig().get('timeZone') || 'UTC')
dateTimeValue = moment
.tz(dateTimeValue, this.getConfig().get('timeZone') || 'UTC')
.add(this.isEnd ? 1 : 0, 'days')
.utc()
.format(this.getDateTime().internalDateTimeFullFormat);
data[this.name] = dateTimeValue;
+4 -1
View File
@@ -237,7 +237,10 @@ define('views/fields/duration', 'views/fields/enum', function (Dep) {
if (seconds) {
endUnix = moment.utc(start).unix() + seconds;
end = moment.unix(endUnix).utc().format(this.getDateTime().internalDateFormat);
end = moment.unix(endUnix)
.utc()
.add(-1, 'day')
.format(this.getDateTime().internalDateFormat);
}
else {
end = start;