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

PM-4465 Error al mostrar reportes de KPIs

Browse Source
This commit is contained in:
Dante
2015-12-15 15:31:54 -04:00
parent d1cb4b6a64
commit 0695a405cc
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
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')); $dateTimezone = new \DateTime("now", new \DateTimeZone('UTC'));
$dateIni = $dateTimezone->format('Y-m-d H:i:s'); $dateIni = $dateTimezone->format('Y-m-d H:i:s');
} else { } else {
$dateTimezone = new \DateTime($dateIni, new \DateTimeZone('UTC')); $dateIni = $this->normalizedTimeZone($dateIni);
$dateTimezone = DateTime::convertDataToUtc($dateTimezone);
$dateIni = $dateTimezone->format('Y-m-d H:i:s');
} }
if ($dateFin == "") { if ($dateFin == "") {
$dateTimezone = new \DateTime("now", new \DateTimeZone('UTC')); $dateTimezone = new \DateTime("now", new \DateTimeZone('UTC'));
$dateFin = $dateTimezone->format('Y-m-d H:i:s'); $dateFin = $dateTimezone->format('Y-m-d H:i:s');
} else { } else {
$dateTimezone = new \DateTime($dateFin, new \DateTimeZone('UTC')); $dateFin = $this->normalizedTimeZone($dateFin);
$dateTimezone = DateTime::convertDataToUtc($dateTimezone);
$dateFin = $dateTimezone->format('Y-m-d H:i:s');
} }
$usrUid = $this->getUserId(); $usrUid = $this->getUserId();
@@ -480,5 +476,19 @@ class Dashboard extends Api
} }
} }
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;
}
} }