Limit 'manageownnotifications' to non-global notifs, misc fixes - #24

Author: zpottie

.travis.yml

@@ -20,8 +20,6 @@ env:
     - MOODLE_BRANCH=MOODLE_310_STABLE
     - MOODLE_BRANCH=MOODLE_39_STABLE
     - MOODLE_BRANCH=MOODLE_38_STABLE
-    - MOODLE_BRANCH=MOODLE_37_STABLE
-    - MOODLE_BRANCH=MOODLE_36_STABLE
     - MOODLE_BRANCH=MOODLE_35_STABLE
 
   matrix:
@@ -72,4 +70,4 @@ script:
   - moodle-plugin-ci phpdoc
   - moodle-plugin-ci validate
   - moodle-plugin-ci savepoints
-  - moodle-plugin-ci grunt
+  - moodle-plugin-ci grunt -t stylecheck

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## v1.4.0 - 18/12/2020
+
+### Added
+* Users can now create/manage their own (instance-based/non-global) notifications
+  * Enable via capability/permissions - `manageownnotifications`.
+* A package.json file for easier (local) testing, checks & generation of code.
+
+### Changed
+* General code, UI & language strings cleanup.
+* Updated README.md with new feature listed.
+* Bumped version number.
+
+### Fixed
+* TravisCI file - updated moodle-plugin-ci to use Moodle HQ's.
+
 ## v1.3.12 - 13/10/2020
 
 ### Changed

Gruntfile.js

@@ -50,7 +50,6 @@
  */
 
 module.exports = function(grunt) {
-
     let decachephp = "../../admin/cli/purge_caches.php";
     const sass = require('node-sass');
 
@@ -130,7 +129,8 @@ module.exports = function(grunt) {
 
     // Register tasks.
     grunt.registerTask("default", ["watch"]);
-    grunt.registerTask("css", ["stylelint:scss", "sass"]);
+    grunt.registerTask("css", ["stylelint:scss", "sass", "stylelint:css"]);
+    grunt.registerTask("stylecheck", ["stylelint:scss", "stylelint:css"]);
     grunt.registerTask("js", ["uglify"]);
     grunt.registerTask("decache", ["exec:decache"]);
 };

README.md

@@ -14,19 +14,20 @@ This could be useful in cases such as alerting users of scheduled outages, welco
 * Customisable title & message
 * Basic HTML tags allowed for advanced users
 * Multi-lingual/filter support
-* Multiple types of notifications (Bootstrap-based)
+* Multiple types of notifications (Bootstrap-based styles)
 * Type-based icons (optional setting)
 * Dismissible/Non-Dismissible
 * Customisable date range to show notifications
 * Display a notification to the user a set amount of times
 * Instance-based or global/site-wide notifications
+* Users (e.g. teachers) can create and manage their own instance-based notifications - **disabled by default**
 * Enable/Disable a/all notifications (Site-wide and instance-based)
 * Edit/Delete/Restore notifications
 * Option to auto-delete notification after end date
 * Option to permanently delete notifications that's had the deleted flag for more than 30 days
 * Option to automatically remove user (dismissed/seen) records that relates to notifications that don't exist anymore
 * AJAX used to improve user-experience and simplify processes
-* Live-preview when making/editing a notification
+* Live-preview when adding/editing a notification
 * Easy to use, but fully documented with all the nitty-gritty information
 * Implements Privacy API (GDPR Compliance)
 

lang/en/block_advnotifications.php

@@ -54,7 +54,7 @@
 $string['advnotifications_cell_yes'] = 'Yes';
 $string['advnotifications_cell_no'] = 'No';
 
-$string['advnotifications_restore_table_warning'] = '<strong>Warning!</strong> Deleting notifications from this table will permanently delete it from the database. We recommend using the auto-delete features of the plugin...';
+$string['advnotifications_restore_table_warning'] = '<strong>Warning!</strong> Deleting notifications from this table will permanently delete it from the database. It is recommended to use the auto-delete features of the plugin...';
 
 // Manage Advanced Notification Lang Strings.
 $string['advnotifications_table_title'] = 'Manage notifications';

package.json

@@ -13,15 +13,15 @@
     "grunt-contrib-watch": "^1.1.0",
     "grunt-exec": "^0.4.7",
     "grunt-sass": "^2.1.0",
-    "grunt-stylelint": "^0.6.0",
-    "stylelint": "^8.0.0"
+    "grunt-stylelint": "^0.6.0"
   },
   "engines": {
     "node": ">=10"
   },
   "license": "GPL-3.0",
   "dependencies": {
     "grunt-cli": "^1.3.2",
+    "stylelint": "^8.0.0",
     "stylelint-csstree-validator": "^1.9.0"
   }
 }

pages/process.php

@@ -145,6 +145,12 @@
     }
 }
 
