Merge pull request #84 from WisdmLabs/dev40

merge dev40 into stable40
WisdmLabs · Oct 17, 2023 · 14bb820 · 14bb820
2 parents a5dcc55 + 96c6527
commit 14bb820
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 22 deletions.
diff --git a/changes.txt b/changes.txt
@@ -1,5 +1,9 @@
 CHANGES LOG
 
+Version 4.1.4
+=============
+Feature - Compatibility with Moodle 4.3.
+
 Version 4.1.3
 =============.
 Tweak - UI improvements.

diff --git a/classes/course_format_data_common_trait.php b/classes/course_format_data_common_trait.php
@@ -29,6 +29,7 @@
 use core_courseformat\output\local\content\section;
 use core_completion\progress;
 use core\activity_dates;
+use core_course\output\activity_completion;
 require_once($CFG->dirroot.'/course/format/remuiformat/classes/mod_stats.php');
 
 /**
@@ -108,7 +109,7 @@ public function display_file($context, $itemid) {
      * @param array            $displayoptions  Display options array
      */
     public function activity_completion($course, $completioninfo, $activitydetails, $mod, $courserenderer, $displayoptions) {
-        global $CFG, $USER;
+        global $CFG, $USER, $OUTPUT;
         if (!$completioninfo->is_enabled()) {
             return $activitydetails;
         }
@@ -123,11 +124,17 @@ 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);
-            $activitydetails->completion = $courserenderer->activity_information(
-                $mod,
-                $cmcompletion,
-                []
-            );
+            if ($CFG->backup_release <= '4.2') {
+                $activitydetails->completion = $courserenderer->activity_information(
+                    $mod,
+                    $cmcompletion,
+                    []
+                );
+            } else {
+                $completion = new activity_completion($mod, $cmcompletion);
+                $completiondata = $completion->export_for_template($OUTPUT);
+                $activitydetails->completion = $OUTPUT->render_from_template("core_courseformat/local/content/cm/activity_info", $completiondata);
+            }
             $activitydetails->completion = str_replace("btn-outline-secondary", "btn-secondary", $activitydetails->completion);
             // Check if completion is enabled. Set manual completion only if it not automatic.
             if ($cmcompletion->has_completion() && $cmcompletion->is_automatic() != true) {
@@ -995,7 +1002,7 @@ private function get_activities_details($section, $course, $courserenderer, $set
                     $modicons .= $mod->afterediticons;
                     $activitydetails->modicons = $modicons;
                 }
-                $activitydetails->summary = format_text($activitydetails->summary);
+                $activitydetails->summary = format_text($activitydetails->summary, FORMAT_HTML);
                 $output[] = $activitydetails;
                 $count++;
             }
@@ -1055,7 +1062,7 @@ public function add_generalsection_data(&$export, $renderer, $editing, $course,
             $export->generalsection['summary'] = $renderer->abstract_html_contents(
                 $generalsectionsummary, 400
             );
-            $export->generalsection['fullsummary'] = $generalsectionsummary;
+            $export->generalsection['fullsummary'] = format_text($generalsectionsummary, FORMAT_HTML);
 
             // 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
@@ -280,7 +280,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);
                 // 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;
@@ -289,6 +289,7 @@ private function get_activities_details($section, $displayoptions = array()) {
                         $mod,
                         $displayoptions
                     );
+                    $activitydetails->fullcontent = format_text($activitydetails->fullcontent, FORMAT_HTML);
                 }
 
                 $activitydetails->completed = $completiondata->completionstate;

