baculum: Add to jobs objects endpoint time filters in date/time format

New parameters:
 - schedtime_from_date
 - schedtime_to_date
 - starttime_from_date
 - starttime_to_date
 - realstarttime_from_date
 - realstarttime_to_date
 - endtime_from_date
 - endtime_to_date
 - realendtime_from_date
 - realendtime_to_date

diff --git a/gui/baculum/protected/API/Pages/API/JobsObjects.php b/gui/baculum/protected/API/Pages/API/JobsObjects.php
index 3a7a48d6ffd0c6cbe9a8ce8b3557dcf79b10f00f..8bfb2dbbf74b8d34e550986298e887f484602557 100644 (file)
--- a/gui/baculum/protected/API/Pages/API/JobsObjects.php
+++ b/gui/baculum/protected/API/Pages/API/JobsObjects.php
@@ -51,6 +51,8 @@ class JobsObjects extends BaculumAPIServer {
                $clientid = $this->Request->contains('clientid') ? $this->Request['clientid'] : null;
                $client = $this->Request->contains('client') ? $this->Request['client'] : null;
                $objecttype = $this->Request->contains('objecttype') && $misc->isValidName($this->Request['objecttype']) ? $this->Request['objecttype'] : null;
+
+               // UNIX timestamp values
                $schedtime_from = $this->Request->contains('schedtime_from') && $misc->isValidInteger($this->Request['schedtime_from']) ? (int)$this->Request['schedtime_from'] : null;
                $schedtime_to = $this->Request->contains('schedtime_to') && $misc->isValidInteger($this->Request['schedtime_to']) ? (int)$this->Request['schedtime_to'] : null;
                $starttime_from = $this->Request->contains('starttime_from') && $misc->isValidInteger($this->Request['starttime_from']) ? (int)$this->Request['starttime_from'] : null;
@@ -61,6 +63,19 @@ class JobsObjects extends BaculumAPIServer {
                $realstarttime_to = $this->Request->contains('realstarttime_to') && $misc->isValidInteger($this->Request['realstarttime_to']) ? (int)$this->Request['realstarttime_to'] : null;
                $realendtime_from = $this->Request->contains('realendtime_from') && $misc->isValidInteger($this->Request['realendtime_from']) ? (int)$this->Request['realendtime_from'] : null;
                $realendtime_to = $this->Request->contains('realendtime_to') && $misc->isValidInteger($this->Request['realendtime_to']) ? (int)$this->Request['realendtime_to'] : null;
+
+               // date/time values
+               $schedtime_from_date = $this->Request->contains('schedtime_from_date') && $misc->isValidBDateAndTime($this->Request['schedtime_from_date']) ? $this->Request['schedtime_from_date'] : null;
+               $schedtime_to_date = $this->Request->contains('schedtime_to_date') && $misc->isValidBDateAndTime($this->Request['schedtime_to_date']) ? $this->Request['schedtime_to_date'] : null;
+               $starttime_from_date = $this->Request->contains('starttime_from_date') && $misc->isValidBDateAndTime($this->Request['starttime_from_date']) ? $this->Request['starttime_from_date'] : null;
+               $starttime_to_date = $this->Request->contains('starttime_to_date') && $misc->isValidBDateAndTime($this->Request['starttime_to_date']) ? $this->Request['starttime_to_date'] : null;
+               $endtime_from_date = $this->Request->contains('endtime_from_date') && $misc->isValidBDateAndTime($this->Request['endtime_from_date']) ? $this->Request['endtime_from_date'] : null;
+               $endtime_to_date = $this->Request->contains('endtime_to_date') && $misc->isValidBDateAndTime($this->Request['endtime_to_date']) ? $this->Request['endtime_to_date'] : null;
+               $realstarttime_from_date = $this->Request->contains('realstarttime_from_date') && $misc->isValidBDateAndTime($this->Request['realstarttime_from_date']) ? $this->Request['realstarttime_from_date'] : null;
+               $realstarttime_to_date = $this->Request->contains('realstarttime_to_date') && $misc->isValidBDateAndTime($this->Request['realstarttime_to_date']) ? $this->Request['realstarttime_to_date'] : null;
+               $realendtime_from_date = $this->Request->contains('realendtime_from_date') && $misc->isValidBDateAndTime($this->Request['realendtime_from_date']) ? $this->Request['realendtime_from_date'] : null;
+               $realendtime_to_date = $this->Request->contains('realendtime_to_date') && $misc->isValidBDateAndTime($this->Request['realendtime_to_date']) ? $this->Request['realendtime_to_date'] : null;
+
                $age = $this->Request->contains('age') && $misc->isValidInteger($this->Request['age']) ? (int)$this->Request['age'] : null;
                $order_by = $this->Request->contains('order_by') && $misc->isValidColumn($this->Request['order_by']) ? $this->Request['order_by']: 'EndTime';
                $order_direction = $this->Request->contains('order_direction') && $misc->isValidOrderDirection($this->Request['order_direction']) ? $this->Request['order_direction']: 'DESC';
@@ -172,35 +187,67 @@ class JobsObjects extends BaculumAPIServer {
                }
 
                // Scheduled time range
-               if (!empty($schedtime_from) || !empty($schedtime_to)) {
+               if (!empty($schedtime_from) || !empty($schedtime_to) || !empty($schedtime_from_date) || !empty($schedtime_to_date)) {
                        $params['Job.SchedTime'] = [];
+
+                       // Schedule time from
+                       $sch_t_from = '';
                        if (!empty($schedtime_from)) {
+                               $sch_t_from = date('Y-m-d H:i:s', $schedtime_from);
+                       } elseif (!empty($schedtime_from_date)) {
+                               $sch_t_from = $schedtime_from_date;
+                       }
+                       if (!empty($sch_t_from)) {
                                $params['Job.SchedTime'][] = [
                                        'operator' => '>=',
-                                       'vals' => date('Y-m-d H:i:s', $schedtime_from)
+                                       'vals' => $sch_t_from
                                ];
                        }
+
+                       // Schedule time to
+                       $sch_t_to = '';
                        if (!empty($schedtime_to)) {
+                               $sch_t_to = date('Y-m-d H:i:s', $schedtime_to);
+                       } elseif (!empty($schedtime_to_date)) {
+                               $sch_t_to = $schedtime_to_date;
+                       }
+                       if (!empty($sch_t_to)) {
                                $params['Job.SchedTime'][] = [
                                        'operator' => '<=',
-                                       'vals' => date('Y-m-d H:i:s', $schedtime_to)
+                                       'vals' => $sch_t_to
                                ];
                        }
                }
 
                // Start time range
-               if (!empty($starttime_from) || !empty($starttime_to)) {
+               if (!empty($starttime_from) || !empty($starttime_to) || !empty($starttime_from_date) || !empty($starttime_to_date)) {
                        $params['Job.StartTime'] = [];
+
+                       // Start time from
+                       $sta_t_from = '';
                        if (!empty($starttime_from)) {
+                               $sta_t_from = date('Y-m-d H:i:s', $starttime_from);
+                       } elseif (!empty($starttime_from_date)) {
+                               $sta_t_from = $starttime_from_date;
+                       }
+                       if (!empty($sta_t_from)) {
                                $params['Job.StartTime'][] = [
                                        'operator' => '>=',
-                                       'vals' => date('Y-m-d H:i:s', $starttime_from)
+                                       'vals' => $sta_t_from
                                ];
                        }
+
+                       // Start time to
+                       $sta_t_to = '';
                        if (!empty($starttime_to)) {
+                               $sta_t_to = date('Y-m-d H:i:s', $starttime_to);
+                       } elseif (!empty($starttime_to_date)) {
+                               $sta_t_to = $starttime_to_date;
+                       }
+                       if (!empty($sta_t_to)) {
                                $params['Job.StartTime'][] = [
                                        'operator' => '<=',
-                                       'vals' => date('Y-m-d H:i:s', $starttime_to)
+                                       'vals' => $sta_t_to
                                ];
                        }
                } elseif (!empty($age)) { // Job age (now() - age)
@@ -212,52 +259,100 @@ class JobsObjects extends BaculumAPIServer {
                }
 
                // End time range
-               if (!empty($endtime_from) || !empty($endtime_to)) {
+               if (!empty($endtime_from) || !empty($endtime_to) || !empty($endtime_from_date) || !empty($endtime_to_date)) {
                        $params['Job.EndTime'] = [];
+
+                       // End time from
+                       $end_t_from = '';
                        if (!empty($endtime_from)) {
+                               $end_t_from = date('Y-m-d H:i:s', $endtime_from);
+                       } elseif (!empty($endtime_from_date)) {
+                               $end_t_from = $endtime_from_date;
+                       }
+                       if (!empty($end_t_from)) {
                                $params['Job.EndTime'][] = [
                                        'operator' => '>=',
-                                       'vals' => date('Y-m-d H:i:s', $endtime_from)
+                                       'vals' => $end_t_from
                                ];
                        }
+
+                       // End time to
+                       $end_t_to = '';
                        if (!empty($endtime_to)) {
+                               $end_t_to = date('Y-m-d H:i:s', $endtime_to);
+                       } elseif (!empty($endtime_to_date)) {
+                               $end_t_to = $endtime_to_date;
+                       }
+                       if (!empty($end_t_to)) {
                                $params['Job.EndTime'][] = [
                                        'operator' => '<=',
-                                       'vals' => date('Y-m-d H:i:s', $endtime_to)
+                                       'vals' => $end_t_to
                                ];
                        }
                }
 
                // Real start time range
-               if (!empty($realstarttime_from) || !empty($realstarttime_to)) {
+               if (!empty($realstarttime_from) || !empty($realstarttime_to) || !empty($realstarttime_from_date) || !empty($realstarttime_to_date)) {
                        $params['Job.RealStartTime'] = [];
+
+                       // Realstart time from
+                       $realstart_t_from = '';
                        if (!empty($realstarttime_from)) {
+                               $realstart_t_from = date('Y-m-d H:i:s', $realstarttime_from);
+                       } elseif (!empty($realstarttime_from_date)) {
+                               $realstart_t_from = $realstarttime_from_date;
+                       }
+                       if (!empty($realstart_t_from)) {
                                $params['Job.RealStartTime'][] = [
                                        'operator' => '>=',
-                                       'vals' => date('Y-m-d H:i:s', $realstarttime_from)
+                                       'vals' => $realstart_t_from
                                ];
                        }
+
+                       // Realstart time to
+                       $realstart_t_to = '';
                        if (!empty($realstarttime_to)) {
+                               $realstart_t_to = date('Y-m-d H:i:s', $realstarttime_to);
+                       } elseif (!empty($realstarttime_to_date)) {
+                               $realstart_t_to = $realstarttime_to_date;
+                       }
+                       if (!empty($realstart_t_to)) {
                                $params['Job.RealStartTime'][] = [
                                        'operator' => '<=',
-                                       'vals' => date('Y-m-d H:i:s', $realstarttime_to)
+                                       'vals' => $realstart_t_to
                                ];
                        }
                }
 
                // Real end time range
-               if (!empty($realendtime_from) || !empty($realendtime_to)) {
+               if (!empty($realendtime_from) || !empty($realendtime_to) || !empty($realendtime_from_date) || !empty($realendtime_to_date)) {
                        $params['Job.RealEndTime'] = [];
+
+                       // Realend time from
+                       $realend_t_from = '';
                        if (!empty($realendtime_from)) {
+                               $realend_t_from = date('Y-m-d H:i:s', $realendtime_from);
+                       } elseif (!empty($realendtime_from_date)) {
+                               $realend_t_from = $realendtime_from_date;
+                       }
+                       if (!empty($realend_t_from)) {
                                $params['Job.RealEndTime'][] = [
                                        'operator' => '>=',
-                                       'vals' => date('Y-m-d H:i:s', $realendtime_from)
+                                       'vals' => $realend_t_from
                                ];
                        }
+
+                       // Realend time to
+                       $realend_t_to = '';
                        if (!empty($realendtime_to)) {
+                               $realend_t_to = date('Y-m-d H:i:s', $realendtime_to);
+                       } elseif (!empty($realendtime_to_date)) {
+                               $realend_t_to = $realendtime_to_date;
+                       }
+                       if (!empty($realend_t_to)) {
                                $params['Job.RealEndTime'][] = [
                                        'operator' => '<=',
-                                       'vals' => date('Y-m-d H:i:s', $realendtime_to)
+                                       'vals' => $realend_t_to
                                ];
                        }
                }

diff --git a/gui/baculum/protected/API/openapi_baculum.json b/gui/baculum/protected/API/openapi_baculum.json
index 7f41fbe7b5b95dd4f453a52aaad402ef361943d6..83c1601cdc4152d336fcb4e3745a624009a6064a 100644 (file)
--- a/gui/baculum/protected/API/openapi_baculum.json
+++ b/gui/baculum/protected/API/openapi_baculum.json
@@ -2178,6 +2178,15 @@
                                                        "type": "integer"
                                                }
                                        },
+                                       {
+                                               "name": "schedtime_from_date",
+                                               "in": "query",
+                                               "required": false,
+                                               "description": "Scheduled time from (date/time format YYYY-MM-DD HH:II:SS)",
+                                               "schema": {
+                                                       "type": "string"
+                                               }
+                                       },
                                        {
                                                "name": "schedtime_to",
                                                "in": "query",
@@ -2187,6 +2196,15 @@
                                                        "type": "integer"
                                                }
                                        },
+                                       {
+                                               "name": "schedtime_to_date",
+                                               "in": "query",
+                                               "required": false,
+                                               "description": "Scheduled time to (date/time format YYYY-MM-DD HH:II:SS)",
+                                               "schema": {
+                                                       "type": "string"
+                                               }
+                                       },
                                        {
                                                "name": "starttime_from",
                                                "in": "query",
@@ -2196,6 +2214,15 @@
                                                        "type": "integer"
                                                }
                                        },
+                                       {
+                                               "name": "starttime_from_date",
+                                               "in": "query",
+                                               "required": false,
+                                               "description": "Start time from (date/time format YYYY-MM-DD HH:II:SS)",
+                                               "schema": {
+                                                       "type": "string"
+                                               }
+                                       },
                                        {
                                                "name": "starttime_to",
                                                "in": "query",
@@ -2205,6 +2232,15 @@
                                                        "type": "integer"
                                                }
                                        },
+                                       {
+                                               "name": "starttime_to_date",
+                                               "in": "query",
+                                               "required": false,
+                                               "description": "Start time to (date/time format YYYY-MM-DD HH:II:SS)",
+                                               "schema": {
+                                                       "type": "string"
+                                               }
+                                       },
                                        {
                                                "name": "realstarttime_from",
                                                "in": "query",
@@ -2214,6 +2250,15 @@
                                                        "type": "integer"
                                                }
                                        },
+                                       {
+                                               "name": "realstarttime_from_date",
+                                               "in": "query",
+                                               "required": false,
+                                               "description": "Real start time from (date/time format YYYY-MM-DD HH:II:SS)",
+                                               "schema": {
+                                                       "type": "string"
+                                               }
+                                       },
                                        {
                                                "name": "realstarttime_to",
                                                "in": "query",
@@ -2223,6 +2268,15 @@
                                                        "type": "integer"
                                                }
                                        },
+                                       {
+                                               "name": "realstarttime_to_date",
+                                               "in": "query",
+                                               "required": false,
+                                               "description": "Real start time to (date/time format YYYY-MM-DD HH:II:SS)",
+                                               "schema": {
+                                                       "type": "string"
+                                               }
+                                       },
                                        {
                                                "name": "endtime_from",
                                                "in": "query",
@@ -2232,6 +2286,15 @@
                                                        "type": "integer"
                                                }
                                        },
