Skip to content
GitLab
Commit ebf27438 authored by Marcin Haba's avatar Marcin Haba
Browse files

baculum: Fix time range filter for job and object endpoints

parent c14262c1
Hide whitespace changes
Inline Side-by-side
gui/baculum/protected/API/Pages/API/Jobs.php
View file @ ebf27438
......@@ -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)
];
}
}
......
gui/baculum/protected/API/Pages/API/Objects.php
View file @ ebf27438
......@@ -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)
];
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment