viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 15:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

working time function fixes

Browse Source
This commit is contained in:
Yuri Kuznetsov
2022-09-19 18:17:21 +03:00
parent 4d7e56e7b7
commit 3dfaae167f
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
application/Espo/Core/Formula/Functions/ExtGroup/WorkingTimeGroup/AddWorkingDaysType.php
View File

@@ -32,6 +32,7 @@ namespace Espo\Core\Formula\Functions\ExtGroup\WorkingTimeGroup;
use Espo\Core\Field\DateTime;
use Espo\Core\Field\DateTimeOptional;
use Espo\Core\Formula\ArgumentList;
use Espo\Core\Utils\DateTime as DateTimeUtil;
class AddWorkingDaysType extends Base
{
@@ -67,7 +68,9 @@ class AddWorkingDaysType extends Base
$dateTime = DateTimeOptional::fromString($stringValue);
if ($dateTime->isAllDay()) {
$isAllDay = $dateTime->isAllDay();
if ($isAllDay) {
$dateTime = $dateTime->withTimezone($calendar->getTimezone());
}
@@ -79,6 +82,10 @@ class AddWorkingDaysType extends Base
return null;
}
if ($isAllDay) {
return $result->getDateTime()->format(DateTimeUtil::SYSTEM_DATE_FORMAT);
}
return $result->getString();
}
}

22
application/Espo/Resources/metadata/app/formula.json
View File

@@ -458,33 +458,33 @@
"returnType": "string"
},
{
"name": "ext\\workingCalendar\\addWorkingDays",
"name": "ext\\workingTime\\addWorkingDays",
"insertText": "ext\\workingCalendar\\addWorkingDays(DATE, DAYS)",
"returnType": "string|null"
},
{
"name": "ext\\workingCalendar\\findClosestWorkingTime",
"insertText": "ext\\workingCalendar\\findClosestWorkingTime(DATE)",
"name": "ext\\workingTime\\findClosestWorkingTime",
"insertText": "ext\\workingTime\\findClosestWorkingTime(DATE)",
"returnType": "string|null"
},
{
"name": "ext\\workingCalendar\\getSummedWorkingHours",
"insertText": "ext\\workingCalendar\\getSummedWorkingHours(FROM, TO)",
"name": "ext\\workingTime\\getSummedWorkingHours",
"insertText": "ext\\workingTime\\getSummedWorkingHours(FROM, TO)",
"returnType": "float"
},
{
"name": "ext\\workingCalendar\\getWorkingDays",
"insertText": "ext\\workingCalendar\\getWorkingDays(FROM, TO)",
"name": "ext\\workingTime\\getWorkingDays",
"insertText": "ext\\workingTime\\getWorkingDays(FROM, TO)",
"returnType": "int"
},
{
"name": "ext\\workingCalendar\\hasWorkingTime",
"insertText": "ext\\workingCalendar\\hasWorkingTime(FROM, TO)",
"name": "ext\\workingTime\\hasWorkingTime",
"insertText": "ext\\workingTime\\hasWorkingTime(FROM, TO)",
"returnType": "bool"
},
{
"name": "ext\\workingCalendar\\isWorkingDay",
"insertText": "ext\\workingCalendar\\isWorkingDay(DATE)",
"name": "ext\\workingTime\\isWorkingDay",
"insertText": "ext\\workingTime\\isWorkingDay(DATE)",
"returnType": "bool"
},
{