Changeset 1095

Timestamp:

12/24/09 01:10:43 (2 years ago)

Author:

savin.tiberiu@…

Message:

Filter tasks by tag

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

Location:

trunk

Files:

• common/db/task.php (modified) (1 diff)
• www/controllers/task.php (modified) (1 diff)
• www/index.php (modified) (1 diff)
• www/macros/macro_algorithmtags.php (modified) (2 diffs)
• www/macros/macro_taskparam.php (modified) (1 diff)
• www/macros/macro_tasks.php (modified) (2 diffs)
• www/static/css/sitewide.css (modified) (2 diffs)
• www/url.php (modified) (2 diffs)
• www/views/task_filter_results.php (added)

trunk/common/db/task.php

@@ -173 +173 @@
 }
 
+function task_get_authors($task_id, $no_cache = false) {
+    log_assert(is_task_id($task_id), 'Invalid task_id');
+
+    $authors = false;
+    if (!$no_cache) {
+        $authors = mem_cache_get("task-authors-by-id:".$task_id);
+    }
+
+    if ($authors === false) {
+        $authors = tag_get("task", $task_id, "author");
+        mem_cache_set("task-authors-by-id:".$task_id, $authors);
+    }
+
+    return $authors;
+}
+
+// Task filter
+// Returns only tasks that contain all the tags
+// and are in 'arhiva' or in 'arhiva-educationala'
+// Task from 'arhiva-educationala' are shown first
+function task_filter_by_tags($tag_ids, $scores = true, $user_id = null) {
+    log_assert(is_array($tag_ids), "tag_ids must be an array");
+    foreach ($tag_ids as $tag_id) {
+        log_assert(is_tag_id($tag_id), "invalid tag id");
+    }
+
+    if (count($tag_ids) > 0) {
+        $tag_filter = "AND ".tag_build_where('task', $tag_ids);
+    } else {
+        $tag_filter = "";
+    }
+
+    if ($user_id == null || $scores == false) {
+        $join_score = "";
+        $score_fields = "";
+    } else {
+        $join_score = "LEFT JOIN ia_score ON ia_score.user_id = ".db_quote($user_id)." AND
+                            ia_score.round_id = round.id AND
+                            ia_score.task_id = ia_task.id AND
+                            ia_score.name = 'score'";
+        $score_fields = "ia_score.score,";
+    }
+
+    $query = "SELECT ia_task.id AS task_id,
+                ia_task.title AS task_title,
+                ia_task.order AS 'order',
+                ia_task.page_name AS page_name,
+                ia_task.open_source AS open_source,
+                ia_task.open_tests AS open_tests,
+                round.id AS round_id,
+                $score_fields
+                round.title AS round_title
+    FROM ia_task
+    LEFT JOIN ia_round_task AS round_task ON round_task.task_id = ia_task.id
+    LEFT JOIN ia_round AS round ON round.id = round_task.round_id
+    $join_score
+    WHERE (round.id = 'arhiva' OR round.id = 'arhiva-educationala')
+        AND ia_task.hidden = '0' $tag_filter
+    ORDER BY round.id DESC, ia_task.order";
+    $tasks = db_fetch_all($query);
+
+    return $tasks;
+}
 ?>

trunk/www/controllers/task.php

@@ -330 +330 @@
 }
 
+// Gets a list of tags from request
+// Prints a list of tasks that contain all those tags
+// Tasks must be in 'arhiva' or in 'arhiva educationala'
+function controller_task_search() {
+    $tags = request('tag_id', null);
+    if (is_null($tags)) {
+        $tags = Array();
+    }
+
+    if (!is_array($tags)) {
+        flash_error("Url invalid");
+        redirect(url_home());
+    }
+
+    foreach ($tags as $tag) {
+        if (!is_tag_id($tag)) {
+            flash_error("Url invalid");
+            redirect(url_home());
+        }
+    }
+
+    if (identity_is_anonymous()) {
+        $user_id = null;
+    } else {
+        $user_id = identity_get_user_id();
+    }
+    $tasks = task_filter_by_tags($tags, true, $user_id);
+    foreach ($tasks as &$task) {
+        $task['authors'] = task_get_authors($task['task_id']);
+    }
+
+    $view['title'] = "Rezultatele filtrării";
+    $view['tasks'] = $tasks;
+    execute_view_die('views/task_filter_results.php', $view);
+}
+
 ?>

trunk/www/index.php

@@ -83 +83 @@
 }
 
