Show label in course if there are posts waiting for review; Only count posts in review period

Author: justusdieckmann

classes/review.php

@@ -68,10 +68,12 @@ public static function get_short_review_info_for_discussion(int $discussionid) {
         global $DB;
 
         return $DB->get_record_sql(
-            'SELECT COUNT(*) as count, MIN(id) AS first ' .
+                'SELECT COUNT(*) as count, MIN(id) AS first ' .
                 'FROM {moodleoverflow_posts} ' .
-                'WHERE discussion = :discussionid AND reviewed = 0',
-            ['discussionid' => $discussionid]
+                'WHERE discussion = :discussionid AND reviewed = 0 AND created < :cutofftime', [
+                        'discussionid' => $discussionid,
+                        'cutofftime' => time() - get_config('moodleoverflow', 'reviewpossibleaftertime')
+                ]
         );
     }
 
@@ -138,5 +140,24 @@ public static function is_post_in_review_period($post): bool {
         return time() - $post->created > get_config('moodleoverflow', 'reviewpossibleaftertime');
     }
 
+    /**
+     * Count outstanding reviews in the moodleoverflow.
+     *
+     * @param $moodleoverflowid
+     * @return int
+     */
+    public static function count_outstanding_reviews_in_moodleoverflow($moodleoverflowid): int {
+        global $DB;
+        return $DB->count_records_sql(
+                'SELECT COUNT(*) ' .
+                'FROM {moodleoverflow_posts} p ' .
+                'JOIN {moodleoverflow_discussions} d ON d.id = p.discussion ' .
+                'WHERE d.moodleoverflow = :moodleoverflowid AND p.created < :cutofftime AND reviewed = 0', [
+                        'moodleoverflowid' => $moodleoverflowid,
+                        'cutofftime' => time() - get_config('moodleoverflow', 'reviewpossibleaftertime')
+                ]
+        );
+    }
+
 
 }

lib.php

@@ -1080,19 +1080,30 @@ function moodleoverflow_minimise_user_record(stdClass $user) {
 function moodleoverflow_cm_info_view(cm_info $cm) {
 
     $cantrack = \mod_moodleoverflow\readtracking::moodleoverflow_can_track_moodleoverflows();
+    $out = "";
+    if (has_capability('mod/moodleoverflow:reviewpost', $cm->context)) {
+        $reviewcount = \mod_moodleoverflow\review::count_outstanding_reviews_in_moodleoverflow($cm->instance);
+        if ($reviewcount) {
+            $out .= '<span class="mod_moodleoverflow-label-review"><a href="' . $cm->url . '">';
+            $out .= get_string('amount_waiting_for_review', 'mod_moodleoverflow', $reviewcount);
+            $out .= '</a></span> ';
+        }
+    }
     if ($cantrack) {
         $unread = \mod_moodleoverflow\readtracking::moodleoverflow_count_unread_posts_moodleoverflow($cm);
         if ($unread) {
-            $out = '<span class="unread"> <a href="' . $cm->url . '">';
+            $out .= '<span class="mod_moodleoverflow-label-unread"> <a href="' . $cm->url . '">';
             if ($unread == 1) {
                 $out .= get_string('unreadpostsone', 'moodleoverflow');
             } else {
                 $out .= get_string('unreadpostsnumber', 'moodleoverflow', $unread);
             }
             $out .= '</a></span>';
-            $cm->set_after_link($out);
         }
     }
+    if ($out) {
+        $cm->set_after_link($out);
+    }
 }
 
 /**

styles.css

@@ -233,8 +233,8 @@
 }
 
 .moodleoverflowpost.unread .row.header,
-span.unread {
-    background-color: #ffd;
+.mod_moodleoverflow-label-unread {
+    background-color: #fff38a;
 }
 
 .moodleoverflowpost.unread .row.header {
@@ -470,4 +470,14 @@ span.unread {
     font-size: 2em;
     width: 32px;
     height: 32px;
+}
+
+.mod_moodleoverflow-label-review,
+.mod_moodleoverflow-label-unread {
+    padding: 4px;
+    border-radius: 8px;
+}
+
+.mod_moodleoverflow-label-review {
+    background-color: #ffd3d3;
 }

templates/discussion_list.mustache

@@ -165,7 +165,7 @@
 
                             {{! There are unread messages }}
                                 {{#unread}}
-                                    <span class="unread">
+                                    <span class="mod_moodleoverflow-label-unread">
                                         <a href="{{ unreadlink }}">{{ unreadamount }}</a>
                                         <a href="{{ markreadlink }}">
                                             {{# pix}} t/markasread, core, {{#str}}markread, moodleoverflow{{/str}} {{/ pix}}