Merge pull request WisdmLabs#39 from WisdmLabs/dev

Dev to master for v1.0.9

amd/src/format_card.js

@@ -62,8 +62,6 @@ define([
             }
         });
 
-        $('.single-card').css({ opacity: 0.0, visibility: "visible", }).animate({ opacity: 1.0, }, 600, "swing");
-
         // Call AJAX to set activity layout (Row or Card).
         $('.remui-format-card.single-section-format .activity-cards .actions .toggle-row-column').on('click', function() {
             var courseid = $('[data-courseid]').data('courseid');

changes.txt

@@ -1,3 +1,10 @@
+Version 1.0.9
+Fixes
+* Fixed resource creation using drag and drop.
+* Fixed activity deletion issue with card layout.
+* Fixed video playback issue with card layout section description.
+* Fixed remui sidebar issue with Course format.
+
 Version 1.0.8
 Fixes
 * Removed bootstrap classes from plugin CSS.
@@ -40,7 +47,7 @@ Version 1.0.4
 Fixes
 * Fixed issue when course layout resets on course restore.
 * Fixed multi-language support for section/topic summary in card format.
-* Fixed language support issue in activity count showed in the general section in card format. 
+* Fixed language support issue in activity count showed in the general section in card format.
 * General section image changes when changed in the other duplicated course in List format.
 
 Tweaks

classes/course_format_data_common_trait.php

@@ -13,7 +13,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
 /**
  * This is built using the bootstrapbase template to allow for new theme's using Moodle's new Bootstrap theme engine
  *
@@ -475,7 +474,7 @@ public static function get_dummy_color_for_id($id) {
     /**
      * Fetches the last viewed activity from the database table mdl_logstore_standard_log.
      *
-     * @param  int    $course Course ID.
+     * @param  object $course Course ID.
      * @return string         Last viewed activity.
      */
     public function get_activity_to_resume($course) {

classes/external/api.php

@@ -13,7 +13,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
 /**
  * Provides format_remuiformat\external\api class.
  *

classes/external/course_progress_data.php

@@ -13,7 +13,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
 /**
  * Provides format_remuiformat\external\course_progress_data trait.
  *
@@ -105,7 +104,7 @@ public static function course_progress_data($courseid) {
     public static function course_progress_data_returns() {
         return new external_single_structure (
             array(
-                'percentage' => new external_value(PARAM_NUMBER, 'Course completion percentage'),
+                'percentage' => new external_value(PARAM_FLOAT, 'Course completion percentage'),
                 'activitylist' => new external_multiple_structure(
                     new external_value(PARAM_TEXT, 'Activity count details'),
                     'Acitvity count list'

classes/external/move_activities.php

@@ -13,7 +13,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
 /**
  * Provides format_remuiformat\external\move_activities trait.
  *

classes/external/move_activity_to_section.php

@@ -13,7 +13,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
 /**
  * Provides format_remuiformat\external\move_activity_to_section trait.
  *

classes/external/show_activity_in_row.php

@@ -13,7 +13,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
 /**
  * Provides format_remuiformat\external\show_activity_in_row trait.
  *

classes/mod_stats.php

@@ -13,7 +13,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
 /**
  * This is built using the bootstrapbase template to allow for new theme's using Moodle's new Bootstrap theme engine
  *

classes/output/card_all_sections_summary_renderable.php

@@ -13,7 +13,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
 /**
  * Sinigle Section Renderable - A topics based format that uses card layout to diaply the content.
  *
@@ -179,8 +178,8 @@ private function get_card_format_context(&$export, $renderer, $editing, $rformat
                     $generalsectionsummary, 400
                 );
                 $export->generalsection['fullsummary'] = $generalsectionsummary;
-                // Get course image if added.
 
+                // Get course image if added.
                 $imgurl = $this->courseformatdatacommontrait->display_file($this->settings['remuicourseimage_filemanager']);
                 $imgurl = $this->courseformatdatacommontrait->display_file($this->settings['remuicourseimage_filemanager']);
                 if (empty($imgurl)) {

classes/output/card_one_section_renderable.php

@@ -13,7 +13,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
 /**
  * Activity Renderable - A topics based format that uses card layout to diaply the content.
  *
@@ -211,7 +210,8 @@ private function get_activities_details($section, $displayoptions = array()) {
                 $activitydetails->move = course_get_cm_move($mod, $section->section);
                 $activitydetails->title = $this->courserenderer->course_section_cm_name($mod, $displayoptions);
                 $activitydetails->title .= $mod->afterlink;
-                $activitydetails->modulename = $mod->modfullname;
+                $activitydetails->modulename = $mod->modname;
+                $activitydetails->modulefullname = $mod->modfullname;
                 $activitydetails->summary = $this->modstats->get_formatted_summary(
                     $this->courserenderer->course_section_cm_text($mod, $displayoptions),
                     $this->settings

classes/output/list_all_sections_renderable.php

@@ -13,7 +13,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
 /**
  * Sinigle Section Renderable - A topics based format that uses card layout to diaply the content.
  *

classes/output/list_all_sections_summary_renderable.php

@@ -13,7 +13,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
 /**
  * Sinigle Section Renderable - A topics based format that uses card layout to diaply the content.
  *

classes/output/list_one_section_renderable.php

@@ -13,7 +13,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
 /**
  * Activity Renderable - A topics based format that uses card layout to diaply the content.
  *
@@ -118,9 +117,9 @@ public function export_for_template(renderer_base $output) {
 
         // Check if the section is hidden section.
         if (!$sectioninfo->uservisible) {
-            if (!$course->hiddensections) {
+            if (!$this->course->hiddensections) {
                 $export->hiddensection = $renderer->start_section_list();
-                $export->hiddensection .= $renderer->section_hidden($displaysection, $this->course->id);
+                $export->hiddensection .= $renderer->section_hidden($this->displaysection, $this->course->id);
                 $export->hiddensection .= $renderer->end_section_list();
             }
             // Can't view this section.