diff --git a/format.php b/format.php
@@ -75,7 +75,7 @@
 
 if ($section) {
     // List Format -> One Section Page : render_list_one_section -> list_one_section.
-    if ($course->remuicourseformat && $course->coursedisplay) {
+    if ($course->remuicourseformat) {
         $renderer->render_list_one_section(
             new \format_remuiformat\output\format_remuiformat_list_one_section($course, $displaysection, $baserenderer)
         );

diff --git a/scss/card-layout.scss b/scss/card-layout.scss
@@ -622,7 +622,7 @@
                 // Placing conpletion marker.
                 .completion-container.manual-completion {
                     width: 100%;
-                    .completion-info .btn{
+                    .completion-info .btn,[data-region="completion-info"] .btn{
                         width: 100%;
                     }
 
@@ -647,7 +647,8 @@
                         .toggle-row-column{
                             display: none;
                         }
-                        .completion-info{
+                        .completion-info,
+                        [data-region="completion-info"] {
                             display: flex;
                             justify-content: flex-end;
                             .btn{

diff --git a/scss/list-layout.scss b/scss/list-layout.scss
@@ -67,6 +67,11 @@
         max-height: 100%;
         padding: 0px;
     }
+    .activity-badges{
+        .badge{
+            white-space: nowrap !important;
+        }
+    }
 }
 
 &:not(.editing) {

diff --git a/scss/styles.scss b/scss/styles.scss
@@ -307,6 +307,7 @@ body#page-course-view-remuiformat {
                     & a {
                         color: $heading-color;
                         @include frmt-font-styling(20px, 28px, 700);
+                        word-break: break-all;
                     }
 
                     .inplaceeditable {
@@ -342,6 +343,8 @@ body#page-course-view-remuiformat {
                 background-color: $small-ui-bg;
                 border-radius: $border-radius-4;
                 color: $paragraph-color;
+                font-size: 12px;
+                font-weight: 400px;
                 .description-inner{
                     padding: 0px;
                     border:unset;
@@ -447,6 +450,9 @@ body#page-course-view-remuiformat {
                                     &:hover{
                                         box-shadow: $card-box-shadow;
                                     }
+                                    .sectionbadges{
+                                        width: 100%;
+                                    }
                                     .actions {
                                         display: flex;
                                         position: relative;
@@ -469,7 +475,8 @@ body#page-course-view-remuiformat {
                                         .activity-information {
                                             width: 100%;
 
-                                            .completion-info {
+                                            .completion-info,
+                                            [data-region="completion-info"] {
                                                 width: 100%;
                                                 float: left;
 
@@ -557,6 +564,7 @@ body#page-course-view-remuiformat {
                 white-space: normal;
                 @include frmt-font-styling(12px, 14px, 400);
                 vertical-align: middle;
+                text-align: left;
                 // margin-right: .5rem;
             }
 

diff --git a/styles.css b/styles.css
@@ -647,8 +647,9 @@ body#page-course-view-remuiformat .remui-format-card.single-section-format .acti
   width: 100%;
 }
 
-body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards .activity .completion-container.manual-completion .completion-info .btn,
-body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards.section .activity .completion-container.manual-completion .completion-info .btn {
+body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards .activity .completion-container.manual-completion .completion-info .btn, body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards .activity .completion-container.manual-completion [data-region="completion-info"] .btn,
+body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards.section .activity .completion-container.manual-completion .completion-info .btn,
+body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards.section .activity .completion-container.manual-completion [data-region="completion-info"] .btn {
   width: 100%;
 }
 
@@ -680,13 +681,17 @@ body#page-course-view-remuiformat .remui-format-card.single-section-format .acti
 }
 
 body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards .activity.modtype_label .single-card .completion-info,
-body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards.section .activity.modtype_label .single-card .completion-info {
+body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards .activity.modtype_label .single-card [data-region="completion-info"],
+body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards.section .activity.modtype_label .single-card .completion-info,
+body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards.section .activity.modtype_label .single-card [data-region="completion-info"] {
   display: flex;
   justify-content: flex-end;
 }
 
 body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards .activity.modtype_label .single-card .completion-info .btn,
-body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards.section .activity.modtype_label .single-card .completion-info .btn {
+body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards .activity.modtype_label .single-card [data-region="completion-info"] .btn,
+body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards.section .activity.modtype_label .single-card .completion-info .btn,
+body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards.section .activity.modtype_label .single-card [data-region="completion-info"] .btn {
   width: -webkit-fit-content;
   width: fit-content;
 }
@@ -824,6 +829,10 @@ body#page-course-view-remuiformat .modtype_label .contentwithoutlink {
   padding: 0px;
 }
 
+body#page-course-view-remuiformat .modtype_label .activity-badges .badge {
+  white-space: nowrap !important;
+}
+
 body#page-course-view-remuiformat:not(.editing) .remui-format-list .sections .section .side.left {
   align-items: center;
   gap: 4px;
@@ -1517,6 +1526,7 @@ body#page-course-view-remuiformat .activity .activitytitle .media-body .activity
   font-size: 20px;
   line-height: 28px;
   font-weight: 700;
+  word-break: break-all;
 }
 
 body#page-course-view-remuiformat .activity .activitytitle .media-body .activityname .inplaceeditable {
@@ -1544,6 +1554,8 @@ body#page-course-view-remuiformat .activity .description .course-description-ite
   background-color: #EBF0F9;
   border-radius: 4px;
   color: #4C5A73;
+  font-size: 12px;
+  font-weight: 400px;
 }
 
 body#page-course-view-remuiformat .activity .description .course-description-item .description-inner {
@@ -1669,6 +1681,10 @@ body#page-course-view-remuiformat .course-content .sections #section-0 .general-
   box-shadow: 0px 13px 37px rgba(92, 107, 121, 0.1);
 }
 
+body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity:not(.modtype_label) .sectionbadges {
+  width: 100%;
+}
+
 body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity:not(.modtype_label) .actions {
   display: flex;
   position: relative;
@@ -1693,12 +1709,14 @@ body#page-course-view-remuiformat .course-content .sections #section-0 .general-
   width: 100%;
 }
 
-body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity:not(.modtype_label) .actions .activity-information .completion-info {
+body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity:not(.modtype_label) .actions .activity-information .completion-info,
+body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity:not(.modtype_label) .actions .activity-information [data-region="completion-info"] {
   width: 100%;
   float: left;
 }
 
-body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity:not(.modtype_label) .actions .activity-information .completion-info .btn {
+body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity:not(.modtype_label) .actions .activity-information .completion-info .btn,
+body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity:not(.modtype_label) .actions .activity-information [data-region="completion-info"] .btn {
   width: 100%;
 }
 
@@ -1773,6 +1791,7 @@ body#page-course-view-remuiformat .course-content .sections .badge {
   line-height: 14px;
   font-weight: 400;
   vertical-align: middle;
+  text-align: left;
 }
 
 body#page-course-view-remuiformat .course-content .sections .wdm-add-new-section {

diff --git a/templates/card_one_section.mustache b/templates/card_one_section.mustache
@@ -194,9 +194,9 @@
                                 <div class="completion-check-{{id}}">
                                     {{{ completion }}}
                                 </div>
-                                <div class="{{^summary}}nosummary{{/summary}}">{{{ availstatus }}}</div>
                             </div>
                             {{/completion}}
+                            <div class="{{^summary}}nosummary{{/summary}}">{{{ availstatus }}}</div>
 
                         </div>
                     </li>

diff --git a/templates/card_section_summary.mustache b/templates/card_section_summary.mustache
@@ -111,6 +111,9 @@
             <a class="text-muted" href="{{ editsectionurl }}"><span><i class="fa fa-cog font-size-20 "
                         aria-hidden="true"></i></span></a>
             {{/editsectionurl}}
+            {{#hiddenmessage}}
+                {{{hiddenmessage}}}
+            {{/hiddenmessage}}
         </div>
         <div class="section-action-container  progress-bar-warpper card-bottom d-flex {{^hidden}}text-primary{{/hidden}}{{#hidden}}text-muted{{/hidden}}">
             {{#progressinfo}}

diff --git a/templates/card_section_summary_edit.mustache b/templates/card_section_summary_edit.mustache
@@ -126,6 +126,9 @@
             {{#editsectionurl}}
                 <a class="text-muted" href="{{ editsectionurl }}"><span><i class="fa fa-cog font-size-20" aria-hidden="true"></i></span></a>
             {{/editsectionurl}}
+            {{#hiddenmessage}}
+                {{{hiddenmessage}}}
+            {{/hiddenmessage}}
         </div>
         <div class="section-action-container  progress-bar-warpper card-bottom d-flex {{^hidden}}text-primary{{/hidden}}{{#hidden}}text-muted{{/hidden}}">
             {{#progressinfo}}

diff --git a/version.php b/version.php
@@ -23,8 +23,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023053000;                    // The current plugin version (Date: YYYYMMDDXX).
-$plugin->release   = '4.1.3';
+$plugin->version   = 2023101700;                    // The current plugin version (Date: YYYYMMDDXX).
+$plugin->release   = '4.1.4';
 $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).