+// Task search
+else if ($page == 'cauta-probleme') {
+    require_once(IA_ROOT_DIR.'www/controllers/task.php');
+    controller_task_search();
+}
+
 // Task detail editor
 else if ($urlstart == 'admin' && getattr($pagepath, 1) == 'problema') {

trunk/www/macros/macro_algorithmtags.php

@@ -51 +51 @@
         $subtags_html = Array();
         foreach ($tag['sub_tags'] as $subtag) {
-            $subtags_html[] = '<div class="sub_tag_name">'.$subtag['name'].'</div>';
+            $tag_link = format_link(url_task_search(array($tag_id)), $subtag['name'], true,
+                            array('class' => "sub_tag_search_anchor"));
+            $subtags_html[] = '<div class="sub_tag_name">'.$tag_link.'</div>';
         }
 
         $color_scheme = $tag_id % 6;
+        $tag_link = format_link(url_task_search(array($tag_id)), $tag_name, true, array('class' => 'tag_search_anchor'));
         $html_code .= '
         <li style="display: none;" class="tags_list_item">
-            <span class="tag_name color_scheme_'.$color_scheme.'">'.html_escape($tag_name).'</span>
+            <span class="tag_name color_scheme_'.$color_scheme.'">'.$tag_link.'</span>
             <a href="javascript:show_tag_list('.html_escape($tag_id).')"
                     id="tag_anchor_'.html_escape($tag_id).'"
@@ -66 +69 @@
             <div style="display: none;"
                 id="tag_list_'.html_escape($tag_id).'"
-            >:
-                '.implode(' ', $subtags_html).'
+            >&nbsp;
+                '.implode('&nbsp;', $subtags_html).'
             </div>
         </li>';

trunk/www/macros/macro_taskparam.php

@@ -52 +52 @@
 
         case 'author':
-            $authors = mem_cache_get("task-authors-by-id:".$task["id"]);
-            if ($authors === false) {
-                $authors = tag_get("task", $task["id"], "author");
-                mem_cache_set("task-authors-by-id:".$task["id"], $authors);
-            }
+            $authors = task_get_authors($task['id']);
             function format_author($tag) {
                 return format_link(url_task_search(array($tag["id"])), $tag["name"]);

trunk/www/macros/macro_tasks.php

@@ -5 +5 @@
 require_once(IA_ROOT_DIR . "www/format/pager.php");
 require_once(IA_ROOT_DIR . "common/db/round.php");
+require_once(IA_ROOT_DIR . "common/db/task.php");
 require_once(IA_ROOT_DIR . "common/round.php");
 
@@ -28 +29 @@
     return format_link(url_task_search(array($tag["id"])), $tag["name"]);
 }
+
 function format_author($row) {
-    $authors = mem_cache_get("task-authors-by-id:".$row["id"]);
-    if ($authors === false) {
-        $authors = tag_get("task", $row["id"], "author");
-        mem_cache_set("task-authors-by-id:".$row["id"], $authors);
-    }
+    $authors = task_get_authors($row['id']);
     return implode(", ", array_map('format_single_author', $authors));
 }

trunk/www/static/css/sitewide.css

@@ -310 +310 @@
 }
 
+a.sub_tag_search_anchor {
+    color: #000000;
+    outline-style: none;
+}
+
+a.sub_tag_search_anchor:hover {
+    text-decoration: none;
+}
+
+a.tag_search_anchor {
+    color: #FFF0E1;
+    outline-style: none;
+}
+
+a.tag_search_anchor:hover {
+    text-decoration: none;
+}
+
 .tag_name.color_scheme_0 {
     background-color: rgb(204, 0, 0);
@@ -337 +355 @@
     font-size: 10px;
 }
+
+table.filter_results {
+    width: 99%;
+}

trunk/www/url.php

@@ -52 +52 @@
         }
         if ($k != 'page') {
-            $url .= ($first ? "?" : "&");
-            $first = false;
-            $url .= $k . '=' . urlencode($v);
+            if (is_array($v)) {
+                foreach ($v as $sv) {
+                    $url .= ($first ? "?" : "&");
+                    $first = false;
+                    $url .= $k. '[]=' . urlencode($sv);
+                }
+            } else {
+                $url .= ($first ? "?" : "&");
+                $first = false;
+                $url .= $k . '=' . urlencode($v);
+            }
         }
     }
-
     return $url;
 }
@@ -267 +274 @@
 
 function url_task_search($tag_ids) {
-    // STUB
-    return "#" . implode("#", array_map('html_escape', $tag_ids));
+    log_assert(is_array($tag_ids), "Tag ids must be an array");
+    return url_complex("cauta-probleme", array("tag_id" => $tag_ids));
 }