Changeset 1114

Timestamp:

03/20/10 16:19:40 (2 years ago)

Author:

wefgef

Message:

Added new rating count column in round tasks table.

• Added a new security action.
• Added a new select statement to get the tasks rating count.
• Added a new column in the Tasks macro.

REVIEW URL ​http://reviewboard.infoarena.ro/r/141/

Location:

trunk

Files:

• common/db/round.php (modified) (2 diffs)
• common/security.php (modified) (1 diff)
• www/macros/macro_tasks.php (modified) (4 diffs)

trunk/common/db/round.php

@@ -104 +104 @@
 //
 // if user_id is non-null a join is done on $score
-function round_get_tasks($round_id, $first = 0, $count = null, $user_id = null, $fetch_scores = false, $filter = null) {
+function round_get_tasks($round_id, $first = 0, $count = null,
+                         $user_id = null, $fetch_scores = false,
+                         $filter = null, $progress = false) {
     if ($count === null) {
         $count = 666013;
@@ -141 +143 @@
                          db_escape($first), db_escape($count));
     }
-    return db_fetch_all($query);
+
+    $res = db_fetch_all($query);
+
+    if ($progress) {
+        $task_ids = array();
+        foreach ($res as $row) {
+            $task_ids[] = $row['id'];
+        }
+
+        $query_ratings = sprintf(
+              "SELECT task_ratings.task_id AS id, count(*) AS rating_count
+               FROM ia_task_ratings AS task_ratings
+               WHERE task_ratings.task_id IN (%s)
+               GROUP BY id",
+               implode(',', array_map('db_quote', $task_ids))
+        );
+
+        $res_ratings = db_fetch_all($query_ratings);
+
+        $rating_count = array();
+        foreach ($res_ratings as $res_rating) {
+            $rating_count[$res_rating['id']] = $res_rating['rating_count'];
+        }
+
+        foreach ($res as &$row) {
+            $row['progress'] = getattr($rating_count, $row['id']);
+        }
+    }
+
+    return $res;
 }
 

trunk/common/security.php

@@ -147 +147 @@
         case 'task-edit-ratings':
         case 'round-tag':
+        case 'round-view-progress':
         case 'textblock-tag':
         case 'job-reeval':

trunk/www/macros/macro_tasks.php

@@ -13 +13 @@
     } else {
         return round($val);
+    }
+}
+
+function format_progress_column($val) {
+    if (is_null($val)) {
+        return 'N/A';
+    } else {
+        return $val;
     }
 }
@@ -127 +135 @@
     $show_sources = getattr($args, 'show_sources', true);
 
+    $show_progress = getattr($args, 'show_progress', false) &&
+                     identity_can("round-view-progress", $round);
+
     // get round tasks
     $tasks = round_get_tasks($round_id,
@@ -132 +143 @@
              $options['display_entries'],
              $user_id, $scores,
-             $filter);
+             $filter, $show_progress);
     $options['total_entries'] = round_get_task_count(
              $round_id, $user_id, $filter);
@@ -174 +185 @@
         );
     }
+    if ($show_progress) {
+        $column_infos[] = array (
+                'title' => 'Note',
+                'css_class' => 'number',
+                'key' => 'progress',
+                'valform' => 'format_progress_column',
+        );
+    }
 
     return $tabs.format_table($tasks, $column_infos, $options);