fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in danteloayza/processmaker/PM-4465 (pull request #3402)

Browse Source 
PM-4465
This commit is contained in:
Julio Cesar Laura Avendaño
2015-12-15 17:00:44 -04:00
parent 59c421d800 984ed69b94
commit 9eb4bf10f9
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
workflow/engine/src/ProcessMaker/Services/Api/Dashboard.php
View File

@@ -146,17 +146,13 @@ class Dashboard extends Api
$dateTimezone = new \DateTime("now", new \DateTimeZone('UTC'));
$dateIni = $dateTimezone->format('Y-m-d H:i:s');
} else {
$dateTimezone = new \DateTime($dateIni, new \DateTimeZone('UTC'));
$dateTimezone = DateTime::convertDataToUtc($dateTimezone);
$dateIni = $dateTimezone->format('Y-m-d H:i:s');
$dateIni = $this->normalizedTimeZone($dateIni);
}
if ($dateFin == "") {
$dateTimezone = new \DateTime("now", new \DateTimeZone('UTC'));
$dateFin = $dateTimezone->format('Y-m-d H:i:s');
} else {
$dateTimezone = new \DateTime($dateFin, new \DateTimeZone('UTC'));
$dateTimezone = DateTime::convertDataToUtc($dateTimezone);
$dateFin = $dateTimezone->format('Y-m-d H:i:s');
$dateFin = $this->normalizedTimeZone($dateFin);
}
$usrUid = $this->getUserId();
@@ -479,6 +475,20 @@ class Dashboard extends Api
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
}
}
public function normalizedTimeZone($date)
{
$result = $date;
$dateTimezone = new \DateTime($date, new \DateTimeZone('UTC'));
$dateTimezone = DateTime::convertDataToUtc($dateTimezone);
if (!(isset($_SESSION['__SYSTEM_UTC_TIME_ZONE__']) && $_SESSION['__SYSTEM_UTC_TIME_ZONE__'])) {
$result = $dateTimezone->format('Y-m-d H:i:s');
}
else {
$result = (new \DateTime($dateTimezone->date))->format('Y-m-d H:i:s');
}
return $result;
}
}

8
workflow/engine/src/ProcessMaker/Services/Api/ReportingIndicators.php
View File

@@ -54,7 +54,13 @@ class ReportingIndicators extends Api
$date = new \DateTime("now", new \DateTimeZone('UTC'));
} else {
$dateTimezone = new \DateTime($date, new \DateTimeZone('UTC'));
$date = DateTime::convertDataToUtc($dateTimezone);
$toUtcTime = DateTime::convertDataToUtc($dateTimezone);
if (!(isset($_SESSION['__SYSTEM_UTC_TIME_ZONE__']) && $_SESSION['__SYSTEM_UTC_TIME_ZONE__'])) {
$date = $toUtcTime;
}
else {
$date = (new \DateTime($toUtcTime->date));
}
}
return $date;