WR410672 Merge with the github project

.github/workflows/ci.yml

@@ -0,0 +1,117 @@
+name: Moodle plugin CI
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: 'ubuntu-latest'
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - php: '7.4'
+            moodle-branch: 'master'
+            database: 'pgsql'
+          - php: '7.4'
+            moodle-branch: 'MOODLE_311_STABLE'
+            database: 'mariadb'
+          - php: '7.3'
+            moodle-branch: 'MOODLE_310_STABLE'
+            database: 'pgsql'
+          - php: '7.2'
+            moodle-branch: 'MOODLE_39_STABLE'
+            database: 'mariadb'
+
+    services:
+      postgres:
+        image: postgres:10
+        env:
+          POSTGRES_USER: 'postgres'
+          POSTGRES_HOST_AUTH_METHOD: 'trust'
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 3
+        ports:
+          - 5432:5432
+
+      mariadb:
+        image: mariadb:10.5
+        env:
+          MYSQL_USER: 'root'
+          MYSQL_ALLOW_EMPTY_PASSWORD: "true"
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 3
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          path: plugin
+
+      - name: Install node
+        uses: actions/setup-node@v1
+        with:
+          node-version: '14.15.0'
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: mbstring, pgsql, mysqli
+
+      - name: Deploy moodle-plugin-ci
+        run: |
+          composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3
+          # Add dirs to $PATH
+          echo $(cd ci/bin; pwd) >> $GITHUB_PATH
+          echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH
+          # PHPUnit depends on en_AU.UTF-8 locale
+          sudo locale-gen en_AU.UTF-8
+
+      - name: Install Moodle
+        run: moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
+        env:
+          DB: ${{ matrix.database }}
+          MOODLE_BRANCH: ${{ matrix.moodle-branch }}
+
+      - name: phplint
+        if: ${{ always() }}
+        run: moodle-plugin-ci phplint
+
+      - name: phpcpd
+        if: ${{ always() }}
+        run: moodle-plugin-ci phpcpd
+
+      - name: phpmd
+        if: ${{ always() }}
+        run: moodle-plugin-ci phpmd
+
+      - name: codechecker
+        if: ${{ always() }}
+        run: moodle-plugin-ci codechecker
+
+      - name: validate
+        if: ${{ always() }}
+        run: moodle-plugin-ci validate
+
+      - name: savepoints
+        if: ${{ always() }}
+        run: moodle-plugin-ci savepoints
+
+      - name: mustache
+        if: ${{ always() }}
+        run: moodle-plugin-ci mustache
+
+      - name: grunt
+        if: ${{ matrix.moodle-branch != 'master' }}
+        run: moodle-plugin-ci grunt
+
+      - name: phpunit
+        if: ${{ always() }}
+        run: moodle-plugin-ci phpunit
+
+      - name: behat
+        if: ${{ always() }}
+        run: moodle-plugin-ci behat --profile chrome

addcategory.php

@@ -32,15 +32,10 @@
 require_once(dirname(__FILE__) . '/categoryadd_form.php');
 require_once($CFG->libdir . '/adminlib.php');
 
-require_login();
 $context = context_system::instance();
-$PAGE->set_url(new moodle_url('/report/customsql/addcategory.php'));
-$PAGE->set_context($context);
-
+admin_externalpage_setup('report_customsql', '', null, '/report/customsql/addcategory.php');
 require_capability('report/customsql:managecategories', $context);
 
-admin_externalpage_setup('report_customsql');
-
 $relativeurl = 'addcategory.php';
 
 // Are we editing an existing report, or creating a new one.
@@ -67,7 +62,7 @@
 
 if ($data = $mform->get_data()) {
     if ($isadding) {
-        $DB->insert_record('report_customsql_categories', $data, true);
+        $DB->insert_record('report_customsql_categories', $data);
     } else {
         $updrec = new stdClass();
         $updrec->id = $data->id;

amd/src/reportcategories.js

@@ -0,0 +1,96 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/*
+ * JavaScript to expand/collapse sections.
+ *
+ * @package report_customsql
+ * @copyright 2014 The Open University
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * @module report_customsql/reportcategories
+ */
+define(['jquery'], function($) {
+    /**
+     * @alias module:report_customsql/reportcategories
+     */
+    var t = {
+
+        /**
+         * Initialise the tabs.
+         */
+        init: function() {
+            $('body').on('click', '.csql_category h2 .categoryname, .csql_category h2 .reportcounts', t.expandCollapse);
+            $('.csql_expandcollapseall').on('click', t.expandCollapseAll);
+            t.updateExpandCollapseAll();
+        },
+
+        /**
+         * Event handler for expanding or collapsing one section.
+         *
+         * @param {Event} e DOM event.
+         */
+        expandCollapse: function(e) {
+            var catwrapper = $(e.target).closest('.csql_category');
+            if (catwrapper.length) {
+                if (catwrapper.hasClass('csql_categoryhidden')) {
+                    catwrapper.removeClass('csql_categoryhidden').addClass('csql_categoryshown');
+                } else {
+                    catwrapper.removeClass('csql_categoryshown').addClass('csql_categoryhidden');
+                }
+                e.preventDefault();
+                t.updateExpandCollapseAll();
+            }
+        },
+
+        /**
+         * Event handler for expanding or collapsing one section.
+         *
+         * @param {Event} e DOM event.
+         */
+        expandCollapseAll: function(e) {
+            if ($('.csql_categoryshown').length === 0) {
+                // All categories collapsed, do expand all.
+                $('.csql_category').removeClass('csql_categoryhidden');
+                $('.csql_category').addClass('csql_categoryshown');
+            } else {
+                // All Some categories open, do collapse all.
+                $('.csql_category').removeClass('csql_categoryshown');
+                $('.csql_category').addClass('csql_categoryhidden');
+            }
+            e.preventDefault();
+            t.updateExpandCollapseAll();
+        },
+
+        /**
+         * Update the text of the expand/collpase all link, based
+         * on whether any sections are open.
+         */
+        updateExpandCollapseAll: function() {
+            var link = $('.csql_expandcollapseall');
+            if ($('.csql_categoryshown').length === 0) {
+                // All categories collapsed, link should expand all.
+                link.text(link.data('expandalltext'));
+            } else {
+                // All Some categories open, link should collapse all.
+                link.text(link.data('collapsealltext'));
+            }
+        }
+    };
+
+    return t;
+});