+                                       {
+                                               "name": "endtime_from_date",
+                                               "in": "query",
+                                               "required": false,
+                                               "description": "End time from (date/time format YYYY-MM-DD HH:II:SS)",
+                                               "schema": {
+                                                       "type": "string"
+                                               }
+                                       },
                                        {
                                                "name": "endtime_to",
                                                "in": "query",
@@ -2241,6 +2304,15 @@
                                                        "type": "integer"
                                                }
                                        },
+                                       {
+                                               "name": "endtime_to_date",
+                                               "in": "query",
+                                               "required": false,
+                                               "description": "End time to (date/time format YYYY-MM-DD HH:II:SS)",
+                                               "schema": {
+                                                       "type": "string"
+                                               }
+                                       },
                                        {
                                                "name": "realendtime_from",
                                                "in": "query",
@@ -2250,6 +2322,15 @@
                                                        "type": "integer"
                                                }
                                        },
+                                       {
+                                               "name": "realendtime_from_date",
+                                               "in": "query",
+                                               "required": false,
+                                               "description": "Real end time from (date/time format YYYY-MM-DD HH:II:SS)",
+                                               "schema": {
+                                                       "type": "string"
+                                               }
+                                       },
                                        {
                                                "name": "realendtime_to",
                                                "in": "query",
@@ -2259,6 +2340,15 @@
                                                        "type": "integer"
                                                }
                                        },
+                                       {
+                                               "name": "realendtime_to_date",
+                                               "in": "query",
+                                               "required": false,
+                                               "description": "Real end time to (date/time format YYYY-MM-DD HH:II:SS)",
+                                               "schema": {
+                                                       "type": "string"
+                                               }
+                                       },
                                        {
 
                                                "name": "age",