From a9a76ecfbd946dbaa328cddc8cf4d0ab82335ebb Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 7 Nov 2011 19:08:51 +0100 Subject: [PATCH] Adding skill profile search page see #1791 (work in progress) --- main/css/base.css | 4 +- main/inc/lib/skill.lib.php | 20 +++- main/template/default/skill/profile.tpl | 121 ++++++++++++++++++++++++ 3 files changed, 142 insertions(+), 3 deletions(-) create mode 100644 main/template/default/skill/profile.tpl diff --git a/main/css/base.css b/main/css/base.css index 8211f19f9e..f167558660 100644 --- a/main/css/base.css +++ b/main/css/base.css @@ -330,11 +330,11 @@ code { color: rgba(0, 0, 0, 0.75); padding: 1px 3px; } -pre { +pre { background-color: #f5f5f5; display: block; padding: 17px; - margin: 0 0 18px; + margin: 25px 0 18px; line-height: 18px; font-size: 12px; border: 1px solid #ccc; diff --git a/main/inc/lib/skill.lib.php b/main/inc/lib/skill.lib.php index 0b79c55d89..e258d63695 100644 --- a/main/inc/lib/skill.lib.php +++ b/main/inc/lib/skill.lib.php @@ -196,7 +196,25 @@ class SkillRelGradebook extends Model { class SkillRelUser extends Model { var $columns = array('id', 'user_id','skill_id','acquired_skill_at','assigned_by'); public function __construct() { - $this->table = Database::get_main_table(TABLE_MAIN_SKILL_REL_USER); + $this->table = Database::get_main_table(TABLE_MAIN_SKILL_REL_USER); + //$this->table_user = Database::get_main_table(TABLE_MAIN_USER); + } + + public function get_user_by_skills($skill_list) { + $skill_list = array_map('intval', $skill_list); + $skill_list = implode("', ", $skill_list); + + $sql = "SELECT user_id FROM {$this->table} WHERE skill_id IN ($skill_list) "; + + $result = Database::query($sql); + $users = Database::store_result($result, 'ASSOC'); + return $users; + } + + public function get_user_skills($user_id) { + if (empty($user_id)) { return array(); } + $result = Database::select('skill_id',$this->table, array('where'=>array('user_id = ?'=>intval($user_id))), 'all'); + return $result; } } diff --git a/main/template/default/skill/profile.tpl b/main/template/default/skill/profile.tpl new file mode 100644 index 0000000000..a2c4ddaa90 --- /dev/null +++ b/main/template/default/skill/profile.tpl @@ -0,0 +1,121 @@ + +{$form} + +{foreach $user_list as $user} +
+
+ {$user['user'].username} +
+
+ + {$user['user'].firstname} + {$user['user'].lastname} + + + +

Skills

+
    + {foreach $user['skills'] as $skill} +
  • {$skill.skill_id}
  • + {/foreach} +
+
+
+{/foreach} + + \ No newline at end of file