From bdb5511e1e5d8fd2800a4cb0766ab1936f5d1950 Mon Sep 17 00:00:00 2001 From: Roberto Hueso Gómez Date: Thu, 5 Mar 2020 13:52:08 +0100 Subject: #942 Adapt web to use /schedule get on /schedule/create (web) --- admin/WebConsole/gestores/gestor_programaciones.php | 2 ++ admin/WebConsole/includes/restfunctions.php | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/admin/WebConsole/gestores/gestor_programaciones.php b/admin/WebConsole/gestores/gestor_programaciones.php index 2edbe373..814f98a1 100644 --- a/admin/WebConsole/gestores/gestor_programaciones.php +++ b/admin/WebConsole/gestores/gestor_programaciones.php @@ -86,6 +86,8 @@ if($pswop!=$op_suspension){ $pnombrebloque, $pannos, $pmeses, $pdiario, $phoras, $pampm, $pminutos); $swop=$op_alta; + $schedule = get_schedule($pidentificador); + $idr = max(array_keys($schedule)); break; case $op_eliminacion: $result = delete_schedule($pidprogramacion); diff --git a/admin/WebConsole/includes/restfunctions.php b/admin/WebConsole/includes/restfunctions.php index b6729345..a748ef9a 100644 --- a/admin/WebConsole/includes/restfunctions.php +++ b/admin/WebConsole/includes/restfunctions.php @@ -30,6 +30,7 @@ define('OG_REST_CMD_RUN_TASK', 'task/run'); define('OG_REST_CMD_CREATE_SCHEDULE', 'schedule/create'); define('OG_REST_CMD_DELETE_SCHEDULE', 'schedule/delete'); define('OG_REST_CMD_UPDATE_SCHEDULE', 'schedule/update'); +define('OG_REST_CMD_SCHEDULE', 'schedule'); define('OG_REST_PARAM_CLIENTS', 'clients'); define('OG_REST_PARAM_ADDR', 'addr'); @@ -618,6 +619,16 @@ function update_schedule($schedule_id, $task_id, $name, $years, $months, $days, return common_request(OG_REST_CMD_UPDATE_SCHEDULE, POST, $data); } +function get_schedule($task_id = null) { + if (isset($task_id)) + $data = array(OG_REST_PARAM_TASK => strval($task_id)); + else + $data = null; + + $result = common_request(OG_REST_CMD_SCHEDULE, POST, $data); + return $result; +} + /* * @function multiRequest. * @param URLs array (may include header and POST data), cURL options array. -- cgit v1.2.3-18-g5258