chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixing skill profile bug when selecting a skill profile

Browse Source
skala
Julio Montoya 14 years ago
parent fbf19c9283
commit a8822a24c3
4 changed files with 74 additions and 89 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 20
      main/admin/skills_profile.php
  2. 39
      main/template/default/skill/profile.tpl
  3. 70
      main/template/default/skill/skill_tree.tpl
  4. 34
      main/template/default/skill/skill_tree_student.tpl

20
main/admin/skills_profile.php
Unescape View File

@ -30,8 +30,10 @@ $tpl = new Template(get_lang('Skills'));
$form = new FormValidator('profile_search'); $form = new FormValidator('profile_search');
$form->addElement('header', get_lang('SearchSkills'));
$form->addElement('select', 'skills', null, null, array('id'=>'skills')); $form->addElement('select', 'skills', null, null, array('id'=>'skills'));
$form->addElement('style_submit_button', 'submit', get_lang('Search'), 'class="a_button blue "'); $form->addElement('style_submit_button', 'submit', get_lang('Search'), 'class="btn"');
$profiles = $skill_profile->get_all(); $profiles = $skill_profile->get_all();
@ -66,7 +68,7 @@ $count_skills = count($skills);
$users = $skill_rel_user->get_user_by_skills($skills); $users = $skill_rel_user->get_user_by_skills($skills);
if (!empty($users)) { if (!empty($users)) {
foreach($users as $user) { foreach ($users as $user) {
$user_info = api_get_user_info($user['user_id']); $user_info = api_get_user_info($user['user_id']);
$user_list[$user['user_id']]['user'] = $user_info; $user_list[$user['user_id']]['user'] = $user_info;
$my_user_skills = $skill_rel_user->get_user_skills($user['user_id']); $my_user_skills = $skill_rel_user->get_user_skills($user['user_id']);
@ -115,10 +117,7 @@ if (!empty($skills)) {
} }
$total_skills_to_search = $skill->get_skills_info($total_skills_to_search); $total_skills_to_search = $skill->get_skills_info($total_skills_to_search);
$skill_list = array();
foreach($total_skills_to_search as $skill_info) {
$skill_list[$skill_info['id']] = $skill_info;
}
$action = isset($_REQUEST['a']) ? $_REQUEST['a'] : null; $action = isset($_REQUEST['a']) ? $_REQUEST['a'] : null;
$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : null; $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : null;
@ -132,15 +131,18 @@ switch ($action) {
} }
} }
$skills = $_SESSION['skills'] = $new_skill; $skills = $_SESSION['skills'] = $new_skill;
break; break;
case 'load_profile': case 'load_profile':
$skill_profile = new SkillRelProfile(); $skill_profile = new SkillRelProfile();
$skills = $skill_profile->get_skills_by_profile($id); $skills = $skill_profile->get_skills_by_profile($id);
$total_skills_to_search = $skill->get_skills_info($skills);
break; break;
} }
$skill_list = array();
foreach ($total_skills_to_search as $skill_info) {
$skill_list[$skill_info['id']] = $skill_info;
}
$tpl->assign('skill_list', $skill_list); $tpl->assign('skill_list', $skill_list);
$tpl->assign('search_skill_list', $skills); $tpl->assign('search_skill_list', $skills);

39
main/template/default/skill/profile.tpl
Unescape View File

