Merge pull request #99 from WisdmLabs/dev40

Merged dev40 into stable40

changes.txt

@@ -1,5 +1,10 @@
 CHANGES LOG
 
+Version 4.1.9
+=============
+Tweak - Miner improvement in 'Hide general section when empty' setting.
+Fix   - Deprecated warnings in PHP 8.2 and 8.3 have been resolved.
+
 Version 4.1.8
 =============
 Feature - Added language translation files for:

classes/course_format_data_common_trait.php

@@ -47,7 +47,7 @@ class course_format_data_common_trait {
      * Plugin config
      * @var string
      */
-    private $_plugin_config;
+    private $plugin_config;
     /**
      * Activity statistic
      * @var \format_remuiformat\ModStats
@@ -126,7 +126,8 @@ public function activity_completion($course, $completioninfo, $activitydetails,
         if ($course->showcompletionconditions == COMPLETION_SHOW_CONDITIONS) {
             // Show the activity information output component.
             $cmcompletion = \core_completion\cm_completion_details::get_instance($mod, $USER->id);
-            if ($CFG->backup_release <= '4.2') {
+            // if ($CFG->backup_release <= '4.2') {
+            if ($CFG->branch <= '402') {
                 $activitydetails->completion = $courserenderer->activity_information(
                     $mod,
                     $cmcompletion,
@@ -372,7 +373,7 @@ public function get_all_section_data($renderer, $editing, $rformat, $settings, $
                 $data->activityinfostring = implode($extradetails['activityinfo']);
                 $data->progressinfo = $extradetails['progressinfo'];
                 $data->checkrightsidecontent = true;
-                if($CFG->backup_release > '4.3'){
+                if($CFG->branch > '403'){
                     $data->sectionpageurl = $CFG->wwwroot."/course/section.php?id=".$section->id;
                     $data->showsectionpageurlbtn = true;
                 }
@@ -1147,7 +1148,7 @@ public function add_generalsection_data(&$export, $renderer, $editing, $course,
             $export->generalsection['courseinformationdata'] = true;
             $generalsectionavailability = $export->generalsection['availability'];
             $generalsectionfullsummary  = $export->generalsection['fullsummary'];
-            if (empty(trim(strip_tags($generalsectionavailability))) && empty(trim(strip_tags($generalsectionfullsummary)))  && $settings['hidegeneralsectionwhenempty']) {
+            if (empty(trim(strip_tags($generalsectionavailability))) && empty(trim(strip_tags($generalsectionfullsummary)))  && $settings['hidegeneralsectionwhenempty'] && !$export->generalsection['activityexists']) {
                 $export->generalsection['showgeneralsectionintrodata'] = false;
             }
             if (empty($export->activitylist)) {
@@ -1158,7 +1159,8 @@ public function add_generalsection_data(&$export, $renderer, $editing, $course,
 
     public function edw_get_section_num($obj){
         global $CFG;
-        if($CFG->backup_release > '4.3'){
+
+        if($CFG->branch > '403'){
             return $obj->get_sectionnum();
         }else{
             return $obj->get_section_number();

classes/mod_stats.php

@@ -40,7 +40,7 @@ class ModStats {
      * Plugin config
      * @var string
      */
-    private $_plugin_config;
+    private $plugin_config;
 
     /**
      * Private constructor

lib.php

@@ -653,7 +653,8 @@ public function section_action($section, $action, $sr) {
         $rv = parent::section_action($section, $action, $sr);
         $renderer = $PAGE->get_renderer('format_topics');
         $format = course_get_format($this->courseid);
-        if($CFG->backup_release > '4.3'){
+        // if($CFG->backup_release > '4.3'){
+        if($CFG->branch > '403'){
             $rv['section_availability'] = new \core_courseformat\output\local\content\section\availability($format, $this->get_section($section));
         }else{
             $rv['section_availability'] = $renderer->section_availability($this->get_section($section));

scss/list-layout.scss

@@ -131,7 +131,7 @@
                 .availability-summary-wrapper:not(:has(:first-child)) {
                     display: none;
                 }
-                
+
                 .availability-summary-wrapper:has(:nth-child(2)) {
                     .summary {
                         margin-top: $margin-16;
@@ -436,7 +436,7 @@
             li:not(:last-child) {
                 margin-bottom: $margin-16;
             }
-            li:has(.divider.bulk-hidden){
+            li:has(.divider):not(:has(.divider-plus)){
                 margin-bottom: 0px;
             }
             .activity{
@@ -578,7 +578,7 @@
         //     padding:2px  0px $pad-16 0px;
         // }
     }
-    
+
     .section_availability .section_availability,
     .section_availability.course-description-item{
         color: $paragraph-color;
@@ -613,7 +613,7 @@
                 "altcontent altcontent altcontent altcontent altcontent"
                 "afterlink afterlink afterlink afterlink afterlink"
                 "availability availability availability availability availability";
-        
+
             .activity-dates {
                 margin-right: 0 !important;
             }

styles.css

@@ -1195,8 +1195,8 @@ body#page-course-view-remuiformat .remui-format-list .card-footer ul.section li:
   margin-bottom: 16px;
 }
 
-body#page-course-view-remuiformat .remui-format-list .activities-list ul.section li:has(.divider.bulk-hidden),
-body#page-course-view-remuiformat .remui-format-list .card-footer ul.section li:has(.divider.bulk-hidden) {
+body#page-course-view-remuiformat .remui-format-list .activities-list ul.section li:has(.divider):not(:has(.divider-plus)),
+body#page-course-view-remuiformat .remui-format-list .card-footer ul.section li:has(.divider):not(:has(.divider-plus)) {
   margin-bottom: 0px;
 }
 
@@ -1370,13 +1370,7 @@ body#page-course-view-remuiformat .remui-format-list .section_availability.cours
 body#page-course-view-remuiformat .remui-format-list .activity-item .activity-grid {
   grid-template-rows: 1fr repeat(6, -webkit-min-content);
   grid-template-rows: 1fr repeat(6, min-content);
-  grid-template-areas: "icon name groupmode completion actions"
- "icon visibility groupmode completion actions"
- "icon visibility groupmode completion actions"
- "dates dates dates dates dates"
- "altcontent altcontent altcontent altcontent altcontent"
- "afterlink afterlink afterlink afterlink afterlink"
- "availability availability availability availability availability";
+  grid-template-areas: "icon name groupmode completion actions" "icon visibility groupmode completion actions" "icon visibility groupmode completion actions" "dates dates dates dates dates" "altcontent altcontent altcontent altcontent altcontent" "afterlink afterlink afterlink afterlink afterlink" "availability availability availability availability availability";
 }
 
 body#page-course-view-remuiformat .remui-format-list .activity-item .activity-grid .activity-dates {

version.php

@@ -23,8 +23,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2024072300;                    // The current plugin version (Date: YYYYMMDDXX).
-$plugin->release   = '4.1.8';
+$plugin->version   = 2024100800;                    // The current plugin version (Date: YYYYMMDDXX).
+$plugin->release   = '4.1.9';
 $plugin->requires  = 2022041900;                    // Requires this Moodle version (Moodle V4.0).
 $plugin->maturity  = MATURITY_STABLE;
 $plugin->component = 'format_remuiformat';          // Full name of the plugin (used for diagnostics).