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

profile search and loading profile are working now see #1791

Browse Source
skala
Julio Montoya 13 years ago
parent 0b94f9bc04
commit bfa7c316a0
3 changed files with 196 additions and 43 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/inc/ajax/skill.ajax.php
  2. 11
      main/template/default/skill/profile_item.tpl
  3. 154
      main/template/default/skill/skill_wheel.tpl

20
main/inc/ajax/skill.ajax.php
Unescape View File

@ -75,9 +75,7 @@ switch ($action) {
}
}
Display::display_no_header();
Display::$global_template->assign('order_user_list', $ordered_user_list);
Display::$global_template->assign('total_search_skills', $count_skills);
@ -132,6 +130,21 @@ switch ($action) {
} else {
echo 0;
}
break;
case 'get_skills_by_profile':
$skill_rel_profile = new SkillRelProfile();
$profile_id = isset($_REQUEST['profile_id']) ? $_REQUEST['profile_id'] : null;
$skills = $skill_rel_profile->get_skills_by_profile($profile_id);
echo json_encode($skills);
break;
case 'get_saved_profiles':
$skill_profile = new SkillProfile();
$profiles = $skill_profile->get_all();
Display::display_no_header();
Display::$global_template->assign('profiles', $profiles);
echo Display::$global_template->fetch('default/skill/profile_item.tpl');
break;
case 'get_skills':
$load_user_data = isset($_REQUEST['load_user_data']) ? $_REQUEST['load_user_data'] : null;
@ -205,7 +218,8 @@ switch ($action) {
case 'save_profile':
$skill_profile = new SkillProfile();
$params = $_REQUEST;
$params['skills'] = isset($_SESSION['skills']) ? $_SESSION['skills'] : null;
//$params['skills'] = isset($_SESSION['skills']) ? $_SESSION['skills'] : null;
$params['skills'] = $params['skill_id'];
$skill_data = $skill_profile->save($params);
if (!empty($skill_data)) {
echo 1;

11
main/template/default/skill/profile_item.tpl
Unescape View File

@ -0,0 +1,11 @@
{% if profiles is not null %}
<h3>{{"SkillProfiles"|get_lang}}</h3>
<hr>
<ul class="holder">
{%for profile in profiles %}
<li class="bit-box">
<a class="load_profile" rel="{{profile.id}}" href="#">{{ profile.name }}</a>
</li>
{% endfor %}
</ul>
{% endif %}

154
main/template/default/skill/skill_wheel.tpl
Unescape View File

@ -86,10 +86,14 @@ function check_skills_sidebar() {
});
}
function fill_skill_search_li(skill_id, skill_name) {
return '<li><input id="skill_to_select_id_'+skill_id+'" rel="'+skill_id+'" name="'+skill_name+'" class="skill_to_select" type="checkbox" value=""> <a href="#" class="load_wheel" rel="'+skill_id+'">'+skill_name+'</a></li>';
function fill_skill_search_li(skill_id, skill_name, checked) {
checked_condition = '';
if (checked == 1) {
checked_condition = 'checked=checked';
}
return '<li><input id="skill_to_select_id_'+skill_id+'" rel="'+skill_id+'" name="'+skill_name+'" class="skill_to_select" '+checked_condition+' type="checkbox" value=""> <a href="#" class="load_wheel" rel="'+skill_id+'">'+skill_name+'</a></li>';
}
function check_skills_edit_form() {
//selecting only selected users
@ -192,8 +196,7 @@ function delete_gradebook_from_skill(skill_id, gradebook_id) {
});
}
function submit_profile_search_form() {
$("#skill_wheel").remove();
function return_skill_list_from_profile_search() {
var skill_list = {};
if ($("#profile_search li").length != 0) {
@ -204,6 +207,13 @@ function submit_profile_search_form() {
}
});
}
return skill_list;
}
function submit_profile_search_form() {
$("#skill_wheel").remove();
var skill_list = return_skill_list_from_profile_search();
if (skill_list.length != 0) {
skill_list = { 'skill_id' : skill_list };
@ -223,6 +233,14 @@ function submit_profile_search_form() {
}
function add_skill_in_profile_list(skill_id, skill_name) {
if ($('#profile_match_item_'+skill_id).length == 0 ) {
$('#profile_search').append('<li class="bit-box" id="profile_match_item_'+skill_id+'">'+skill_name+' <a rel="'+skill_id+'" class="closebutton" href="#"></a> </li>');
} else {
$('#profile_match_item_'+skill_id).remove();
}
}
$(document).ready(function() {
/* Skill search */
@ -230,11 +248,7 @@ $(document).ready(function() {
$("#skill_holder").on("click", "input.skill_to_select", function() {
skill_id = $(this).attr('rel');
skill_name = $(this).attr('name');
if ($('#profile_match_item_'+skill_id).length == 0 ) {
$('#profile_search').append('<li class="bit-box" id="profile_match_item_'+skill_id+'">'+skill_name+' <a rel="'+skill_id+'" class="closebutton" href="#"></a> </li>');
} else {
$('#profile_match_item_'+skill_id).remove();
}
add_skill_in_profile_list(skill_id, skill_name);
});
/* URL link when searching skills */
@ -247,10 +261,15 @@ $(document).ready(function() {
/* Profile matcher */
/* Submit button */
$("#search_profile_form").submit(function() {
submit_profile_search_form();
return false;
});
$("#save_profile_form_button").submit(function() {
open_save_profile_popup();
return false;
});
/* Close button in profile matcher items */
@ -261,6 +280,31 @@ $(document).ready(function() {
submit_profile_search_form();
});
//Fill saved profiles list
update_my_saved_profiles();
/* Click in profile */
$("#saved_profiles").on("click", "a.load_profile", function() {
profile_id = $(this).attr('rel');
$.ajax({
url: '{{ url }}&a=get_skills_by_profile&profile_id='+profile_id,
success:function(json) {
skill_list = jQuery.parseJSON(json);
$('#skill_holder').empty();
jQuery.each(skill_list, function(index, skill_id) {
skill_info = get_skill_info(skill_id);
li = fill_skill_search_li(skill_id, skill_info.name, 1);
$("#skill_holder").append(li);
add_skill_in_profile_list(skill_id, skill_info.name);
});
submit_profile_search_form();
}
});
});
/* Wheel skill popup form */
@ -318,6 +362,15 @@ $(document).ready(function() {
height : 550
});
//Save search profile dialog
$("#dialog-form-profile").dialog({
autoOpen: false,
modal : true,
width : 500,
height : 400
});
/* ...adding "+1" to "y" function's params is really funny */
/* Exexute the calculation based on a JSON file provided */
/*d3.json("wheel.json", function(json) {*/
@ -583,6 +636,50 @@ $(document).ready(function() {
}
}
function open_save_profile_popup() {
$("#dialog-form-profile").dialog({
buttons: {
"{{ "Save"|get_lang }}" : function() {
var params = $("#save_profile_form").serialize();
var skill_list = return_skill_list_from_profile_search();
skill_list = { 'skill_id' : skill_list };
skill_params = $.param(skill_list);
$.ajax({
url: '{{ url }}&a=save_profile&'+params+'&'+skill_params,
success:function(data) {
if (data == 1 ) {
update_my_saved_profiles();
alert("{{"Saved"|get_lang}}");
} else {
alert("{{ "Error"|get_lang }}");
}
$("#dialog-form-profile").dialog("close");
$("#name").attr('value', '');
$("#description").attr('value', '');
}
});
}
},
close: function() {
$("#name").attr('value', '');
$("#description").attr('value', '');
}
});
$("#dialog-form-profile").dialog("open");
}
function update_my_saved_profiles() {
$.ajax({
url: '{{ url }}&a=get_saved_profiles',
success:function(data) {
$("#saved_profiles").html(data);
}
});
}
function open_popup(d) {
//Cleaning selected
$("#gradebook_id").find('option').remove();
@ -611,18 +708,18 @@ $(document).ready(function() {
$("#gradebook_id").append('<option class="selected" value="'+data.id+'" selected="selected" >');
$("#gradebook_holder").append('<li id="gradebook_item_'+data.id+'" class="bit-box">'+data.name+' <a rel="'+data.id+'" class="closebutton" href="#"></a> </li>');
});
}
//description = $( "#description" );
$("#dialog-form").dialog({
buttons: {
"{{ "Edit"|get_lang }}" : function() {
var params = $("#add_item").find(':input').serialize();
add_skill(params);
console.log(params);
},
"{{ "Delete"|get_lang }}" : function() {
},
"{{ "AddSkillToProfileSearch"|get_lang }}" : function() {
add_skill_in_profile_list(skill.id, skill.name);
}
},
close: function() {
$("#name").attr('value', '');
@ -631,6 +728,7 @@ $(document).ready(function() {
});
$("#dialog-form").dialog("open");
}
}
var colors1 = $.xcolor.analogous('#da0'); //8 colors
var colors = colors1;
@ -868,6 +966,15 @@ $(document).ready(function() {
<input class="btn" type="submit" value="{{ "SearchProfileMatches"|get_lang }}">
</form>
{{ 'IsThisWhatYouWereLookingFor'|get_lang }}
<form id="save_profile_form_button" class="form-search">
<input class="btn" type="submit" value="{{ "SaveThisSearch"|get_lang }}">
</form>
<div id="saved_profiles">
</div>
<h3>{{ 'MySkills'|get_lang }}</h3>
<hr>
@ -941,3 +1048,24 @@ $(document).ready(function() {
</fieldset>
</form>
</div>
<div id="dialog-form-profile" style="display:none;">
<form id="save_profile_form" class="form-horizontal" name="form">
<fieldset>
<div class="control-group">
<label class="control-label" for="name">{{"Name"|get_lang}}</label>
<div class="controls">
<input type="text" name="name" id="name" size="40" />
</div>
</div>
<div class="control-group">
<label class="control-label" for="name">{{"Description"|get_lang}}</label>
<div class="controls">
<textarea name="description" id="description" class="span2" rows="7"></textarea>
</div>
</div>
</fieldset>
</form>
</div>

Write Preview
Loading…
Cancel
Save