Changeset 1081 for trunk

Timestamp:

12/17/09 00:03:05 (2 years ago)

Author:

savin.tiberiu@…

Message:

Made the interface for adding tags to a task.
Reviewed: ​http://reviewboard.infoarena.ro/r/120/

Location:

trunk

Files:

• common/db/tags.php (modified) (3 diffs)
• common/tags.php (modified) (1 diff)
• common/task.php (modified) (1 diff)
• www/controllers/task.php (modified) (2 diffs)
• www/index.php (modified) (2 diffs)
• www/static/css/sitewide.css (modified) (1 diff)
• www/url.php (modified) (1 diff)
• www/views/task_edit.php (modified) (1 diff)
• www/views/task_tag_edit.php (added)

trunk/common/db/tags.php

@@ -54 +54 @@
 }
 
+// Receives an array of tag_id's
+// Return an array with id's of their parents
+// Each parent id appears only once
+function tag_get_parents($tags) {
+    $query = sprintf("SELECT DISTINCT(`parent`)
+            FROM ia_tags
+            WHERE `id` IN (%s)",
+            implode(",", array_map('db_quote', $tags))
+        );
+    $result = db_fetch_all($query);
+    $ret = Array();
+    foreach ($result as $row) {
+        $ret[] = $row['parent'];
+    }
+    return $ret;
+}
+
 // Get tag id for a certain tag
 function tag_get_id($tag) {
@@ -81 +98 @@
 }
 
+// Get a list of tags from a list of tag ids
+function tag_get_by_ids($tag_ids) {
+    $query = sprintf(
+            "SELECT `id` AS tag_id, `name` AS tag_name,
+                    `parent` AS tag_parent, `type` AS tag_type
+            FROM ia_tags
+            WHERE `id` IN (%s)", implode(', ', array_map('db_quote', $tag_ids))
+        );
+    return db_fetch_all($query);
+}
+
 // Assign numeric id to a given tag name
 function tag_assign_id($tag) {
@@ -170 +198 @@
         db_escape($obj), $where, "%s"
     );
-    if (is_null($type)) {
-        $join = "";
-    } else {
+
+    $join = "";
+    if (!is_null($type)) {
         $join = "LEFT JOIN ia_tags AS tags ON obj_tags.tag_id = tags.id";
         $where .= sprintf(" AND tags.type = %s", db_quote($type));
     }
+
     $subquery = sprintf("SELECT tag_id FROM ia_%s_tags AS obj_tags %s WHERE %s",
         db_escape($obj), $join, $where);

trunk/common/tags.php

@@ -52 +52 @@
 }
 
+// Receives a list of parent tags and children tags
+// For each parent_tag adds an array 'sub_tags' containing
+// an array with all his children tags
+function build_tags_tree($parent_tags, $sub_tags) {
+    log_assert(is_array($parent_tags), "Parent tags is not an array");
+    log_assert(is_array($sub_tags), "Children tags is not an array");
+
+    $parent_tags_key = Array();
+    foreach ($parent_tags as $key => $tag) {
+        $parent_tags[$key]['sub_tags'] = Array();
+        $parent_tags_key[ $tag['tag_id'] ] = $key;
+    }
+
+    foreach ($sub_tags as $tag) {
+        log_assert(isset($parent_tags_key[ $tag['tag_parent'] ]), "Child tag doesn't have a parent");
+        $parent_tag_key = $parent_tags_key[ $tag['tag_parent'] ];
+        $parent_tags[ $parent_tag_key ]['sub_tags'][] = $tag;
+    }
+
+    return $parent_tags;
+}
+
 // Receives a list of tags of a certain type and, optionally, with a
 // certain parent and updates the tag list for the specified object.

trunk/common/task.php

@@ -277 +277 @@
 }
 
+// Receives a list of method and algorithm tag ids and adds links them to task_id
+function task_update_tags($task_id, $method_tags_id, $algorithm_tags_id) {
+    log_assert(is_array($method_tags_id), 'method_tags must be an array');
+    log_assert(is_array($algorithm_tags_id), 'algorithm_tags must be an array');
+    log_assert(is_task_id($task_id), "Invalid task_id");
+
+    tag_clear('task', $task_id, 'method');
+    tag_clear('task', $task_id, 'algorithm');
+
+    foreach ($method_tags_id as $tag_id) {
+        tag_add('task', $task_id, $tag_id);
+    }
+
+    foreach ($algorithm_tags_id as $tag_id) {
+        tag_add('task', $task_id, $tag_id);
+    }
+}
+
 ?>

trunk/www/controllers/task.php

@@ -65 +65 @@
 
     // Tag data
-    $tag_types = Array('author', 'contest', 'year', 'round', 'age_group', 'method', 'algorithm');
+    $tag_types = Array('author', 'contest', 'year', 'round', 'age_group');
     $tag_parents = Array('year' => 'contest', 'round' => 'year', 'age_group' => 'contest');
 
