Changeset 1143

Timestamp:

04/27/10 00:06:59 (2 years ago)

Author:

wefgef

Message:

Adds two new params to TaskParams? macro.

Location:

trunk

Files:

• common/db/task.php (modified) (1 diff)
• www/macros/macro_taskparam.php (modified) (2 diffs)

trunk/common/db/task.php

@@ -347 +347 @@
 }
 
+// Returns the score a user got on a task in the archive.
+// Optionally, a different round parameter can be specified.
+function task_get_user_score($task_id, $user_id, $round_id = 'arhiva') {
+    // Validate
+    if (!is_round_id($round_id)) {
+        log_error("Invalid round id");
+    }
+    if (!is_task_id($task_id)) {
+        log_error("Invalid task id");
+    }
+    if (!is_user_id($user_id)) {
+        log_error("Invalid user id");
+    }
+
+    $query = sprintf(
+        "SELECT `score` FROM ia_score_user_round_task
+         WHERE round_id = %s AND task_id = %s AND user_id = %s",
+         db_quote($round_id), db_quote($task_id), db_quote($user_id));
+    $res = db_fetch($query);
+
+    return getattr($res, "score", null);
+}
+
 ?>

trunk/www/macros/macro_taskparam.php

@@ -6 +6 @@
 require_once(IA_ROOT_DIR . "common/cache.php");
 require_once(IA_ROOT_DIR . "www/format/format.php");
+require_once(IA_ROOT_DIR . "www/macros/macro_stars.php");
 
 // Displays a task field, be it a hard-coded field such as task author or a grader parameter such as `timelimit`.
@@ -83 +84 @@
                                     $user['rating_cache']);
 
+        case 'difficulty':
+            if (is_null($task['rating'])) {
+                return 'N/A';
+            }
+            $star_args = array('rating' => $task['rating'],
+                               'scale' => 5,
+                               'type' => 'normal');
+            return macro_stars($star_args);
+
+        case 'archivescore':
+            $user = identity_get_user();
+            if (is_null($user)) {
+                return 'N/A';
+            } else {
+                $score = task_get_user_score($task['id'], $user['id']);
+                if (is_null($score)) {
+                    return 'N/A';
+                } else {
+                    return intval($score) . " puncte";
+                }
+            }
+
         default:
             $params = task_get_parameters($task_id);