Merge pull request #6 from santoshndev/moodle-50-plugin

santoshndev · web-flow · commit b7e6f2cea7c4 · 2025-04-21T16:29:58.000+05:30
Moodle 50 compatibility changes
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:13
+        image: postgres:14
         env:
           POSTGRES_USER: 'postgres'
           POSTGRES_HOST_AUTH_METHOD: 'trust'
@@ -55,6 +55,18 @@ jobs:
          - php: '8.3'
            moodle-branch: 'MOODLE_404_STABLE'
            database: pgsql
+         - php: '8.3'
+           moodle-branch: 'MOODLE_405_STABLE'
+           database: mariadb
+         - php: '8.3'
+           moodle-branch: 'MOODLE_405_STABLE'
+           database: pgsql
+         - php: '8.3'
+           moodle-branch: 'MOODLE_500_STABLE'
+           database: mariadb
+         - php: '8.4'
+           moodle-branch: 'MOODLE_500_STABLE'
+           database: pgsql
 
     steps:
       - name: Check out repository code
diff --git a/README.md b/README.md
@@ -1,16 +1,25 @@
-# Site Statistics
-Site Statistics Block for Moodle
-
-This block is generally used to show the site statistics such as total number of active users, courses, activities and disk usage on dashboard.
-
-This block can be added & viewed by administrator and manager role. Other user roles can also view this block if they are allowed to view it.
-
-This block provides shortcuts to user management, course management and activity management through the hyperlinks added to the counts.
-
-This block comes with English, Marathi and Hindi language strings.
-
-# #Author
-
-Author: Santosh Nagargoje
-
-Web profile: https://santoshnagargoje.in/
+# Site Statistics
+Site Statistics Block for Moodle
+
+This block is generally used to show the site statistics such as total number of active users, courses, activities and disk usage on dashboard.
+
+This block can be added & viewed by administrator and manager role. Other user roles can also view this block if they are allowed to view it.
+
+This block provides shortcuts to user management, course management and activity management through the hyperlinks added to the counts.
+
+This block comes with English, Marathi and Hindi language strings.
+
+# How to use
+1. Login as an administrator.
+2. Go to Dashboard page.
+3. Turn Editing on
+4. Click on Add a block
+5. Select Site Statistics from the list
+6. Check block added on Dashboard page
+**Note**: In order to get the disk usage value, the **Calculate Disk Usage** task should be executed. By default, it's scheduled on midnight every day but you are free to reschedule it as per your requirement.
+
+# Author
+
+Santosh Nagargoje
+
+Web profile: https://santoshnagargoje.in/
diff --git a/block_site_stats.php b/block_site_stats.php
@@ -18,7 +18,7 @@
  * Contains the class for the Site Statistics block.
  *
  * @package    block_site_stats
