EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
working time calendar 24:00
Yuri Kuznetsov1f9770ded677
diff --git a/application/Espo/Tools/WorkingTime/Extractor.php b/application/Espo/Tools/WorkingTime/Extractor.phpindex aa1db5a72f..4378f96c91 100644--- a/application/Espo/Tools/WorkingTime/Extractor.php+++ b/application/Espo/Tools/WorkingTime/Extractor.php@@ -390,14 +390,19 @@ class Extractor$start = $range->getStart();$end = $range->getEnd();- $list[] = [- DateTime::fromDateTime(- $pointer->setTime($start->getHour(), $start->getMinute())- ),- DateTime::fromDateTime(- $pointer->setTime($end->getHour(), $end->getMinute())- )- ];+ $startDateTime = DateTime::fromDateTime(+ $pointer->setTime($start->getHour(), $start->getMinute())+ );++ $endDateTime = DateTime::fromDateTime(+ $pointer->setTime($end->getHour(), $end->getMinute())+ );++ if ($end->getHour() === 0 && $end->getMinute() === 0) {+ $endDateTime = $endDateTime->addDays(1);+ }++ $list[] = [$startDateTime, $endDateTime];}return $list;diff --git a/client/src/views/working-time-calendar/fields/time-ranges.js b/client/src/views/working-time-calendar/fields/time-ranges.jsindex 5e2ba44712..9e27ceb42f 100644--- a/client/src/views/working-time-calendar/fields/time-ranges.js+++ b/client/src/views/working-time-calendar/fields/time-ranges.js@@ -315,11 +315,15 @@ export default class extends BaseFieldView {continue;}- const prevItem = item[i - 1];+ const prevItem = itemList[i - 1];if (this.isRangeInvalid(prevItem[1], item[0])) {return true;}++ if (prevItem[1] === '00:00') {+ return true;+ }}return false;@@ -328,9 +332,9 @@ export default class extends BaseFieldView {/*** @param {string|null} from* @param {string|null} to- * @param {boolean} [noEmpty]+ * @param {boolean} [isRange]*/- isRangeInvalid(from, to, noEmpty) {+ isRangeInvalid(from, to, isRange = false) {if (from === null || to === null) {return true;}@@ -338,10 +342,14 @@ export default class extends BaseFieldView {const fromNumber = parseFloat(from.replace(':', '.'));const toNumber = parseFloat(to.replace(':', '.'));- if (noEmpty && fromNumber === toNumber) {+ if (isRange && fromNumber === toNumber && to !== '00:00') {return true;}+ if (isRange && to === '00:00' && fromNumber) {+ return false;+ }+return fromNumber > toNumber;}}diff --git a/client/src/views/working-time-calendar/fields/time-ranges/item-edit.js b/client/src/views/working-time-calendar/fields/time-ranges/item-edit.jsindex 4b1691bda7..c3970e54c4 100644--- a/client/src/views/working-time-calendar/fields/time-ranges/item-edit.js+++ b/client/src/views/working-time-calendar/fields/time-ranges/item-edit.js@@ -110,6 +110,10 @@ export default class extends View {return m.format(this.getDateTime().timeFormat);}+ /**+ * @param {string} value+ * @return {string|null}+ */convertTimeFromDisplay(value) {if (!value) {return null;@@ -139,7 +143,13 @@ export default class extends View {setMinTime() {const value = this.$start.val();- this.$end.timepicker('option', 'maxTime', this.convertTimeToDisplay('23:59'));+ const parsedValue = this.convertTimeFromDisplay(value);++ if (parsedValue !== '00:00') {+ this.$end.timepicker('option', 'maxTime', this.convertTimeToDisplay('24:00'));+ } else {+ this.$end.timepicker('option', 'maxTime', null);+ }if (!value) {this.$end.timepicker('option', 'minTime', null);@@ -147,7 +157,11 @@ export default class extends View {return;}- this.$end.timepicker('option', 'minTime', value);+ const minValue = moment(parsedValue, 'HH:mm')+ .add(this.minuteStep, 'minute')+ .format(this.getDateTime().timeFormat);++ this.$end.timepicker('option', 'minTime', minValue);}initTimepicker($el) {