@ -95,15 +95,12 @@ function checkLength( o, n, min, max ) {
} }
} }
</script> </script>
<h2>{"SearchSkills"|get_lang}</h2>
{$form} {$form}
{if !empty($search_skill_list) } {if !empty($search_skill_list) }
<div class="skills-skills"> <div class="skills-skills">
<h3>{"Skills"|get_lang}</h3> <h3>{"Skills"|get_lang}</h3>
<ul class="holder"> <ul class="holder">
{foreach $search_skill_list as $search_skill_id} {foreach $search_skill_list as $search_skill_id}
<li class="bit-box"> <li class="bit-box">
{$skill_list[$search_skill_id].name} {$skill_list[$search_skill_id].name}
@ -111,7 +108,7 @@ function checkLength( o, n, min, max ) {
</li> </li>
{/foreach} {/foreach}
</ul> </ul>
<a id="add_profile" class="a_button gray small" href="#"> {"SaveThisSearch"|get_lang}</a> <a id="add_profile" class="btn" href="#"> {"SaveThisSearch"|get_lang}</a>
</div> </div>
{/if} {/if}
@ -167,22 +164,20 @@ function checkLength( o, n, min, max ) {
{/if} {/if}
<div id="dialog-form" style="display:none;"> <div id="dialog-form" style="display:none;">
<form id="save_profile_form" name="form"> <form id="save_profile_form" class="form-horizontal" name="form">
<div class="row"> <fieldset>
<div class="label"> <div class="control-group">
<label for="name">{"Name"|get_lang}</label> <label class="control-label" for="name">{"Name"|get_lang}</label>
</div> <div class="controls">
<div class="formw"> <input type="text" name="name" id="name" size="40" />
<input type="text" name="name" id="name" size="40" /> </div>
</div> </div>
</div> <div class="control-group">
<div class="row"> <label class="control-label" for="name">{"Description"|get_lang}</label>
<div class="label"> <div class="controls">
<label for="name">{"Description"|get_lang}</label> <textarea name="description" id="description" class="span2" rows="7"></textarea>
</div> </div>
<div class="formw"> </div>
<textarea name="description" id="description" cols="40" rows="7"></textarea> </fieldset>
</div>
</div>
</form> </form>
</div> </div>

70
main/template/default/skill/skill_tree.tpl
Unescape View File

@ -359,44 +359,38 @@ $(document).ready( function() {
<div id="dialog-form" style="display:none; z-index:6000;"> <div id="dialog-form" style="display:none; z-index:6000;">
<p class="validateTips"></p> <p class="validateTips"></p>
<form id="add_item" name="form"> <form class="form-horizontal" id="add_item" name="form">
<input type="hidden" name="id" id="id"/> <fieldset>
<div class="row"> <input type="hidden" name="id" id="id"/>
<div class="label"> <div class="control-group">
<label for="name">{'Name'|get_lang}</label> <label class="control-label" for="name">{'Name'|get_lang}</label>
</div> <div class="controls">
<div class="formw"> <input type="text" name="name" id="name" size="40" />
<input type="text" name="name" id="name" size="40" /> </div>
</div>
<div class="control-group">
<label class="control-label" for="name">{'Parent'|get_lang}</label>
<div class="controls">
<select id="parent_id" name="parent_id" />
</select>
</div>
</div>
<div class="control-group">
<label class="control-label" for="name">{'Gradebook'|get_lang}</label>
<div class="controls">
<select id="gradebook_id" name="gradebook_id[]" multiple="multiple"/>
</select>
<span class="help-block">
{'WithCertificate'|get_lang}
</span>
</div>
</div> </div>
</div> <div class="control-group">
<div class="row"> <label class="control-label" for="name">{'Description'|get_lang}</label>
<div class="label"> <div class="controls">
<label for="name">{'Parent'|get_lang}</label> <textarea name="description" id="description" class="span3" rows="7"></textarea>
</div> </div>
<div class="formw"> </div>
<select id="parent_id" name="parent_id" /> </fieldset>
</select>
</div>
</div>
<div class="row">
<div class="label">
<label for="name">{'Gradebook'|get_lang}</label>
</div>
<div class="formw">
<select id="gradebook_id" name="gradebook_id[]" multiple="multiple"/>
</select>
<span class="help-block">
{'WithCertificate'|get_lang}
</span>
</div>
</div>
<div class="row">
<div class="label">
<label for="name">{'Description'|get_lang}</label>
</div>
<div class="formw">
<textarea name="description" id="description" cols="40" rows="7"></textarea>
</div>
</div>
</form> </form>
</div> </div>

34
main/template/default/skill/skill_tree_student.tpl
Unescape View File

@ -256,34 +256,28 @@ $(document).ready( function() {
{$html} {$html}
<div id="dialog-form" style="display:none;"> <div id="dialog-form" style="display:none;">
<form id="add_item" class="form-horizontal" name="form">
<form id="add_item" name="form"> <fieldset>
<input type="hidden" name="id" id="id"/> <input type="hidden" name="id" id="id"/>
<div class="row"> <div class="control-group">
<div class="label"> <label class="control-label" for="name">Name</label>
<label for="name">Name</label> <div class="controls">
</div>
<div class="formw">
<span id="name"></span> <span id="name"></span>
</div> </div>
</div> </div>
<div class="row"> <div class="control-group">
<div class="label"> <label class="control-label" for="name">Description</label>
<label for="name">Description</label> <div class="controls">
</div>
<div class="formw">
<span id="description"></span> <span id="description"></span>
</div> </div>
</div> </div>
<div class="row"> <div class="control-group">
<div class="label"> <label class="control-label" for="name">Gradebook</label>
<label for="name">Gradebook</label> <div class="controls">
</div>
<div class="formw">
<div id="gradebook_id"></div> <div id="gradebook_id"></div>
</div> </div>
</div> </div>
</fieldset>
</form> </form>
</div> </div>
Write Preview
Loading…
Cancel
Save