Merge pull request #96 from WisdmLabs/dev40

Merged dev40 into stable40
WisdmLabs · Jul 23, 2024 · eb7e9e2 · eb7e9e2
2 parents 458002c + 54b147d
commit eb7e9e2
Show file tree

Hide file tree

Showing 18 changed files with 1,368 additions and 19 deletions.
diff --git a/amd/build/common.min.js b/amd/build/common.min.js
diff --git a/amd/build/common.min.js.map b/amd/build/common.min.js.map
diff --git a/amd/src/common.js b/amd/src/common.js
@@ -112,7 +112,9 @@ define(['jquery'], function($) {
                                ${SELECTORS.TOGGLE_SHOWHIDE},
                                ${SELECTORS.BUTTON_HIDE},
                                ${SELECTORS.BUTTON_SHOW}`, function() {
-            location.reload();
+            setTimeout(function() {
+                location.reload();
+            }, 400);
         });
 
         // Handling deleteAction

diff --git a/changes.txt b/changes.txt
@@ -1,5 +1,23 @@
 CHANGES LOG
 
+Version 4.1.8
+=============
+Feature - Added language translation files for:
+        - Spanish (Spain) (es)
+        - Deutsch (German) (de)
+        - Spanish (Mexico) (es_mx)
+        - Portuguese (Brazil) (pt_br)
+        - France (fr)
+        - Polish (pl)
+        - Arabic (ar)    
+Feature - Teachers of the same group are visible in the course header when the separate group setting is selected
+Tweak - Multi lang filter plugins  support added
+Tweak - Added missing translated string in  lang files.
+Tweak - UI/UX Improvements:
+        - repeatedly "Show" or "Hide" an activity in the course list screen working
+        - Some miner text and UI improvements
+
+
 Version 4.1.7
 =============
 Feature - Compatibility with Moodle 4.4.

diff --git a/classes/course_format_data_common_trait.php b/classes/course_format_data_common_trait.php
@@ -307,7 +307,7 @@ public function get_all_section_data($renderer, $editing, $rformat, $settings, $
             }
             if ($courseformat->is_section_current($section)) {
                 $data->iscurrent = true;
-                $data->highlightedlabel = get_string('highlight');
+                $data->highlightedlabel = get_string('highlighted');
             }
 
             if (!$section->visible) {
@@ -357,7 +357,7 @@ public function get_all_section_data($renderer, $editing, $rformat, $settings, $
                 // Set Marker.
                 if ($course->marker == $sectionindex) {
                     $data->iscurrent = true;
-                    $data->highlightedlabel = get_string('highlight');
+                    $data->highlightedlabel = get_string('highlighted');
                 }
                 $sections[] = $data;
             } else if ($rformat == REMUI_LIST_FORMAT) {
@@ -392,7 +392,7 @@ public function get_all_section_data($renderer, $editing, $rformat, $settings, $
                 // Set Marker.
                 if ($course->marker == $sectionindex) {
                     $data->iscurrent = true;
-                    $data->highlightedlabel = get_string('highlight');
+                    $data->highlightedlabel = get_string('highlighted');
                 }
                 $sections[] = $data;
             }
@@ -1027,7 +1027,7 @@ private function get_activities_details($section, $course, $courserenderer, $set
                     $modicons .= $mod->afterediticons;
                     $activitydetails->modicons = $modicons;
                 }
-                $activitydetails->summary = format_text($activitydetails->summary, FORMAT_HTML);
+                $activitydetails->summary = format_text($activitydetails->summary, FORMAT_HTML,array("noclean" => true));
                 $output[] = $activitydetails;
                 $count++;
             }
@@ -1088,7 +1088,7 @@ public function add_generalsection_data(&$export, $renderer, $editing, $course,
             $export->generalsection['summary'] = $renderer->abstract_html_contents(
                 $generalsectionsummary, 400
             );
-            $export->generalsection['fullsummary'] = format_text($generalsectionsummary, FORMAT_HTML);
+            $export->generalsection['fullsummary'] = format_text($generalsectionsummary, FORMAT_HTML,array('noclean'=>true));
 
             // Get course image if added.
             $imgurl = $this->display_file(

diff --git a/classes/output/card_one_section_renderable.php b/classes/output/card_one_section_renderable.php
@@ -282,7 +282,7 @@ private function get_activities_details($section, $displayoptions = array()) {
                     $this->courseformatdatacommontrait->course_section_cm_text($mod, $displayoptions),
                     $this->settings
                 );
-                $activitydetails->summary = format_text( $activitydetails->summary, FORMAT_HTML);
+                $activitydetails->summary = format_text( $activitydetails->summary, FORMAT_HTML,array('noclean'=>true));
                 // In case of label activity send full text of cm to open in modal.
                 if (array_search($mod->modname, array('label', 'folder')) !== false) {
                     $activitydetails->viewurl = $mod->modname.'_'.$mod->id;
@@ -291,7 +291,7 @@ private function get_activities_details($section, $displayoptions = array()) {
                         $mod,
                         $displayoptions
                     );
-                    $activitydetails->fullcontent = format_text($activitydetails->fullcontent, FORMAT_HTML);
+                    $activitydetails->fullcontent = format_text($activitydetails->fullcontent, FORMAT_HTML,array('noclean'=>true));
                 }
 
                 $activitydetails->completed = $completiondata->completionstate;