-
+
{{> block_myoverview/timeline-view }}
-
+
{{#coursesview}}
{{> block_myoverview/courses-view }}
{{/coursesview}}
+{{#js}}
+require(['jquery', 'block_myoverview/tab_preferences'], function($, TabPreferences) {
+ var root = $('#block-myoverview-view-choices-{{uniqid}}');
+ TabPreferences.registerEventListeners(root);
+});
+{{/js}}
diff --git a/theme/bootstrapbase/templates/core/availability_info.mustache b/theme/bootstrapbase/templates/core/availability_info.mustache
index fd81eb50ea1..ee90c956307 100644
--- a/theme/bootstrapbase/templates/core/availability_info.mustache
+++ b/theme/bootstrapbase/templates/core/availability_info.mustache
@@ -15,13 +15,47 @@
along with Moodle. If not, see
.
}}
{{!
- Availability info.
+ @template core/availability_info
+
+ Renders the availability info on the course outline page.
+
+ Availability info can be displayed for activity modules or whole course
+ sections. Activity modules can be either hidden from students, or available
+ but not shown on course page (stealth), or the access can be restricted by
+ configured conditions. Sections can be hidden.
+
+ Classes required for JS:
+ * none
+
+ Data attributes required for JS:
+ * none
+
+ Context variables required for this template:
+ * classes String list of CSS classes for the wrapping element
+ * text HTML formatted text with the actual availability information
+ * ishidden Boolean flag indiciating that the item is hidden from students
+ * isstealth Boolean flag indicating that the item is in stealth mode
+ * isrestricted Boolean flag indicating that restricted access conditions apply
+ * isfullinfo Boolean flag indicating that the full list of restricted
+ access conditions is displayed (aka teacher's view).
Example context (json):
- { "classes": "", "text": "This activity is not available" }
+ {
+ "classes": "",
+ "text": "Not available unless:
- It is on or after 8 June 2012
",
+ "ishidden": 0,
+ "isstealth": 0,
+ "isrestricted": 1,
+ "isfullinfo": 1
+ }
}}
{{#text}}
+ {{^isrestricted}}
{{{text}}}
+ {{/isrestricted}}
+ {{#isrestricted}}
+ {{#str}}restricted, core{{/str}} {{{text}}}
+ {{/isrestricted}}
{{/text}}
diff --git a/user/externallib.php b/user/externallib.php
index 5ead62ce4e9..2eea9f32a06 100644
--- a/user/externallib.php
+++ b/user/externallib.php
@@ -1860,4 +1860,76 @@ class core_user_external extends external_api {
)
);
}
+
+ /**
+ * Returns description of method parameters.
+ *
+ * @return external_function_parameters
+ * @since Moodle 3.4
+ */
+ public static function get_private_files_info_parameters() {
+ return new external_function_parameters(
+ array(
+ 'userid' => new external_value(PARAM_INT, 'Id of the user, default to current user.', VALUE_DEFAULT, 0)
+ )
+ );
+ }
+
+ /**
+ * Returns general information about files in the user private files area.
+ *
+ * @param int $userid Id of the user, default to current user.
+ * @return array of warnings and file area information
+ * @since Moodle 3.4
+ * @throws moodle_exception
+ */
+ public static function get_private_files_info($userid = 0) {
+ global $CFG, $USER;
+ require_once($CFG->libdir . '/filelib.php');
+
+ $params = self::validate_parameters(self::get_private_files_info_parameters(), array('userid' => $userid));
+ $warnings = array();
+
+ $context = context_system::instance();
+ self::validate_context($context);
+
+ if (empty($params['userid']) || $params['userid'] == $USER->id) {
+ $usercontext = context_user::instance($USER->id);
+ require_capability('moodle/user:manageownfiles', $usercontext);
+ } else {
+ $user = core_user::get_user($params['userid'], '*', MUST_EXIST);
+ core_user::require_active_user($user);
+ // Only admins can retrieve other users information.
+ require_capability('moodle/site:config', $context);
+ $usercontext = context_user::instance($user->id);
+ }
+
+ $fileareainfo = file_get_file_area_info($usercontext->id, 'user', 'private');
+
+ $result = array();
+ $result['filecount'] = $fileareainfo['filecount'];
+ $result['foldercount'] = $fileareainfo['foldercount'];
+ $result['filesize'] = $fileareainfo['filesize'];
+ $result['filesizewithoutreferences'] = $fileareainfo['filesize_without_references'];
+ $result['warnings'] = $warnings;
+ return $result;
+ }
+
+ /**
+ * Returns description of method result value.
+ *
+ * @return external_description
+ * @since Moodle 3.4
+ */
+ public static function get_private_files_info_returns() {
+ return new external_single_structure(
+ array(
+ 'filecount' => new external_value(PARAM_INT, 'Number of files in the area.'),
+ 'foldercount' => new external_value(PARAM_INT, 'Number of folders in the area.'),
+ 'filesize' => new external_value(PARAM_INT, 'Total size of the files in the area.'),
+ 'filesizewithoutreferences' => new external_value(PARAM_INT, 'Total size of the area excluding file references'),
+ 'warnings' => new external_warnings()
+ )
+ );
+ }
}
diff --git a/user/files.php b/user/files.php
index 32c99f4f244..dadaf619d94 100644
--- a/user/files.php
+++ b/user/files.php
@@ -82,6 +82,20 @@ if ($mform->is_cancelled()) {
echo $OUTPUT->header();
echo $OUTPUT->box_start('generalbox');
+// Show file area space usage.
+if ($maxareabytes != FILE_AREA_MAX_BYTES_UNLIMITED) {
+ $fileareainfo = file_get_file_area_info($context->id, 'user', 'private');
+ // Display message only if we have files.
+ if ($fileareainfo['filecount']) {
+ $a = (object) [
+ 'used' => display_size($fileareainfo['filesize_without_references']),
+ 'total' => display_size($maxareabytes)
+ ];
+ $quotamsg = get_string('quotausage', 'moodle', $a);
+ $notification = new \core\output\notification($quotamsg, \core\output\notification::NOTIFY_INFO);
+ echo $OUTPUT->render($notification);
+ }
+}
$mform->display();
echo $OUTPUT->box_end();
diff --git a/user/tests/externallib_test.php b/user/tests/externallib_test.php
index be52830487f..cf04d56f3f5 100644
--- a/user/tests/externallib_test.php
+++ b/user/tests/externallib_test.php
@@ -1148,6 +1148,60 @@ class core_user_externallib_testcase extends externallib_advanced_testcase {
} catch (Exception $e) {
$this->fail('Expecting \'usernotfullysetup\' moodle_exception to be thrown.');
}
+ }
+ /**
+ * Test get_private_files_info
+ */
+ public function test_get_private_files_info() {
+
+ $this->resetAfterTest(true);
+ $user = self::getDataGenerator()->create_user();
+ $this->setUser($user);
+ $usercontext = context_user::instance($user->id);
+
+ $filerecord = array(
+ 'contextid' => $usercontext->id,
+ 'component' => 'user',
+ 'filearea' => 'private',
+ 'itemid' => 0,
+ 'filepath' => '/',
+ 'filename' => 'thefile',
+ );
+
+ $fs = get_file_storage();
+ $file = $fs->create_file_from_string($filerecord, 'abc');
+
+ // Get my private files information.
+ $result = core_user_external::get_private_files_info();
+ $result = external_api::clean_returnvalue(core_user_external::get_private_files_info_returns(), $result);
+ $this->assertEquals(1, $result['filecount']);
+ $this->assertEquals($file->get_filesize(), $result['filesize']);
+ $this->assertEquals(0, $result['foldercount']);
+ $this->assertEquals($file->get_filesize(), $result['filesizewithoutreferences']);
+
+ // As admin, get user information.
+ $this->setAdminUser();
+ $result = core_user_external::get_private_files_info($user->id);
+ $result = external_api::clean_returnvalue(core_user_external::get_private_files_info_returns(), $result);
+ $this->assertEquals(1, $result['filecount']);
+ $this->assertEquals($file->get_filesize(), $result['filesize']);
+ $this->assertEquals(0, $result['foldercount']);
+ $this->assertEquals($file->get_filesize(), $result['filesizewithoutreferences']);
+ }
+
+ /**
+ * Test get_private_files_info missing permissions.
+ */
+ public function test_get_private_files_info_missing_permissions() {
+
+ $this->resetAfterTest(true);
+ $user1 = self::getDataGenerator()->create_user();
+ $user2 = self::getDataGenerator()->create_user();
+ $this->setUser($user1);
+
+ $this->setExpectedException('required_capability_exception');
+ // Try to retrieve other user private files info.
+ core_user_external::get_private_files_info($user2->id);
}
}
diff --git a/version.php b/version.php
index 03d7d5bc552..acf34f561cb 100644
--- a/version.php
+++ b/version.php
@@ -29,11 +29,11 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2017061600.00; // YYYYMMDD = weekly release date of this DEV branch.
+$version = 2017062200.00; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.
-$release = '3.4dev (Build: 20170616)'; // Human-friendly version name
+$release = '3.4dev (Build: 20170622)'; // Human-friendly version name
$branch = '34'; // This version's branch.
$maturity = MATURITY_ALPHA; // This version's maturity level.
diff --git a/webservice/externallib.php b/webservice/externallib.php
index 84b0fd4b40d..b091147691e 100644
--- a/webservice/externallib.php
+++ b/webservice/externallib.php
@@ -197,6 +197,14 @@ class core_webservice_external extends external_api {
// User home page.
$siteinfo['userhomepage'] = get_home_page();
+ // Calendar.
+ $siteinfo['sitecalendartype'] = $CFG->calendartype;
+ if (empty($USER->calendartype)) {
+ $siteinfo['usercalendartype'] = $CFG->calendartype;
+ } else {
+ $siteinfo['usercalendartype'] = $USER->calendartype;
+ }
+
return $siteinfo;
}
@@ -259,7 +267,9 @@ class core_webservice_external extends external_api {
'userhomepage' => new external_value(PARAM_INT,
'the default home page for the user: 0 for the site home, 1 for dashboard',
VALUE_OPTIONAL),
- 'siteid' => new external_value(PARAM_INT, 'Site course ID', VALUE_OPTIONAL)
+ 'siteid' => new external_value(PARAM_INT, 'Site course ID', VALUE_OPTIONAL),
+ 'sitecalendartype' => new external_value(PARAM_PLUGIN, 'Calendar type set in the site.', VALUE_OPTIONAL),
+ 'usercalendartype' => new external_value(PARAM_PLUGIN, 'Calendar typed used by the user.', VALUE_OPTIONAL),
)
);
}
diff --git a/webservice/tests/externallib_test.php b/webservice/tests/externallib_test.php
index f845b622b2b..b5bea8ddb23 100644
--- a/webservice/tests/externallib_test.php
+++ b/webservice/tests/externallib_test.php
@@ -122,6 +122,12 @@ class core_webservice_externallib_testcase extends externallib_advanced_testcase
$this->assertEquals(true, $siteinfo['usercanmanageownfiles']);
$this->assertEquals(HOMEPAGE_MY, $siteinfo['userhomepage']);
+ $this->assertEquals($CFG->calendartype, $siteinfo['sitecalendartype']);
+ if (!empty($USER->calendartype)) {
+ $this->assertEquals($USER->calendartype, $siteinfo['usercalendartype']);
+ } else {
+ $this->assertEquals($CFG->calendartype, $siteinfo['usercalendartype']);
+ }
// Now as admin.
$this->setAdminUser();
diff --git a/webservice/upgrade.txt b/webservice/upgrade.txt
index 895a5f90a57..2301a7c6e24 100644
--- a/webservice/upgrade.txt
+++ b/webservice/upgrade.txt
@@ -3,6 +3,11 @@ information provided here is intended especially for developers.
This information is intended for authors of webservices, not people writing webservice clients.
+=== 3.4 ===
+
+* External function core_webservice_external::get_site_info() now returns the calendar type used in the site and
+ by the user in the sitecalendartype and usercalendartype fields.
+
=== 3.2 ===
* webservice->get_external_functions now returns the external function list ordered by name ASC.