@@ -265 +265 @@
 }
 
+// Tag a task
+function controller_task_tag($task_id) {
+    if (!is_task_id($task_id)) {
+        flash_error("Problema inexistenta");
+        redirect(url_home());
+    }
+
+    $task = task_get($task_id);
+    identity_require('task-tag', $task);
+
+    if (!$task) {
+        flash_error("Problema inexistenta");
+        redirect(url_home());
+    }
+
+    if (request_is_post()) {
+        $algorithm_tags_id = request("algorithm_tags");
+        $method_tags_id = tag_get_parents($algorithm_tags_id);
+
+        if (!is_array($algorithm_tags_id)) {
+            flash_error("Datele trimise sunt invalide. Raporteaza aceasta problema unui admin.");
+            redirect(url_task_edit_tag($task_id));
+        }
+
+        foreach ($algorithm_tags_id as $tag_id) {
+            if (!is_tag_id($tag_id)) {
+                flash_error("Datele trimise sunt invalide. Raporteaza aceasta problema unui admin.");
+                redirect(url_task_edit_tag($task_id));
+            }
+        }
+
+        $algorithm_tags = tag_get_by_ids($algorithm_tags_id);
+        $count = 0;
+        foreach ($algorithm_tags as $tag) {
+            if ($tag['tag_type'] == 'algorithm') {
+                $count++;
+            }
+        }
+        if ($count != count($algorithm_tags_id)) {
+            flash_error("Datele trimise sunt invalide. Raporteaza aceasta problema unui admin.");
+            redirect(url_task_edit_tag($task_id));
+        }
+
+        task_update_tags($task_id, $method_tags_id, $algorithm_tags_id);
+        flash("Tagurile au fost salvate cu succes");
+    }
+
+    $tags = tag_get_all( Array('method') );
+    $sub_tags = tag_get_all( Array('algorithm') );
+
+    // Build_tags_tree looks for tag_id, tag_name etc.
+    // tag_get_all return id, name, etc.
+    foreach ($tags as &$tag) {
+        $tag['tag_id'] = $tag['id'];
+        $tag['tag_name'] = $tag['name'];
+        $tag['tag_type'] = $tag['type'];
+        $tag['tag_parent'] = $tag['parent'];
+    }
+
+    // Same for subtags
+    foreach ($sub_tags as &$tag) {
+        $tag['tag_id'] = $tag['id'];
+        $tag['tag_name'] = $tag['name'];
+        $tag['tag_type'] = $tag['type'];
+        $tag['tag_parent'] = $tag['parent'];
+    }
+
+    $tags_tree = build_tags_tree($tags, $sub_tags);
+
+    // Get tags for task_id
+    $task_tags = tag_get('task', $task_id, 'algorithm');
+
+    $view['title'] = "Editeaza tagurile pentru problema ".$task['title'];
+    $view['task'] = $task;
+    $view['tags_tree'] = $tags_tree;
+    $view['task_tags'] = $task_tags;
+    execute_view_die('views/task_tag_edit.php', $view);
+}
 
 ?>

trunk/www/index.php

@@ -85 +85 @@
 // Task detail editor
 else if ($urlstart == 'admin' && getattr($pagepath, 1) == 'problema') {
+    require_once(IA_ROOT_DIR.'www/controllers/task.php');
     $obj_id = implode("/", array_slice($pagepath, 2));
-    require_once(IA_ROOT_DIR.'www/controllers/task.php');
-    controller_task_details($obj_id);
+    $action = request('action');
+    if ($action == 'tag-edit') {
+        controller_task_tag($obj_id);
+    } else {
+        controller_task_details($obj_id);
+    }
 }
 
@@ -117 +122 @@
 }
 
-// Round registration 
+// Round registration
 else if ($urlstart == 'inregistrare-runda') {
     $obj_id = implode("/", array_slice($pagepath, 1));

trunk/www/static/css/sitewide.css

@@ -276 +276 @@
 }
 
+a.show_tag_list {
+    display: none;
+    padding: 5px;
+    outline-style: none;
+}
+
+ul.tag_list {
+    list-style-type: none;
+}
+
+li.tag_list_item {
+    padding-left: 15px;
+}

trunk/www/url.php

@@ -253 +253 @@
 }
 
+function url_task_edit_tags($task_id) {
+    log_assert(is_task_id($task_id));
+    return url_complex("admin/problema/{$task_id}", array( 'action' => 'tag-edit'));
+}
+
 function url_task_create() {
     return url_complex("admin/problema-noua");

trunk/www/views/task_edit.php

@@ -139 +139 @@
                             'age_group' => Array("label" => "Grupa de varsta",
                                         "name" => "tag_age_group"),
-                            'method' => Array("label" => "Metoda de programare",
-                                        "name" => "tag_method"),
-                            'algorithm' => Array("label" => "Algoritm",
-                                        "name" => "tag_algorithm")
                         );
     ?>