Blog: screen loading slow #382997

moodleou · Jun 3, 2020 · 1dc07f6 · 1dc07f6
1 parent 8c10bf2
commit 1dc07f6
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 17 deletions.
diff --git a/amd/build/export.min.js b/amd/build/export.min.js
diff --git a/lang/en/oublog.php b/lang/en/oublog.php
@@ -737,3 +737,5 @@
 $string['export:header_date_posted'] = 'Date posted';
 $string['export:header_tags'] = 'Tags';
 $string['export:header_author'] = 'Author';
+$string['tagshowmore'] = 'Show more ...';
+$string['tagshowless'] = 'Show less ...';
diff --git a/locallib.php b/locallib.php
@@ -88,6 +88,7 @@
  * Constant defining the max length of tags
  */
 define('OUBLOG_EXPORT_TAGS_LENGTH', 40);
+define('OUBLOG_TAGS_SHOW', 500);
 
 /**
  * Get a blog from a user id
@@ -1046,7 +1047,7 @@ function oublog_get_tags_csv($postid) {
  * @return array Tag data
  */
 function oublog_get_tags($oublog, $groupid, $cm, $oubloginstanceid=null, $individualid=-1, $tagorder = 'alpha',
-        $masterblog = null) {
+        $masterblog = null, $limit = null) {
     global $CFG, $DB, $USER;
     $tags = array();
     $params = array();
@@ -1100,9 +1101,16 @@ function oublog_get_tags($oublog, $groupid, $cm, $oubloginstanceid=null, $indivi
                 INNER JOIN {oublog_posts} p ON ti.postid = p.id
                 INNER JOIN {user} u ON u.id = bi.userid
             WHERE $sqlwhere
-            GROUP BY t.id, t.tag
-            ORDER BY count DESC";
-
+            GROUP BY t.id, t.tag";
+    if ($tagorder == 'alpha') {
+        $sort = ' ORDER BY t.tag ASC';
+    } else {
+        $sort = ' ORDER BY count DESC';
+    }
+    $sql = $sql . $sort;
+    if ($limit > -1) {
+        $sql = $sql . ' LIMIT ' . $limit;
+    }
     if ($tags = $DB->get_records_sql($sql, $params)) {
         $first = array_shift($tags);
         $max = $first->count;
@@ -1117,11 +1125,6 @@ function oublog_get_tags($oublog, $groupid, $cm, $oubloginstanceid=null, $indivi
         foreach ($tags as $idx => $tag) {
             $tags[$idx]->weight = round(($tag->count-$min)/$delta*4);
         }
-        if ($tagorder == 'alpha') {
-            uasort($tags, function($a, $b) {
-                return strcmp ($a->tag,  $b->tag);
-            });
-        }
     }
     return($tags);
 }
@@ -1140,27 +1143,45 @@ function oublog_get_tags($oublog, $groupid, $cm, $oubloginstanceid=null, $indivi
  * @return array Tag cloud HTML, current filter tag
  */
 function oublog_get_tag_cloud($baseurl, $oublog, $groupid, $cm, $oubloginstanceid=null, $individualid=-1, $tagorder,
-        $masterblog = null) {
+        $masterblog = null, $limit = null) {
     global $PAGE;
     $cloud = '';
     $currenttag = $PAGE->url->get_param('tag');
     $currentfiltertag = '';
     $urlparts= array();
 
     $baseurl = oublog_replace_url_param($baseurl, 'tag');
-    if (!$tags = oublog_get_tags($oublog, $groupid, $cm, $oubloginstanceid, $individualid, $tagorder, $masterblog)) {
+    $baseurl = oublog_replace_url_param($baseurl, 'taglimit');
+
+    if (!$tags = oublog_get_tags($oublog, $groupid, $cm, $oubloginstanceid, $individualid, $tagorder, $masterblog, $limit)) {
         return [$cloud, $currentfiltertag];
     }
 
     $cloud .= html_writer::start_tag('div', array('class' => 'oublog-tag-items'));
     foreach ($tags as $tag) {
-        $cloud .= '<a href="'.$baseurl.'&amp;tag='.urlencode($tag->tag).'" class="oublog-tag-cloud-'.
-            $tag->weight.'"><span class="oublog-tagname">'.strtr(($tag->tag), array(' '=>'&nbsp;')).
-            '</span><span class="oublog-tagcount">('.$tag->count.')</span></a> ';
+        if ($limit == -1) {
+            $cloud .= '<a href="'.$baseurl.'&amp;tag='.urlencode($tag->tag).
+                    '&amp;taglimit='. urlencode($limit) . '" class="oublog-tag-cloud-'.
+                    $tag->weight.'"><span class="oublog-tagname">'.strtr(($tag->tag), array(' '=>'&nbsp;')).
+                    '</span><span class="oublog-tagcount">('.$tag->count.')</span></a> ';
+        } else {
+            $cloud .= '<a href="'.$baseurl.'&amp;tag='.urlencode($tag->tag).'" class="oublog-tag-cloud-'.
+                    $tag->weight.'"><span class="oublog-tagname">'.strtr(($tag->tag), array(' '=>'&nbsp;')).
+                    '</span><span class="oublog-tagcount">('.$tag->count.')</span></a> ';
+        }
+
         if (!is_null($currenttag) && $tag->tag == $currenttag) {
             $currentfiltertag = $tag;
         }
     }
+    if (count($tags) >= OUBLOG_TAGS_SHOW && $limit != -1) {
+        $showmore = get_string('tagshowmore', 'oublog');
+        $cloud .= '<a href="'. $baseurl . '&amp;taglimit=-1" class="mod-oublog-tags-show-more">' . $showmore . '</a>';
+    }
+    if ($limit == -1) {
+        $showless = get_string('tagshowless', 'oublog');
+        $cloud .= '<a href="'. $baseurl . '&amp;taglimit=' . OUBLOG_TAGS_SHOW . '" class="mod-oublog-tags-show-less">' . $showless . '</a>';
+    }
     $cloud .= html_writer::end_tag('div');
 
     return [$cloud, $currentfiltertag];

diff --git a/styles.css b/styles.css
@@ -761,3 +761,7 @@ oublog-filter-tagcount {
     height: 18px;
     float: right;
 }
+.mod-oublog-tags-show-more,
+.mod-oublog-tags-show-less {
+    display: inline-block;
+}
diff --git a/view.php b/view.php
@@ -31,6 +31,7 @@
 $tag    = optional_param('tag', null, PARAM_TAG);   // Tag to display.
 $page = optional_param('page', 0, PARAM_INT);
 $tagorder = optional_param('tagorder', '', PARAM_ALPHA);// Tag display order.
+$taglimit = optional_param('taglimit', OUBLOG_TAGS_SHOW, PARAM_INT);// Tag display order.
 
 // Set user value if u (username) set.
 if ($username != '') {
@@ -53,7 +54,7 @@
 }
 
 $url = new moodle_url('/mod/oublog/view.php', array('id' => $id, 'user' => $user,
-        'page' => $page, 'tag' => $tag, 'tagorder' => $tagorder));
+        'page' => $page, 'tag' => $tag, 'tagorder' => $tagorder, 'taglimit' => $taglimit));
 
 $PAGE->set_url($url);
 
@@ -180,6 +181,9 @@
 if ($tag) {
     $returnurl .= '&amp;tag='.urlencode($tag);
 }
+if ($taglimit) {
+    $returnurl .= '&amp;taglimit='.urlencode($taglimit);
+}
 
 // Set-up individual.
 $currentindividual = -1;
@@ -332,7 +336,7 @@
 
     // Tag Cloud.
     list ($tags, $currentfiltertag) = oublog_get_tag_cloud($returnurl, $oublog, $currentgroup, $cm,
-            $oubloginstanceid, $currentindividual, $tagorder, $masterblog);
+            $oubloginstanceid, $currentindividual, $tagorder, $masterblog, $taglimit);
     if ($tags) {
         $bc = new block_contents();
         $bc->attributes['id'] = 'oublog-tags';