From 615925180d8eb4ba214f83d7ce5090a5442c853e Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Fri, 16 Dec 2016 16:01:59 +0000 Subject: [PATCH] refactored javascript codes in project_map.php --- codepot/src/codepot/controllers/graph.php | 4 +- codepot/src/codepot/models/projectmodel.php | 51 +-- codepot/src/codepot/views/code_file.php | 2 +- codepot/src/codepot/views/code_folder.php | 2 +- codepot/src/codepot/views/project_map.php | 404 ++++++++++++-------- 5 files changed, 264 insertions(+), 199 deletions(-) diff --git a/codepot/src/codepot/controllers/graph.php b/codepot/src/codepot/controllers/graph.php index 3c1e0c55..19569b7c 100644 --- a/codepot/src/codepot/controllers/graph.php +++ b/codepot/src/codepot/controllers/graph.php @@ -198,7 +198,7 @@ class Graph extends Controller print codepot_json_encode ($rg); } - function enjson_project_user_relation_graph ($filter = '') + function enjson_project_members ($filter = '') { $this->load->model ('ProjectModel', 'projects'); @@ -210,7 +210,7 @@ class Graph extends Controller } $filter = $this->converter->HexToAscii ($filter); - $rel = $this->projects->getProjectUserRelationGraph($filter); + $rel = $this->projects->getProjectMembers($filter); print codepot_json_encode($rel); } } diff --git a/codepot/src/codepot/models/projectmodel.php b/codepot/src/codepot/models/projectmodel.php index 89b0df57..79cc5aff 100644 --- a/codepot/src/codepot/models/projectmodel.php +++ b/codepot/src/codepot/models/projectmodel.php @@ -592,26 +592,15 @@ class ProjectModel extends Model return TRUE; } - private function _add_rg_node (&$nodeids, &$nodes, $name, $type) - { - if (array_key_exists($name, $nodeids)) return $nodeids[$name]; - $nid = count($nodeids); - array_push ($nodes, array ('id' => $nid, 'label' => $name, '_type' => $type)); - $nodeids[$name] = $nid; - return $nid; - } - - private function _add_rg_edge (&$edges, $from, $to, $label) - { - array_push ($edges, array ('from' => $from, 'to' => $to, 'label' => $label)); - } - - function getProjectUserRelationGraph ($filter) + function getProjectMembers ($userid_filter) { $this->db->trans_begin (); $this->db->select ('project.id,project_membership.userid'); - if ($filter != '') $this->db->where ('userid', $filter); + if (is_array($userid_filter) && count($userid_filter) > 0) + $this->db->where_in ('userid', $userid_filter); + else if ($userid_filter != '') + $this->db->where ('userid', $userid_filter); $this->db->join ('project_membership', 'project_membership.projectid = project.id'); $query = $this->db->get ('project'); @@ -622,25 +611,26 @@ class ProjectModel extends Model } $result = $query->result (); - - $nodes = array(); - $nodeids = array(); - $edges = array(); + $data = array(); if (count($result) > 0) { foreach ($result as $r) { - $id1 = $this->_add_rg_node ($nodeids, $nodes, $r->id, 'project'); - $id2 = $this->_add_rg_node ($nodeids, $nodes, $r->userid, 'user'); - $this->_add_rg_edge ($edges, $id1, $id2, ""); + if (array_key_exists ($r->id, $data)) + array_push ($data[$r->id], $r->userid); + else + $data[$r->id] = array ($r->userid); } - if ($filter != '') + if ((is_array($userid_filter) && count($userid_filter) > 0) || $userid_filter != '') { $this->db->select ('project.id,project_membership.userid'); - $this->db->where_in ('id', array_keys($nodeids)); - $this->db->where ('userid <>', $filter); + $this->db->where_in ('id', array_keys($data)); + if (is_array($userid_filter) && count($userid_filter) > 0) + $this->db->where_not_in ('userid <>', $userid_filter); + else + $this->db->where ('userid <>', $userid_filter); $this->db->join ('project_membership', 'project_membership.projectid = project.id'); $query = $this->db->get ('project'); if ($this->db->trans_status() === FALSE) @@ -652,15 +642,16 @@ class ProjectModel extends Model $result = $query->result (); foreach ($result as $r) { - $id1 = $this->_add_rg_node ($nodeids, $nodes, $r->id, 'project'); - $id2 = $this->_add_rg_node ($nodeids, $nodes, $r->userid, 'user'); - $this->_add_rg_edge ($edges, $id1, $id2, ""); + if (array_key_exists ($r->id, $data)) + array_push ($data[$r->id], $r->userid); + else + $data[$r->id] = array ($r->userid); } } } $this->db->trans_commit (); - return array ('nodes' => $nodes, 'edges' => $edges); + return $data; } } diff --git a/codepot/src/codepot/views/code_file.php b/codepot/src/codepot/views/code_file.php index 83a9040d..3ab16739 100644 --- a/codepot/src/codepot/views/code_file.php +++ b/codepot/src/codepot/views/code_file.php @@ -244,7 +244,7 @@ function show_revision_graph (response) } else if (data.nodes.length <= 0) { - show_alert ('No data to show', "lang->line('Info')?>"); + show_alert ('No data to show', "lang->line('Error')?>"); } else { diff --git a/codepot/src/codepot/views/code_folder.php b/codepot/src/codepot/views/code_folder.php index fde43f1c..16785f16 100644 --- a/codepot/src/codepot/views/code_folder.php +++ b/codepot/src/codepot/views/code_folder.php @@ -212,7 +212,7 @@ function show_revision_graph (response) } else if (data.nodes.length <= 0) { - show_alert ('No data to show', "lang->line('Info')?>"); + show_alert ('No data to show', "lang->line('Error')?>"); } else { diff --git a/codepot/src/codepot/views/project_map.php b/codepot/src/codepot/views/project_map.php index 4ea1de79..c5aae11c 100644 --- a/codepot/src/codepot/views/project_map.php +++ b/codepot/src/codepot/views/project_map.php @@ -17,192 +17,266 @@ @@ -256,7 +330,7 @@ $this->load->view (
-
+