- * @copyright  2024 Santosh Nagargoje <santosh.nag2217@gmail.com>
+ * @copyright  2025 Santosh Nagargoje <santosh.nag2217@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class block_site_stats extends block_base {
diff --git a/classes/observer.php b/classes/observer.php
@@ -21,7 +21,7 @@
  * The observer class needed by the site stats block.
  *
  * @package    block_site_stats
- * @copyright  2024 Santosh Nagargoje <santosh.nag2217@gmail.com>
+ * @copyright  2025 Santosh Nagargoje <santosh.nag2217@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class observer {
diff --git a/classes/output/main.php b/classes/output/main.php
@@ -23,7 +23,7 @@
  * Class containing data for Site Statistics block.
  *
  * @package    block_site_stats
- * @copyright  2024 Santosh Nagargoje <santosh.nag2217@gmail.com>
+ * @copyright  2025 Santosh Nagargoje <santosh.nag2217@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class main implements \templatable, \renderable {
diff --git a/classes/output/renderer.php b/classes/output/renderer.php
@@ -21,7 +21,7 @@
  * site stats block renderer
  *
  * @package    block_site_stats
- * @copyright  2024 Santosh Nagargoje <santosh.nag2217@gmail.com>
+ * @copyright  2025 Santosh Nagargoje <santosh.nag2217@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class renderer extends plugin_renderer_base {
diff --git a/classes/privacy/provider.php b/classes/privacy/provider.php
@@ -18,7 +18,7 @@
  * Privacy Subsystem implementation for block_site_stats.
  *
  * @package    block_site_stats
- * @copyright  2024 Santosh Nagargoje <santosh.nag2217@gmail.com>
+ * @copyright  2025 Santosh Nagargoje <santosh.nag2217@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
diff --git a/classes/task/diskusage.php b/classes/task/diskusage.php
@@ -21,7 +21,7 @@
  * Calculates the disk usage
  *
  * @package   block_site_stats
- * @copyright 2024 Santosh Nagargoje <santosh.nag2217@gmail.com>
+ * @copyright 2025 Santosh Nagargoje <santosh.nag2217@gmail.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class diskusage extends \core\task\scheduled_task {
diff --git a/db/access.php b/db/access.php
@@ -18,7 +18,7 @@
  * Site Statistics block caps.
  *
  * @package    block_site_stats
- * @copyright  2024 Santosh Nagargoje <santosh.nag2217@gmail.com>
+ * @copyright  2025 Santosh Nagargoje <santosh.nag2217@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 defined('MOODLE_INTERNAL') || die();
diff --git a/db/caches.php b/db/caches.php
@@ -18,7 +18,7 @@
  * Defines the cache usage
  *
  * @package   block_site_stats
- * @copyright 2024 Santosh Nagargoje <santosh.nag2217@gmail.com>
+ * @copyright 2025 Santosh Nagargoje <santosh.nag2217@gmail.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
diff --git a/db/events.php b/db/events.php
@@ -18,7 +18,7 @@
  * This file defines observers needed by the site stats block.
  *
  * @package    block_site_stats
- * @copyright  2024 Santosh Nagargoje <santosh.nag2217@gmail.com>
+ * @copyright  2025 Santosh Nagargoje <santosh.nag2217@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 defined('MOODLE_INTERNAL') || die();
diff --git a/db/tasks.php b/db/tasks.php
@@ -18,7 +18,7 @@
  * Defines the disk usage scheduled task
  *
  * @package   block_site_stats
- * @copyright 2024 Santosh Nagargoje <santosh.nag2217@gmail.com>
+ * @copyright 2025 Santosh Nagargoje <santosh.nag2217@gmail.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 defined('MOODLE_INTERNAL') || die();
diff --git a/lang/en/block_site_stats.php b/lang/en/block_site_stats.php
@@ -18,7 +18,7 @@
  * This file contains english language strings used in the site stats block
  *
  * @package block_site_stats
- * @copyright 2024 Santosh Nagargoje <santosh.nag2217@gmail.com>
+ * @copyright 2025 Santosh Nagargoje <santosh.nag2217@gmail.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 $string['activities'] = 'Activities';
diff --git a/lang/hi/block_site_stats.php b/lang/hi/block_site_stats.php
@@ -18,7 +18,7 @@
  * This file contains hindi language strings used in the site stats block
  *
  * @package block_site_stats
- * @copyright 2024 Santosh Nagargoje <santosh.nag2217@gmail.com>
+ * @copyright 2025 Santosh Nagargoje <santosh.nag2217@gmail.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 $string['activities'] = 'कार्यकलाप';
diff --git a/lang/mr/block_site_stats.php b/lang/mr/block_site_stats.php
@@ -18,7 +18,7 @@
  * This file contains marathi language strings used in the site stats block
  *
  * @package block_site_stats
- * @copyright 2024 Santosh Nagargoje <santosh.nag2217@gmail.com>
+ * @copyright 2025 Santosh Nagargoje <santosh.nag2217@gmail.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 $string['activities'] = 'उपक्रम';
diff --git a/styles.css b/styles.css
@@ -1,9 +1,9 @@
-@media (min-width: 840px) {
-    .block_site_stats .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-        width: calc(25% - 0.5rem);
-    }
-}
-#block-region-side-pre .block_site_stats .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(100% - 0.5rem);
-    flex-basis: auto;
-}
+@media (min-width: 840px) {
+    .block_site_stats .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
+        width: calc(25% - 0.5rem);
+    }
+}
+#block-region-side-pre .block_site_stats .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
+    width: calc(100% - 2.5rem);
+    flex-basis: auto;
+}
diff --git a/tests/output/main_test.php b/tests/output/main_test.php
@@ -23,7 +23,7 @@
  *
  * @package    block_site_stats
  * @category   test
- * @copyright  2024 Santosh Nagargoje <santosh.nag2217@gmail.com>
+ * @copyright  2025 Santosh Nagargoje <santosh.nag2217@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @covers \block_site_stats\output\main
  */
@@ -38,6 +38,7 @@ final class main_test extends advanced_testcase {
      * @return void
      */
     public function setUp(): void {
+        parent::setUp();
         $this->resetAfterTest();
         $this->setAdminUser();
         $this->main = new main();
diff --git a/tests/privacy/provider_test.php b/tests/privacy/provider_test.php
@@ -22,7 +22,7 @@
  *
  * @package    block_site_stats
  * @category   test
- * @copyright  2024 Santosh Nagargoje <santosh.nag2217@gmail.com>
+ * @copyright  2025 Santosh Nagargoje <santosh.nag2217@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @covers \block_site_stats\privacy\provider
  */
diff --git a/tests/site_stats_test.php b/tests/site_stats_test.php
@@ -24,7 +24,7 @@
  *
  * @package    block_site_stats
  * @category   test
- * @copyright  2024 Santosh Nagargoje <santosh.nag2217@gmail.com>
+ * @copyright  2025 Santosh Nagargoje <santosh.nag2217@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass \block_site_stats
  */
@@ -36,6 +36,7 @@ final class site_stats_test extends advanced_testcase {
     public static function setUpBeforeClass(): void {
         require_once(__DIR__ . '/../../moodleblock.class.php');
         require_once(__DIR__ . '/../block_site_stats.php');
+        parent::setUpBeforeClass();
     }
 
     /**
diff --git a/version.php b/version.php
@@ -18,14 +18,14 @@
  * Version details
  *
  * @package    block_site_stats
- * @copyright  2024 Santosh Nagargoje <santosh.nag2217@gmail.com>
+ * @copyright  2025 Santosh Nagargoje <santosh.nag2217@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2024050404;        // The current plugin version (Date: YYYYMMDDXX).
-$plugin->release = '1.0.2';
+$plugin->version   = 2025042100;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->release = '1.0.3';
 $plugin->requires  = 2022111800;        // Requires this Moodle version.
 $plugin->component = 'block_site_stats'; // Full name of the plugin (used for diagnostics).
 $plugin->maturity = MATURITY_STABLE;

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`* Contains the class for the Site Statistics block.`
`19`	`19`	`*`
`20`	`20`	`* @package block_site_stats`
`21`		`- * @copyright 2024 Santosh Nagargoje <santosh.nag2217@gmail.com>`
	`21`	`+ * @copyright 2025 Santosh Nagargoje <santosh.nag2217@gmail.com>`
`22`	`22`	`* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later`
`23`	`23`	`*/`
`24`	`24`	`class block_site_stats extends block_base {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`* The observer class needed by the site stats block.`
`22`	`22`	`*`
`23`	`23`	`* @package block_site_stats`
`24`		`- * @copyright 2024 Santosh Nagargoje <santosh.nag2217@gmail.com>`
	`24`	`+ * @copyright 2025 Santosh Nagargoje <santosh.nag2217@gmail.com>`
`25`	`25`	`* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later`
`26`	`26`	`*/`
`27`	`27`	`class observer {`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`* Class containing data for Site Statistics block.`
`24`	`24`	`*`
`25`	`25`	`* @package block_site_stats`
`26`		`- * @copyright 2024 Santosh Nagargoje <santosh.nag2217@gmail.com>`
	`26`	`+ * @copyright 2025 Santosh Nagargoje <santosh.nag2217@gmail.com>`
`27`	`27`	`* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later`
`28`	`28`	`*/`
`29`	`29`	`class main implements \templatable, \renderable {`