Skip to content

Commit

Permalink
Merge pull request #81 from WisdmLabs/dev40
Browse files Browse the repository at this point in the history 
Merge Dev40 to stable40
  • Loading branch information
@abhikushwah
abhikushwah authored May 31, 2023
2 parents 07cc5ee + 88d8568 commit a5dcc55
Show file tree
Hide file tree
Showing 26 changed files with 224 additions and 132 deletions.
2 changes: 1 addition & 1 deletion amd/build/common.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion amd/build/common.min.js.map
View file

Large diffs are not rendered by default.

22 changes: 14 additions & 8 deletions amd/src/common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ define(['jquery'], function($) {
$(SELECTORS.ACTIVITY_TOGGLE).on('click', function() {

if ($(this).hasClass(SELECTORS.SHOW)) {
$(this).html('Show Less');
$(this).html(M.util.get_string('showless', 'format_remuiformat'));
$(this).toggleClass(SELECTORS.SHOW); // Remove show class
} else {
$(this).html('Show More');
$(this).html(M.util.get_string('showmore', 'format_remuiformat'));
$(this).toggleClass(SELECTORS.SHOW); // Add show class
$("html, body").animate({
scrollTop: $(SELECTORS.FIRST_SECTION + ' .activity:first-child').offset().top - 66
Expand All @@ -125,20 +125,26 @@ define(['jquery'], function($) {

// ... + Show full summary label show conditionally.
var summaryheight = $('.read-more-target').height();
if (summaryheight > 110) {
var browservendor = window.navigator.vendor;
var webkitboxorient = "vertical";
if (browservendor.indexOf('Apple') != -1) {
webkitboxorient = "horizontal";
}

if (summaryheight > 100) {
$('.generalsectioninfo').find('#readmorebtn').removeClass('d-none');
$('.read-more-target .no-overflow').addClass('text-clamp text-clamp-3').css("-webkit-box-orient", "vertical");
$('.read-more-target').addClass('text-clamp text-clamp-3').css("-webkit-box-orient", "vertical");
$('.read-more-target .no-overflow').addClass('text-clamp text-clamp-3').css("-webkit-box-orient", webkitboxorient);
$('.read-more-target').addClass('text-clamp text-clamp-3').css("-webkit-box-orient", webkitboxorient);
}
$('#readmorebtn').on('click', function() {
$('.read-more-target .no-overflow').removeClass('text-clamp text-clamp-3');
$('.read-more-target').removeClass('text-clamp text-clamp-3');
$('.generalsectioninfo').find('#readmorebtn').addClass('d-none');
$('.generalsectioninfo').find('#readlessbtn').removeClass('d-none');
});
$('#readlessbtn').on('click', function() {
$('.read-more-target .no-overflow').addClass('text-clamp text-clamp-3').css("-webkit-box-orient", "vertical");
$('.read-more-target').addClass('text-clamp text-clamp-3').css("-webkit-box-orient", "vertical");
$('#readlessbtn').on('click', function () {
$('.read-more-target .no-overflow').addClass('text-clamp text-clamp-3').css("-webkit-box-orient", webkitboxorient);
$('.read-more-target').addClass('text-clamp text-clamp-3').css("-webkit-box-orient", webkitboxorient);
$('.generalsectioninfo').find('#readmorebtn').removeClass('d-none');
$('.generalsectioninfo').find('#readlessbtn').addClass('d-none');
});
Expand Down
9 changes: 9 additions & 0 deletions changes.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
CHANGES LOG

Version 4.1.3
=============.
Tweak - UI improvements.
Fix - Hide general section when empty issue fixed.
Fix - ellipsis issue in safari browser fixed
Fix - Upgradation error issue fixed.
Fix - Missing Lang strings added


Version 4.1.2
=============.
Tweak - UI improvements in Label activitity.
Expand Down
184 changes: 98 additions & 86 deletions classes/course_format_data_common_trait.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -995,6 +995,7 @@ private function get_activities_details($section, $course, $courserenderer, $set
$modicons .= $mod->afterediticons;
$activitydetails->modicons = $modicons;
}
$activitydetails->summary = format_text($activitydetails->summary);
$output[] = $activitydetails;
$count++;
}
Expand All @@ -1008,107 +1009,118 @@ public function add_generalsection_data(&$export, $renderer, $editing, $course,
$sections = $modinfo->get_section_info_all();
$hidegeneralsection = $courseformat->hide_general_section_when_empty($course, $modinfo);
$settings = $courseformat->get_settings();
if (!$hidegeneralsection) {
$output = array();
// Setting up data for General Section.
$generalsection = $modinfo->get_section_info(0);
$export->generalsection['index'] = 0;
$generalsectionsummary = $renderer->format_summary_text($generalsection);
if (empty($generalsectionsummary)) {
$generalsectionsummary = $course->summary;
}
if ($generalsection) {
if ($editing) {
$export->generalsection['title'] = $renderer->section_title($generalsection, $course);
$export->generalsection['editsetionurl'] = new \moodle_url(
'editsection.php',
array('id' => $generalsection->id)
);
$export->generalsection['leftsection'] = $renderer->section_left_content(
$generalsection,
$course,
false
);
// New menu option.
$export->generalsection['optionmenu'] = $this->course_section_controlmenu(
$course,
$generalsection
);
} else {
$export->generalsection['title'] = $courseformat->get_section_name($generalsection);
}

$generalsecactivities = $this->get_activities_details($generalsection, $course, $courserenderer, $settings);
$export->generalsection['activities'] = $generalsecactivities;
// Check if activities exists in general section.
if ( !empty($generalsecactivities) ) {
$export->generalsection['activityexists'] = 1;
} else {
$export->generalsection['activityexists'] = 0;
}

$export->generalsection['availability'] = $this->course_section_availability(
if (empty($generalsectionsummary)) {
$generalsectionsummary = $course->summary;
}
if ($generalsection) {
if ($editing) {
$export->generalsection['title'] = $renderer->section_title($generalsection, $course);
$export->generalsection['editsetionurl'] = new \moodle_url(
'editsection.php',
array('id' => $generalsection->id)
);
$export->generalsection['leftsection'] = $renderer->section_left_content(
$generalsection,
$course,
false
);
// New menu option.
$export->generalsection['optionmenu'] = $this->course_section_controlmenu(
$course,
$generalsection
);
} else {
$export->generalsection['title'] = $courseformat->get_section_name($generalsection);
}

$export->generalsection['summary'] = $renderer->abstract_html_contents(
$generalsectionsummary, 400
);
$export->generalsection['fullsummary'] = $generalsectionsummary;
$generalsecactivities = $this->get_activities_details($generalsection, $course, $courserenderer, $settings);
$export->generalsection['activities'] = $generalsecactivities;
// Check if activities exists in general section.
if ( !empty($generalsecactivities) ) {
$export->generalsection['activityexists'] = 1;
} else {
$export->generalsection['activityexists'] = 0;
}

// Get course image if added.
$imgurl = $this->display_file(
$coursecontext,
$settings['remuicourseimage_filemanager']
);
if (empty($imgurl)) {
$imgurl = $this->get_dummy_image_for_id($course->id);
}
$export->generalsection['coursemainimage'] = $imgurl;

// It will add extra data to the $export , this method takes 3 arguments $export,
// course, course progress percentage.
get_extra_header_context($export, $course, progress::get_course_progress_percentage($course), $imgurl);
// Get the all activities count from the all sections.
$sectionmods = array();
for ($i = 0; $i < count($sections); $i++) {
if (isset($modinfo->sections[$i])) {
foreach ($modinfo->sections[$i] as $cmid) {
$thismod = $modinfo->cms[$cmid];
if (!$thismod->is_visible_on_course_page()) {
continue;
}
if (isset($sectionmods[$thismod->modname])) {
$sectionmods[$thismod->modname]['name'] = $thismod->modplural;
$sectionmods[$thismod->modname]['count']++;
} else {
$sectionmods[$thismod->modname]['name'] = $thismod->modfullname;
$sectionmods[$thismod->modname]['count'] = 1;
}
$export->generalsection['availability'] = $this->course_section_availability(
$course,
$generalsection
);

$export->generalsection['summary'] = $renderer->abstract_html_contents(
$generalsectionsummary, 400
);
$export->generalsection['fullsummary'] = $generalsectionsummary;

// Get course image if added.
$imgurl = $this->display_file(
$coursecontext,
$settings['remuicourseimage_filemanager']
);
if (empty($imgurl)) {
$imgurl = $this->get_dummy_image_for_id($course->id);
}
$export->generalsection['coursemainimage'] = $imgurl;

// It will add extra data to the $export , this method takes 3 arguments $export,
// course, course progress percentage.
get_extra_header_context($export, $course, progress::get_course_progress_percentage($course), $imgurl);
// Get the all activities count from the all sections.
$sectionmods = array();
for ($i = 0; $i < count($sections); $i++) {
if (isset($modinfo->sections[$i])) {
foreach ($modinfo->sections[$i] as $cmid) {
$thismod = $modinfo->cms[$cmid];
if (!$thismod->is_visible_on_course_page()) {
continue;
}
if (isset($sectionmods[$thismod->modname])) {
$sectionmods[$thismod->modname]['name'] = $thismod->modplural;
$sectionmods[$thismod->modname]['count']++;
} else {
$sectionmods[$thismod->modname]['name'] = $thismod->modfullname;
$sectionmods[$thismod->modname]['count'] = 1;
}
}
}
$lastactivitydata = end($sectionmods);
foreach ($sectionmods as $mod) {
if ($lastactivitydata != $mod) {
$output['activitylist'][] = $mod['count'].' '.$mod['name'].',';
} else {
$output['activitylist'][] = $mod['count'].' '.$mod['name'].'.';
}
}
$lastactivitydata = end($sectionmods);
foreach ($sectionmods as $mod) {
if ($lastactivitydata != $mod) {
$output['activitylist'][] = $mod['count'].' '.$mod['name'].',';
} else {
$output['activitylist'][] = $mod['count'].' '.$mod['name'].'.';
}
$export->activitylist = $output['activitylist'];
}
$export->activitylist = array_key_exists("activitylist", $output) ? $output['activitylist'] : '';

if ($export->generalsection['percentage'] != 100) {
// Get reseume activity link.
$export->resumeactivityurl = $this->get_activity_to_resume($course);
}
// Add new activity.
$export->generalsection['addnewactivity'] = $courserenderer->course_section_add_cm_control(
$course,
0,
0
);
if ($export->generalsection['percentage'] != 100) {
// Get reseume activity link.
$export->resumeactivityurl = $this->get_activity_to_resume($course);
}
// Add new activity.
$export->generalsection['addnewactivity'] = $courserenderer->course_section_add_cm_control(
$course,
0,
0
);
$export->generalsection['showgeneralsection'] = true;
$export->generalsection['showgeneralsectionintrodata'] = true;
$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']) {
$export->generalsection['showgeneralsectionintrodata'] = false;
}
if (empty($export->activitylist)) {
$export->generalsection['courseinformationdata'] = false;
}
}
}

}
Loading

0 comments on commit a5dcc55

Please sign in to comment.