Moodle plugin CI improved

bdecentgmbh · Apr 9, 2024 · df39831 · df39831
1 parent 8a9fcb1
commit df39831
Show file tree

Hide file tree

Showing 26 changed files with 818 additions and 174 deletions.
diff --git a/actions/notification/amd/build/chaptersource.min.js.map b/actions/notification/amd/build/chaptersource.min.js.map
diff --git a/actions/notification/classes/actionform.php b/actions/notification/classes/actionform.php
@@ -805,7 +805,7 @@ public function get_email_placeholders() {
      * @return array
      */
     public function assignment_data_fields() {
-        return [ 'Assignment_Extensions'];
+        return ['Assignment_Extensions'];
     }
 
     /**

diff --git a/actions/notification/classes/schedule.php b/actions/notification/classes/schedule.php
@@ -319,7 +319,7 @@ protected function get_scheduled_records($userid=null) {
             WHERE ns.status = :status AND ai.status <> 0
             AND active_enrols.activeenrolment <> 0
             AND c.visible = 1
-            AND c.startdate <= :startdate AND  (c.enddate = 0 OR c.enddate >= :enddate)
+            AND c.startdate <= :startdate AND (c.enddate = 0 OR c.enddate >= :enddate)
             AND ue.deleted = 0 AND ue.suspended = 0
             AND ns.suppressreached = 0 AND ns.scheduletime <= :current_timestamp $userwhere ORDER BY ns.timecreated ASC";
 

diff --git a/actions/notification/db/install.xml b/actions/notification/db/install.xml
@@ -25,7 +25,7 @@
         <FIELD NAME="headercontentformat" TYPE="int" LENGTH="9" NOTNULL="false" DEFAULT="1" SEQUENCE="false"/>
         <FIELD NAME="staticcontent" TYPE="text" NOTNULL="false" SEQUENCE="false"/>
         <FIELD NAME="staticcontentformat" TYPE="int" LENGTH="9" NOTNULL="false" DEFAULT="1" SEQUENCE="false"/>
-        <FIELD NAME="dynamiccontent" TYPE="char" LENGTH="50" NOTNULL="false" SEQUENCE="false"/>
+        <FIELD NAME="dynamiccontent" TYPE="int" LENGTH="11" NOTNULL="false" SEQUENCE="false"/>
         <FIELD NAME="contentlength" TYPE="int" LENGTH="9" NOTNULL="false" SEQUENCE="false"/>
         <FIELD NAME="contenttype" TYPE="text" NOTNULL="false" SEQUENCE="false"/>
         <FIELD NAME="footercontent" TYPE="text" NOTNULL="false" SEQUENCE="false"/>
@@ -58,7 +58,7 @@
         <FIELD NAME="subject" TYPE="char" LENGTH="500" NOTNULL="false" SEQUENCE="false"/>
         <FIELD NAME="headercontent" TYPE="text" NOTNULL="false" SEQUENCE="false"/>
         <FIELD NAME="staticcontent" TYPE="text" NOTNULL="false" SEQUENCE="false"/>
-        <FIELD NAME="dynamiccontent" TYPE="char" LENGTH="50" NOTNULL="false" SEQUENCE="false"/>
+        <FIELD NAME="dynamiccontent" TYPE="int" LENGTH="11" NOTNULL="false" SEQUENCE="false"/>
         <FIELD NAME="contentlength" TYPE="int" LENGTH="9" NOTNULL="false" SEQUENCE="false"/>
         <FIELD NAME="contenttype" TYPE="text" NOTNULL="false" SEQUENCE="false"/>
         <FIELD NAME="chapterid" TYPE="int" LENGTH="9" NOTNULL="false" SEQUENCE="false"/>

diff --git a/actions/notification/db/upgrade.php b/actions/notification/db/upgrade.php
@@ -51,5 +51,21 @@ function xmldb_pulseaction_notification_upgrade($oldversion) {
         $dbman->change_field_precision($temptable, $timemodified);
     }
 
+    // Update the type of dynamic content.
+    $instable = new xmldb_table('pulseaction_notification');
+    $dynamiccontent = new xmldb_field('dynamiccontent', XMLDB_TYPE_INTEGER, '11', null, null, null, null);
+    // Verify field exists.
+    if ($dbman->field_exists($instable, $dynamiccontent)) {
+        // Change the field.
+        $dbman->change_field_precision($instable, $dynamiccontent);
+    }
+
+    // Update the templates table dynamiccontent.
+    $temptable = new xmldb_table('pulseaction_notification_ins');
+    if ($dbman->field_exists($temptable, $dynamiccontent)) {
+        // Change the field.
+        $dbman->change_field_precision($temptable, $dynamiccontent);
+    }
+
     return true;
 }
diff --git a/actions/notification/lib.php b/actions/notification/lib.php
@@ -181,6 +181,7 @@ function pulseaction_notification_output_fragment_preview_content($args) {
         $selector = html_writer::select($list, 'userselector', $user->id);
 
         $data = ['message' => $messagehtml, 'usersselector' => $selector];
+
         return $OUTPUT->render_from_template('pulseaction_notification/preview', ['data' => $data]);
     }
 }
diff --git a/amd/build/module.min.js b/amd/build/module.min.js
diff --git a/amd/build/module.min.js.map b/amd/build/module.min.js.map
diff --git a/amd/build/preset.min.js.map b/amd/build/preset.min.js.map
diff --git a/amd/src/module.js b/amd/src/module.js
@@ -66,11 +66,9 @@ define(['core_editor/events'], function() {
                 templatevars.forEach((elem) => {
                     elem.addEventListener('click', function(e) {
                         var target = e.currentTarget;
-                        if (branch <= "402") {
-                            var EditorInput = target.querySelector('[id*="_editoreditable"]');
-                        } else {
-                            var EditorInput = target.querySelector('textarea[id*="_content_editor"]');
-                        }
+                        var EditorInput = (branch <= "402")
+                            ? target.querySelector('[id*="_editoreditable"]')
+                            : target.querySelector('textarea[id*="_content_editor"]');
                         module.insertCaretActive(EditorInput);
                     });
                 });