Commit a10a99f5 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge changes from topic 'Analytics'

* changes:
  Bug 1692385: Make time column be ctime column on install
  Bug 1724113: Fixing sort order for Reports -> Groups
  Bug 1720883 - Correctly show earliest date for all institutions
  Bug 1724113: Fixing up portfolio access secret URL count
  Bug 1718602: Using correct header
  Bug 1724113: More fixes for reports
  Bug 1724113: Add more help files
  Bug 1724113: Changes for reports
parents 3e69f9e1 7a2f5e10
......@@ -754,7 +754,7 @@ $siteoptionform = array(
'eventlogenhancedsearch' => array(
'type' => 'switchbox',
'title' => get_string('eventlogenhancedsearch', 'admin'),
'description' => get_string('eventlogenhancedsearchdescription', 'admin'),
'description' => get_string('eventlogenhancedsearchdescription1', 'admin'),
'defaultvalue' => get_config('eventlogenhancedsearch'),
'help' => true,
'disabled' => (get_config('searchplugin') != 'elasticsearch' || in_array('eventlogenhancedsearch', $OVERRIDDEN)),
......
......@@ -58,14 +58,14 @@ if ($usersparam = param_variable('users', null)) {
}
define('PAGEHEADINGARROW', get_string('reports', 'statistics'));
$type = param_alpha('type', 'users');
$type = param_alpha('type', 'information');
$subtype = param_alpha('subtype', '');
if (isset($institution)) {
if (!$USER->get('admin') && !$USER->is_institutional_admin($institution) &&
$USER->is_institutional_staff($institution) && empty(get_config('staffstats')) && !empty(get_config('staffreports'))) {
// we need to give them the correct default report
$subtype = !empty($subtype) ? $subtype : 'userdetails';
$subtype = !empty($subtype) ? $subtype : 'information';
}
}
......
......@@ -473,7 +473,7 @@ $string['eventloglevelnone'] = 'None';
$string['eventloglevelmasq'] = 'Masquerading';
$string['eventloglevelall'] = 'All';
$string['eventlogenhancedsearch'] = 'Event log reporting';
$string['eventlogenhancedsearchdescription'] = 'This is required if you want to use the advanced analytics features in order to report over more activity on your site.';
$string['eventlogenhancedsearchdescription1'] = 'This is required if you want to use the advanced analytics features in order to report over more activity on your site. You also need to enable Elasticsearch in the "Search Settings".';
$string['sitefilesaccess'] = 'Access to site files';
$string['sitefilesaccessdescription1'] = 'Allow registered users to access site files in subfolders. By default, only files in the top level directory are accessible to them.';
$string['watchlistdelaydescription'] = 'The delay in minutes between sending emails regarding watchlist changes.';
......
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Access list</h3>
<p>
Listed are the people, institutions, and groups that have access to the portfolio that was created during the selected time frame.</p>
<p>The number of secret URLs is also listed, but for privacy reasons, the URLs are not shown themselves.
</p>
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Pages</h3>
<p>
The number of pages contained in the portfolio that was created during the selected time frame.
</p>
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Owner</h3>
<p>
The person who created a portfolio during the selected time frame.
</p>
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Page / collection</h3>
<p>
The portfolio that was created during the selected time frame.
</p>
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Comments</h3>
<h3>Institutions</h3>
<p>
Sum of all portfolios shared with an institution during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Registered users</h3>
<p>
Sum of all portfolios shared with registered user during the selected time period.
Sum of all portfolios shared with registered users during the selected time period.
</p>
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Artefacts</h3>
<p>
Number of artefacts created by institution members during the selected time frame.
</p>
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Blocks</h3>
<p>
Number of blocks created by institution members during the selected time frame.
</p>
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Members</h3>
<p>
Number of members in an institution during the selected time frame.
</p>
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Forum posts</h3>
<p>
Number of forum posts created by institution members during the selected time frame.
</p>
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Pages</h3>
<p>
Number of pages in an institution during the selected time frame.
</p>
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Modified</h3>
<p>
Sum of all items that were modified during the selected time frame.
</p>
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Name</h3>
<p>
Name of the content item.
</p>
<p>When you view this report for "All institutions", it also includes a number of site-wide configuration settings, but it doesn't include individual block types. These can be viewed when you select individual institutions.</p>
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Total</h3>
<p>
Sum of all items that are in the institution or the site during the selected time frame.
</p>
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Collections</h3>
<p>
Sum of all collections in a group that was created during the selected time frame.
</p>
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Forums</h3>
<p>
Sum of all forums available in a group that was created during the selected time frame.
</p>
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Group</h3>
<p>
Listed are groups that were created during the selected time frame.
</p>
Markdown is supported
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