PM-4162 Modificaciones en los KPIs para soportar timezones SOLVED

- Add validation datetime utc

Change name function

Add validation timezone

Add validation type

workflow/engine/src/ProcessMaker/Services/Api/Dashboard.php

@@ -3,6 +3,7 @@ namespace ProcessMaker\Services\Api;
 
 use \ProcessMaker\Services\Api;
 use \Luracast\Restler\RestException;
+use \ProcessMaker\Util\DateTime;
 
 
 /**
@@ -141,8 +142,22 @@ class Dashboard extends Api
     public function doGetIndicatorsbyDasUid($das_uid, $dateIni="", $dateFin="")
     {
         try {
-        	$dateIni = ($dateIni=="") ? date("Y/m/d") : $dateIni;
+            if ($dateIni == "") {
-        	$dateFin = ($dateFin=="") ? date("Y/m/d") : $dateFin;
+                $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');
+            }
+            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');
+            }
 
             $usrUid = $this->getUserId();
             $Dashboard = new \ProcessMaker\BusinessModel\Dashboard();

workflow/engine/src/ProcessMaker/Services/Api/ReportingIndicators.php

@@ -3,6 +3,7 @@ namespace ProcessMaker\Services\Api;
 
 use \ProcessMaker\Services\Api;
 use \Luracast\Restler\RestException;
+use \ProcessMaker\Util\DateTime;
 
 
 /**
@@ -41,6 +42,24 @@ class ReportingIndicators extends Api
 //        }
 //    }
 
+
+    /**
+     * @param string $date
+     *
+     * @return \DateTime
+     */
+    private function convertDateTimeToUtc ($date)
+    {
+        if ($date == "") {
+            $date = new \DateTime("now", new \DateTimeZone('UTC'));
+        } else {
+            $dateTimezone = new \DateTime($date, new \DateTimeZone('UTC'));
+            $date = DateTime::convertDataToUtc($dateTimezone);
+        }
+
+        return $date;
+    }
+
     /**
      * Lists tasks of a process and it's statistics (efficiency, average times, etc.)
      *
@@ -61,9 +80,10 @@ class ReportingIndicators extends Api
         try {
             $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators();
             $listArray =  $listArray = explode(',', $process_list);
-            $response = $indicatorsObj->getPeiTasksStatistics($listArray,
+            $response = $indicatorsObj->getPeiTasksStatistics(
-                            new \DateTime($init_date),
+                $listArray,
-                            new \DateTime($end_date),
+                $this->convertDateTimeToUtc($init_date),
+                $this->convertDateTimeToUtc($end_date),
                 $language);
             return $response;
         } catch (\Exception $e) {
@@ -85,11 +105,12 @@ class ReportingIndicators extends Api
     public function doGetProcessEficciencyData($indicator_uid, $compare_date, $measure_date, $language)
     {
         try {
+
             $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators();
-			$response = $indicatorsObj->getPeiCompleteData
+            $response = $indicatorsObj->getPeiCompleteData(
-							($indicator_uid,
+                $indicator_uid,
-                            new \DateTime($compare_date),
+                $this->convertDateTimeToUtc($compare_date),
-                            new \DateTime($measure_date),
+                $this->convertDateTimeToUtc($measure_date),
                 $language);
             return $response;
         } catch (\Exception $e) {
@@ -111,10 +132,10 @@ class ReportingIndicators extends Api
     {
         try {
             $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators();
-			$response = $indicatorsObj->getUeiCompleteData
+            $response = $indicatorsObj->getUeiCompleteData (
-							($indicator_uid,
+                $indicator_uid,
-                            new \DateTime($compare_date),
+                $this->convertDateTimeToUtc($compare_date),
-                            new \DateTime($measure_date),
+                $this->convertDateTimeToUtc($measure_date),
                 $language );
             return $response;
         } catch (\Exception $e) {
@@ -125,9 +146,9 @@ class ReportingIndicators extends Api
     /**
      * Returns the total of Cases with Completed time with the selected periodicity
      *
-     * @param string $indicator_uid {@from path}
+     * @param string $group_uid {@from path}
-     * @param string $measure_date {@from path}
+     * @param string $init_date {@from path}
-     * @param string $compare_date {@from path}
+     * @param string $end_date {@from path}
      * @param string $language {@from path}
      * @return array
      *
@@ -138,10 +159,10 @@ class ReportingIndicators extends Api
     {
         try {
             $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators();
-			$response = $indicatorsObj->getUeiGroupsStatistics
+            $response = $indicatorsObj->getUeiGroupsStatistics(
-							($group_uid,
+                $group_uid,
-                            new \DateTime($init_date),
+                $this->convertDateTimeToUtc($init_date),
-                            new \DateTime($end_date),
+                $this->convertDateTimeToUtc($end_date),
                 $language);
             return $response;
         } catch (\Exception $e) {
@@ -164,10 +185,10 @@ class ReportingIndicators extends Api
     {
         try {
             $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators();
-            $response = $indicatorsObj->getGeneralIndicatorStatistics
+            $response = $indicatorsObj->getGeneralIndicatorStatistics(
-                ($indicator_uid,
+                $indicator_uid,
-                new \DateTime($init_date),
+                $this->convertDateTimeToUtc($init_date),
-                new \DateTime($end_date),
+                $this->convertDateTimeToUtc($end_date),
                 $language);
             return $response;
         } catch (\Exception $e) {
@@ -210,10 +231,10 @@ class ReportingIndicators extends Api
     public function doGetHistoricDataFromIndicator($indicator_uid, $init_date, $end_date, $periodicity, $language) {
         try {
             $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators();
-            $response = $indicatorsObj->getHistoricData
+            $response = $indicatorsObj->getHistoricData (
-											($indicator_uid,
+                $indicator_uid,
-											new \DateTime($init_date),
+                $this->convertDateTimeToUtc($init_date),
-											new \DateTime($end_date),
+                $this->convertDateTimeToUtc($end_date),
                 $periodicity,
                 $language);
             return $response;