From 8f95afb582b95125274791b5e0e738bc0dd9771b Mon Sep 17 00:00:00 2001 From: Matheus Garcia Date: Mon, 3 Jun 2019 12:00:16 -0300 Subject: [PATCH] =?UTF-8?q?Commit=20de=20altera=C3=A7=C3=B5es=20em=20andam?= =?UTF-8?q?ento?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/observer.php | 4 +-- classes/task/escola_modelo.php | 12 ++++----- classes/util.php | 2 +- db/services.php | 42 ++++++++++++++++++++++++++++++ externallib.php | 45 +++++++++++++++++++++++++++++++++ {classes => lib}/httpful.phar | Bin version.php | 2 +- 7 files changed, 97 insertions(+), 10 deletions(-) create mode 100644 db/services.php create mode 100644 externallib.php rename {classes => lib}/httpful.phar (100%) diff --git a/classes/observer.php b/classes/observer.php index a4a0adf..9f258dc 100644 --- a/classes/observer.php +++ b/classes/observer.php @@ -2,8 +2,8 @@ require_once($CFG->dirroot.'/config.php'); -include('httpful.phar'); -include('util.php'); +include_once('../lib/httpful.phar'); +include_once('util.php'); class block_escola_modelo_observer { diff --git a/classes/task/escola_modelo.php b/classes/task/escola_modelo.php index 515815a..84a013b 100644 --- a/classes/task/escola_modelo.php +++ b/classes/task/escola_modelo.php @@ -49,10 +49,10 @@ class escola_modelo extends \core\task\scheduled_task { ?::varchar as url_escola, c.fullname as nome_escola, (? || \'/pluginfile.php/1/core_admin/logocompact/0x150/-1\' || logo.value)::varchar as url_logo_escola - FROM mdl_course c + FROM {course} c JOIN ( SELECT value - FROM mdl_config_plugins + FROM {config_plugins} WHERE plugin = \'core_admin\' AND name = \'logocompact\' ) logo @@ -83,8 +83,8 @@ class escola_modelo extends \core\task\scheduled_task { FROM {course} c LEFT JOIN {ilb_sync_course} sc ON c.id = sc.course_id - WHERE sc.course_id is null - OR c.timemodified > sc.time_sync + WHERE (sc.course_id is null + OR c.timemodified > sc.time_sync) '; $listaCursos = $DB->get_records_sql($sqlCourses,array()); @@ -134,8 +134,8 @@ class escola_modelo extends \core\task\scheduled_task { SELECT c.id as courseid, u.username, ci.timecreated, gg.finalgrade, ci.code, cert.id FROM ( SELECT ci.timecreated, sc.time_sync, ci.code, ci.certificateid, ci.userid - FROM mdl_certificate_issues ci - LEFT JOIN mdl_ilb_sync_certificate sc + FROM {certificate_issues} ci + LEFT JOIN {ilb_sync_certificate} sc ON ci.id = sc.certificate_id WHERE sc.time_sync is null OR ci.timecreated > sc.time_sync diff --git a/classes/util.php b/classes/util.php index c29a87c..29fd80a 100644 --- a/classes/util.php +++ b/classes/util.php @@ -4,7 +4,7 @@ */ require_once($CFG->dirroot.'/config.php'); -include('httpful.phar'); +include_once('../lib/httpful.phar'); /** * Verifica se um curso é público, conforme critérios da EVL. diff --git a/db/services.php b/db/services.php new file mode 100644 index 0000000..242dc73 --- /dev/null +++ b/db/services.php @@ -0,0 +1,42 @@ +. + +/** + * External functions and service definitions. + */ + +// We define the services to install as pre-build services. A pre-build service is not editable by administrator. +$services = array( + 'Escola Modelo Service' => array( + 'functions' => array ( + 'block_escola_modelo_get_usage_statistics' + ), + 'restrictedusers' => 0, + 'enabled'=>1, + ) +); + +// We defined the web service functions to install. +$functions = array( + 'block_escola_modelo_get_usage_statistics' => array( + 'classname' => 'block_escola_modelo_external', + 'methodname' => 'get_usage_statistics', + 'classpath' => 'block/escola_modelo/externallib.php', + 'description' => 'Returns user statistics from this moodle installation', + 'type' => 'read', + ), +); + + diff --git a/externallib.php b/externallib.php new file mode 100644 index 0000000..2369876 --- /dev/null +++ b/externallib.php @@ -0,0 +1,45 @@ +. + +/** + * External Web Service Template + * + * @package localws_evl + * @copyright 2011 Moodle Pty Ltd (http://moodle.com) + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +require_once($CFG->libdir . "/externallib.php"); + +class block_escola_modelo_external extends external_api { + + public static function get_usage_statistics() { + global $USER; + + return '{"cursos": "10", "alunos":"20", "certificados":"12"}'; + } + + public static function get_usage_statistics_parameters() { + return new external_function_parameters( + array() + ); + } + + public static function get_usage_statistics_returns() { + return new external_value(PARAM_TEXT, 'JSON with statistics of this installation'); + } + + + +} diff --git a/classes/httpful.phar b/lib/httpful.phar similarity index 100% rename from classes/httpful.phar rename to lib/httpful.phar diff --git a/version.php b/version.php index 6a0008c..597799b 100644 --- a/version.php +++ b/version.php @@ -1,5 +1,5 @@ version = 2019012101; +$plugin->version = 2019012102; $plugin->requires = 2017110800; $plugin->component = 'block_escola_modelo'; \ No newline at end of file