+// Build redirect url params.
+$params = [];
+if (isset($blockinstance) && $blockinstance > -1) {
+    $params['blockid'] = $blockinstance;
+}
+
 // Handle Delete/Edit early as it requires few resources, and then we can quickly exit(),
 // this is the new AJAX/JS deletion/editing method.
 if (isset($tableaction) && $tableaction != '') {
@@ -158,7 +164,7 @@
             echo json_encode($enotification);
             exit();
         } else {
-            redirect(new moodle_url('/blocks/advnotifications/pages/notifications.php'),
+            redirect(new moodle_url('/blocks/advnotifications/pages/notifications.php', $params),
                 get_string('advnotifications_err_nojsedit', 'block_advnotifications'));
         }
     } else if ($purpose == 'delete') {
@@ -174,7 +180,7 @@
             echo json_encode(array("done" => $tableaction));
             exit();
         } else {
-            redirect(new moodle_url('/blocks/advnotifications/pages/notifications.php'));
+            redirect(new moodle_url('/blocks/advnotifications/pages/notifications.php', $params));
         }
     } else if ($purpose == 'restore') {
         $rnotification = new stdClass();
@@ -189,7 +195,7 @@
             echo json_encode(array("done" => $tableaction));
             exit();
         } else {
-            redirect(new moodle_url('/blocks/advnotifications/pages/restore.php'));
+            redirect(new moodle_url('/blocks/advnotifications/pages/restore.php', $params));
         }
     } else if ($purpose == 'permdelete') {
         $DB->delete_records('block_advnotifications', array('id' => $tableaction));
@@ -198,7 +204,7 @@
             echo json_encode(array('done' => $tableaction));
             exit();
         } else {
-            redirect(new moodle_url('/blocks/advnotifications/pages/restore.php'));
+            redirect(new moodle_url('/blocks/advnotifications/pages/restore.php', $params));
         }
     }
 }
@@ -254,7 +260,7 @@
         echo json_encode(array("updated" => $title));
         exit();
     } else {
-        redirect(new moodle_url('/blocks/advnotifications/pages/notifications.php'),
+        redirect(new moodle_url('/blocks/advnotifications/pages/notifications.php', $params),
             get_string('advnotifications_err_nojsedit', 'block_advnotifications'));
     }
 }
@@ -288,7 +294,7 @@
             exit();
         } else {
             // Redirect with Error.
-            redirect(new moodle_url('/blocks/advnotifications/pages/notifications.php'),
+            redirect(new moodle_url('/blocks/advnotifications/pages/notifications.php', $params),
                 get_string('advnotifications_err_req', 'block_advnotifications', $error));
         }
     }
@@ -325,6 +331,6 @@
         echo json_encode("I: Successful");
         exit();
     } else {
-        redirect(new moodle_url('/blocks/advnotifications/pages/notifications.php'));
+        redirect(new moodle_url('/blocks/advnotifications/pages/notifications.php', $params));
     }
 }

styles.css

@@ -18,7 +18,8 @@ body #advnotifications_restore_table_wrapper td > form button {
     transition: 100ms;
 }
 
-body #advnotifications_table_wrapper td > form button[class*="restore"], body #advnotifications_table_wrapper td > form button[class*="edit"],
+body #advnotifications_table_wrapper td > form button[class*="restore"],
+body #advnotifications_table_wrapper td > form button[class*="edit"],
 body #advnotifications_restore_table_wrapper td > form button[class*="restore"],
 body #advnotifications_restore_table_wrapper td > form button[class*="edit"] {
     color: #060;
@@ -29,7 +30,8 @@ body #advnotifications_restore_table_wrapper td > form button[class*="delete"] {
     color: #730000;
 }
 
-body #advnotifications_table_wrapper td > form button:hover, body #advnotifications_table_wrapper td > form button:focus,
+body #advnotifications_table_wrapper td > form button:hover,
+body #advnotifications_table_wrapper td > form button:focus,
 body #advnotifications_restore_table_wrapper td > form button:hover,
 body #advnotifications_restore_table_wrapper td > form button:focus {
     outline: none;

version.php

@@ -26,7 +26,7 @@
 defined('MOODLE_INTERNAL') || die;
 
 $plugin->component = 'block_advnotifications';          // Recommended since 2.0.2 (MDL-26035). Required since 3.0 (MDL-48494).
-$plugin->version = 2020101320;                          // YYYYMMDDHH (year, month, day, 24-hr format hour).
+$plugin->version = 2020121814;                          // YYYYMMDDHH (year, month, day, 24-hr format hour).
 $plugin->requires = 2018051703;                         // YYYYMMDDHH (Version number for Moodle 3.5.3 as at 21/01/2019).
 $plugin->maturity = MATURITY_STABLE;                    // Code maturity/stability.
-$plugin->release = 'v1.3.14';                           // Human-readable release version.
+$plugin->release = 'v1.4.0';                            // Human-readable release version.