';
$skill = new Skill();
$ranking = $skill->get_user_skill_ranking(api_get_user_id());
- $url = api_get_path(WEB_CODE_PATH) . 'social/skills_ranking.php';
- $ranking_url = Display::url(
- sprintf(get_lang('YourSkillRankingX'), $ranking),
- $url,
- array('class' => 'btn')
- );
$skills = $skill->get_user_skills(api_get_user_id(), true);
@@ -156,13 +150,24 @@ if (api_get_setting('allow_skills_tool') == 'true') {
}
$socialRightInformation .= Display::tag('ul', $lis);
}
- $url = api_get_path(WEB_CODE_PATH) . 'social/skills_wheel.php';
- $skill_wheel_url = Display::url(
+ $socialRightInformation .= "
";
+ if (api_is_student() || api_is_student_boss() || api_is_drh()) {
+ $socialRightInformation .= Display::url(
+ get_lang('SkillsReport'),
+ api_get_path(WEB_CODE_PATH) . 'social/my_skills_report.php',
+ array('class' => 'btn')
+ );
+ }
+ $socialRightInformation .= Display::url(
get_lang('ViewSkillsWheel'),
- $url,
+ api_get_path(WEB_CODE_PATH) . 'social/skills_wheel.php',
+ array('class' => 'btn')
+ );
+ $socialRightInformation .= Display::url(
+ sprintf(get_lang('YourSkillRankingX'), $ranking),
+ api_get_path(WEB_CODE_PATH) . 'social/skills_ranking.php',
array('class' => 'btn')
);
- $socialRightInformation .= '
' . $skill_wheel_url . $ranking_url . '
';
$socialRightInformation .= '
';
}
diff --git a/main/social/my_skills_report.php b/main/social/my_skills_report.php
new file mode 100644
index 0000000000..75c951a439
--- /dev/null
+++ b/main/social/my_skills_report.php
@@ -0,0 +1,176 @@
+
+ * @package chamilo.social.skill
+ */
+require_once '../inc/global.inc.php';
+
+$isStudent = api_is_student();
+$isStudentBosss = api_is_student_boss();
+$isDRH = api_is_drh();
+
+if (!$isStudent && !$isStudentBosss && !$isDRH) {
+ header('Location: ' . api_get_path(WEB_CODE_PATH) . 'social/skills_wheel.php');
+ die;
+}
+
+$userId = api_get_user_id();
+
+$skillTable = Database::get_main_table(TABLE_MAIN_SKILL);
+$skillRelUserTable = Database::get_main_table(TABLE_MAIN_SKILL_REL_USER);
+$courseTable = Database::get_main_table(TABLE_MAIN_COURSE);
+
+$tableRows = array();
+
+$tpl = new Template(get_lang('Skills'));
+$tplPath = null;
+
+$tpl->assign('allowSkillsTool', api_get_setting('allow_skills_tool') == 'true');
+$tpl->assign('allowDrhSkillsManagement', api_get_setting('allow_hr_skills_management') == 'true');
+
+if ($isStudent) {
+ $sql = "SELECT s.name, sru.acquired_skill_at, c.title, c.directory "
+ . "FROM $skillTable s "
+ . "INNER JOIN $skillRelUserTable sru ON s.id = sru.skill_id "
+ . "INNER JOIN $courseTable c ON sru.course_id = c.id "
+ . "WHERE sru.user_id = $userId";
+
+ $result = Database::query($sql);
+
+ while ($resultData = Database::fetch_assoc($result)) {
+ $tableRow = array(
+ 'skillName' => $resultData['name'],
+ 'achievedAt' => api_format_date($resultData['acquired_skill_at'], DATE_FORMAT_NUMBER),
+ 'courseImage' => Display::return_icon('course.png', null, null, ICON_SIZE_BIG, null, true),
+ 'courseName' => $resultData['title']
+ );
+
+ if (file_exists(api_get_path(SYS_COURSE_PATH) . "{$resultData['directory']}/course-pic85x85.png")) {
+ $tableRow['courseImage'] = api_get_path(WEB_COURSE_PATH) . "{$resultData['directory']}/course-pic85x85.png";
+ }
+
+ $tableRows[] = $tableRow;
+ }
+
+ $tplPath = 'skill/student_report.tpl';
+} else if ($isStudentBosss) {
+ $selectedStudent = isset($_REQUEST['student']) ? intval($_REQUEST['student']) : 0;
+
+ $tableRows = array();
+
+ $followedStudents = UserManager::getUsersFollowedByStudentBoss($userId);
+
+ foreach ($followedStudents as &$student) {
+ $student['completeName'] = api_get_person_name($student['firstname'], $student['lastname']);
+ }
+
+ if ($selectedStudent > 0) {
+ $sql = "SELECT s.name, sru.acquired_skill_at, c.title, c.directory "
+ . "FROM $skillTable s "
+ . "INNER JOIN $skillRelUserTable sru ON s.id = sru.skill_id "
+ . "INNER JOIN $courseTable c ON sru.course_id = c.id "
+ . "WHERE sru.user_id = $selectedStudent";
+
+ $result = Database::query($sql);
+
+ while ($resultData = Database::fetch_assoc($result)) {
+ $tableRow = array(
+ 'completeName' => $followedStudents[$selectedStudent]['completeName'],
+ 'skillName' => $resultData['name'],
+ 'achievedAt' => api_format_date($resultData['acquired_skill_at'], DATE_FORMAT_NUMBER),
+ 'courseImage' => Display::return_icon('course.png', null, null, ICON_SIZE_BIG, null, true),
+ 'courseName' => $resultData['title']
+ );
+
+ if (file_exists(api_get_path(SYS_COURSE_PATH) . "{$resultData['directory']}/course-pic85x85.png")) {
+ $tableRow['courseImage'] = api_get_path(WEB_COURSE_PATH) . "{$resultData['directory']}/course-pic85x85.png";
+ }
+
+ $tableRows[] = $tableRow;
+ }
+ }
+
+ $tplPath = 'skill/student_boss_report.tpl';
+
+ $tpl->assign('followedStudents', $followedStudents);
+ $tpl->assign('selectedStudent', $selectedStudent);
+} else if ($isDRH) {
+ $selectedCourse = isset($_REQUEST['course']) ? intval($_REQUEST['course']) : null;
+ $selectedSkill = isset($_REQUEST['skill']) ? intval($_REQUEST['skill']) : 0;
+
+ $action = null;
+
+ if (!empty($selectedCourse)) {
+ $action = 'filterByCourse';
+ } else if (!empty($selectedSkill)) {
+ $action = 'filterBySkill';
+ }
+
+ $courses = CourseManager::get_courses_list();
+
+ $tableRows = array();
+ $reportTitle = null;
+
+ $objSkill = new Skill();
+ $skills = $objSkill->get_all();
+
+ switch ($action) {
+ case 'filterByCourse':
+ $course = api_get_course_info_by_id($selectedCourse);
+
+ $reportTitle = sprintf(get_lang('AchievedSkillInCourseX'), $course['name']);
+
+ $tableRows = $objSkill->listAchievedByCourse($selectedCourse);
+ break;
+ case 'filterBySkill':
+ $skill = $objSkill->get($selectedSkill);
+
+ $reportTitle = sprintf(get_lang('StudentsWhoAchievedTheSkillX'), $skill['name']);
+
+ $students = UserManager::getUsersFollowedByUser(
+ $userId, STUDENT, false, false, false, null, null, null, null, null, null, DRH
+ );
+
+ $coursesFilter = array();
+
+ foreach ($courses as $course) {
+ $coursesFilter[] = $course['id'];
+ }
+
+ $tableRows = $objSkill->listUsersWhoAchieved($selectedSkill, $coursesFilter);
+
+ break;
+ }
+
+ foreach ($tableRows as &$row) {
+ $row['completeName'] = api_get_person_name($row['firstname'], $row['lastname']);
+ $row['achievedAt'] = api_format_date($row['acquired_skill_at'], DATE_FORMAT_NUMBER);
+
+ if (file_exists(api_get_path(SYS_COURSE_PATH) . $row['c_directory'] . '/course-pic85x85.png')) {
+ $row['courseImage'] = api_get_path(WEB_COURSE_PATH) . $row['c_directory'] . '/course-pic85x85.png';
+ } else {
+ $row['courseImage'] = Display::return_icon('course.png', null, null, ICON_SIZE_BIG, null, true);
+ }
+ }
+
+ $tplPath = 'skill/drh_report.tpl';
+
+ $tpl->assign('action', $action);
+
+ $tpl->assign('courses', $courses);
+ $tpl->assign('skills', $skills);
+
+ $tpl->assign('selectedCourse', $selectedCourse);
+ $tpl->assign('selectedSkill', $selectedSkill);
+
+ $tpl->assign('reportTitle', $reportTitle);
+}
+
+$tpl->assign('rows', $tableRows);
+
+$contentTemplate = $tpl->fetch("default/" . $tplPath);
+
+$tpl->assign('content', $contentTemplate);
+$tpl->display_one_col_template();
diff --git a/main/template/default/layout/footer.tpl b/main/template/default/layout/footer.tpl
index 68d0da030f..d3fdb29c11 100755
--- a/main/template/default/layout/footer.tpl
+++ b/main/template/default/layout/footer.tpl
@@ -20,7 +20,7 @@
{{ plugin_footer_left }}
.'img/icons/22/info.png "'.$ip.'"){kind=icon}