baculum: Fix time range filter for job and object endpoints

diff --git a/gui/baculum/protected/API/Pages/API/Jobs.php b/gui/baculum/protected/API/Pages/API/Jobs.php
index 454ff8000860fdcdc139378bd1583ac02bcdb094..06ec3b6e95aa4889961169c4f71d267f048c61fd 100644 (file)
--- a/gui/baculum/protected/API/Pages/API/Jobs.php
+++ b/gui/baculum/protected/API/Pages/API/Jobs.php
@@ -119,13 +119,13 @@ class Jobs extends BaculumAPIServer {
                        if (!empty($schedtime_from)) {
                                $params['Job.SchedTime'][] = [
                                        'operator' => '>=',
-                                       'vals' => date('Y-m-d H:m:s', $schedtime_from)
+                                       'vals' => date('Y-m-d H:i:s', $schedtime_from)
                                ];
                        }
                        if (!empty($schedtime_to)) {
                                $params['Job.SchedTime'][] = [
                                        'operator' => '<=',
-                                       'vals' => date('Y-m-d H:m:s', $schedtime_to)
+                                       'vals' => date('Y-m-d H:i:s', $schedtime_to)
                                ];
                        }
                }
@@ -136,13 +136,13 @@ class Jobs extends BaculumAPIServer {
                        if (!empty($starttime_from)) {
                                $params['Job.StartTime'][] = [
                                        'operator' => '>=',
-                                       'vals' => date('Y-m-d H:m:s', $starttime_from)
+                                       'vals' => date('Y-m-d H:i:s', $starttime_from)
                                ];
                        }
                        if (!empty($starttime_to)) {
                                $params['Job.StartTime'][] = [
                                        'operator' => '<=',
-                                       'vals' => date('Y-m-d H:m:s', $starttime_to)
+                                       'vals' => date('Y-m-d H:i:s', $starttime_to)
                                ];
                        }
                }
@@ -153,13 +153,13 @@ class Jobs extends BaculumAPIServer {
                        if (!empty($endtime_from)) {
                                $params['Job.EndTime'][] = [
                                        'operator' => '>=',
-                                       'vals' => date('Y-m-d H:m:s', $endtime_from)
+                                       'vals' => date('Y-m-d H:i:s', $endtime_from)
                                ];
                        }
                        if (!empty($endtime_to)) {
                                $params['Job.EndTime'][] = [
                                        'operator' => '<=',
-                                       'vals' => date('Y-m-d H:m:s', $endtime_to)
+                                       'vals' => date('Y-m-d H:i:s', $endtime_to)
                                ];
                        }
                }
@@ -170,13 +170,13 @@ class Jobs extends BaculumAPIServer {
                        if (!empty($realendtime_from)) {
                                $params['Job.RealEndTime'][] = [
                                        'operator' => '>=',
-                                       'vals' => date('Y-m-d H:m:s', $realendtime_from)
+                                       'vals' => date('Y-m-d H:i:s', $realendtime_from)
                                ];
                        }
                        if (!empty($realendtime_to)) {
                                $params['Job.RealEndTime'][] = [
                                        'operator' => '<=',
-                                       'vals' => date('Y-m-d H:m:s', $realendtime_to)
+                                       'vals' => date('Y-m-d H:i:s', $realendtime_to)
                                ];
                        }
                }

diff --git a/gui/baculum/protected/API/Pages/API/Objects.php b/gui/baculum/protected/API/Pages/API/Objects.php
index bf59293d3299454d4781692171d475890b318568..37be7fca21f09b7d2f0883d2d2227266549a22cf 100644 (file)
--- a/gui/baculum/protected/API/Pages/API/Objects.php
+++ b/gui/baculum/protected/API/Pages/API/Objects.php
@@ -132,13 +132,13 @@ class Objects extends BaculumAPIServer {
                        if (!empty($schedtime_from)) {
                                $params['Job.SchedTime'][] = [
                                        'operator' => '>=',
-                                       'vals' => date('Y-m-d H:m:s', $schedtime_from)
+                                       'vals' => date('Y-m-d H:i:s', $schedtime_from)
                                ];
                        }
                        if (!empty($schedtime_to)) {
                                $params['Job.SchedTime'][] = [
                                        'operator' => '<=',
-                                       'vals' => date('Y-m-d H:m:s', $schedtime_to)
+                                       'vals' => date('Y-m-d H:i:s', $schedtime_to)
                                ];
                        }
                }
@@ -149,13 +149,13 @@ class Objects extends BaculumAPIServer {
                        if (!empty($starttime_from)) {
                                $params['Job.StartTime'][] = [
                                        'operator' => '>=',
-                                       'vals' => date('Y-m-d H:m:s', $starttime_from)
+                                       'vals' => date('Y-m-d H:i:s', $starttime_from)
                                ];
                        }
                        if (!empty($starttime_to)) {
                                $params['Job.StartTime'][] = [
                                        'operator' => '<=',
-                                       'vals' => date('Y-m-d H:m:s', $starttime_to)
+                                       'vals' => date('Y-m-d H:i:s', $starttime_to)
                                ];
                        }
                }
@@ -166,13 +166,13 @@ class Objects extends BaculumAPIServer {
                        if (!empty($endtime_from)) {
                                $params['Job.EndTime'][] = [
                                        'operator' => '>=',
-                                       'vals' => date('Y-m-d H:m:s', $endtime_from)
+                                       'vals' => date('Y-m-d H:i:s', $endtime_from)
                                ];
                        }
                        if (!empty($endtime_to)) {
                                $params['Job.EndTime'][] = [
                                        'operator' => '<=',
-                                       'vals' => date('Y-m-d H:m:s', $endtime_to)
+                                       'vals' => date('Y-m-d H:i:s', $endtime_to)
                                ];
                        }
                }
@@ -183,13 +183,13 @@ class Objects extends BaculumAPIServer {
                        if (!empty($realendtime_from)) {
                                $params['Job.RealEndTime'][] = [
                                        'operator' => '>=',
-                                       'vals' => date('Y-m-d H:m:s', $realendtime_from)
+                                       'vals' => date('Y-m-d H:i:s', $realendtime_from)
                                ];
                        }
                        if (!empty($realendtime_to)) {
                                $params['Job.RealEndTime'][] = [
                                        'operator' => '<=',
-                                       'vals' => date('Y-m-d H:m:s', $realendtime_to)
+                                       'vals' => date('Y-m-d H:i:s', $realendtime_to)
                                ];
                        }
                }