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

Ticket: Add configuration setting $_configuration['ticket_lp_quiz_info_add'] to add extra data, learningpath_id and exercise id in tickets report - refs #3564

Browse Source
pull/3643/head
Angel Cubas 5 years ago committed by GitHub
parent 4715f3b1de
commit 84b413a01e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 312 additions and 42 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/exercise.ajax.php
  2. 14
      main/inc/ajax/lp.ajax.php
  3. 44
      main/inc/lib/TicketManager.php
  4. 16
      main/inc/lib/exercise.lib.php
  5. 14
      main/inc/lib/template.lib.php
  6. 8
      main/install/configuration.dist.php
  7. 36
      main/lp/learnpath.class.php
  8. 114
      main/ticket/new_ticket.php
  9. 18
      main/ticket/ticket_details.php
  10. 12
      main/ticket/tickets.php

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

@ -18,6 +18,26 @@ $currentUserId = api_get_user_id();
$exeId = isset($_REQUEST['exe_id']) ? $_REQUEST['exe_id'] : 0;
switch ($action) {
case 'get_exercise_by_course':
$course_id = (isset($_GET['course_id']) && !empty($_GET['course_id'])) ? (int) $_GET['course_id'] : 0;
$session_id = (!empty($_GET['session_id'])) ? (int) $_GET['session_id'] : 0;
$data = [];
$onlyActiveExercises = !(api_is_platform_admin(true) || api_is_course_admin());
$results = ExerciseLib::get_all_exercises_for_course_id(
null,
$session_id,
$course_id,
$onlyActiveExercises
);
if (!empty($results)) {
foreach ($results as $exercise) {
$data[] = ['id' => $exercise['id'], 'text' => html_entity_decode($exercise['title'])];
}
}
echo json_encode($data);
break;
case 'update_duration':
if (Session::read('login_as')) {

14
main/inc/ajax/lp.ajax.php
Unescape View File

@ -20,6 +20,20 @@ if ($debug) {
}
switch ($action) {
case 'get_lp_list_by_course':
$course_id = (isset($_GET['course_id']) && !empty($_GET['course_id'])) ? (int) $_GET['course_id'] : 0;
$onlyActiveLp = !(api_is_platform_admin(true) || api_is_course_admin());
$results = learnpath::getLpList($course_id, $onlyActiveLp);
$data= [];
if (!empty($results)) {
foreach ($results as $lp) {
$data[] = ['id' => $lp['id'], 'text' => html_entity_decode($lp['name'])];
}
}
echo json_encode($data);
break;
case 'get_documents':
$courseInfo = api_get_course_info();
$folderId = isset($_GET['folder_id']) ? $_GET['folder_id'] : null;

44
main/inc/lib/TicketManager.php
Unescape View File

@ -287,6 +287,8 @@ class TicketManager
* @param string $priority
* @param string $status
* @param int $assignedUserId
* @param int $exerciseId
* @param int $lpId
*
* @return bool
*/
@ -303,7 +305,9 @@ class TicketManager
$source = '',
$priority = '',
$status = '',
$assignedUserId = 0
$assignedUserId = 0,
$exerciseId = null,
$lpId = null
) {
$table_support_tickets = Database::get_main_table(TABLE_TICKET_TICKET);
$table_support_category = Database::get_main_table(TABLE_TICKET_CATEGORY);
@ -365,6 +369,14 @@ class TicketManager
'message' => $content,
];
if (!empty($exerciseId)) {
$params['exercise_id'] = $exerciseId;
}
if (!empty($lpId)) {
$params['lp_id'] = $lpId;
}
if (!empty($course_id)) {
$params['course_id'] = $course_id;
}
@ -372,6 +384,7 @@ class TicketManager
if (!empty($sessionId)) {
$params['session_id'] = $sessionId;
}
$ticketId = Database::insert($table_support_tickets, $params);
if ($ticketId) {
@ -1205,6 +1218,35 @@ class TicketManager
if ($course) {
$row['course_url'] = '<a href="'.$course['course_public_url'].'?id_session='.$sessionId.'">'.$course['name'].'</a>';
}
$row['exercise_url'] = null;
if (!empty($row['exercise_id'])) {
$exerciseTitle = ExerciseLib::getExerciseTitleById($row['exercise_id']);
$dataExercise = [
'cidReq' => $course['code'],
'id_session' => $sessionId,
'exerciseId' => $row['exercise_id']
];
$urlParamsExercise = http_build_query($dataExercise);
$row['exercise_url'] = '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.$urlParamsExercise.'">'.$exerciseTitle.'</a>';
}
$row['lp_url'] = null;
if (!empty($row['lp_id'])) {
$lpName = learnpath::getLpNameById($row['lp_id']);
$dataLp = [
'cidReq' => $course['code'],
'id_session' => $sessionId,
'lp_id' => $row['lp_id'],
'action' => 'view'
];
$urlParamsLp = http_build_query($dataLp);
$row['lp_url'] = '<a href="'.api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.$urlParamsLp.'">'.$lpName.'</a>';
}
}
$userInfo = api_get_user_info($row['sys_insert_user_id']);

16
main/inc/lib/exercise.lib.php
Unescape View File

@ -5628,6 +5628,22 @@ EOT;
return Category::getDownloadCertificateBlock($certificate);
}
/**
* @param int $exerciseId
*/
public static function getExerciseTitleById($exerciseId)
{
$em = Database::getManager();
return $em
->createQuery('SELECT cq.title
FROM ChamiloCourseBundle:CQuiz cq
WHERE cq.iid = :iid'
)
->setParameter('iid', $exerciseId)
->getSingleScalarResult();
}
/**
* @param int $exeId ID from track_e_exercises
* @param int $userId User ID

14
main/inc/lib/template.lib.php
Unescape View File

@ -1377,7 +1377,19 @@ class Template
if (!empty($courseInfo)) {
$courseParams = api_get_cidreq();
}
$url = api_get_path(WEB_CODE_PATH).'ticket/tickets.php?project_id='.$defaultProjectId.'&'.$courseParams;
$extraParams = '';
if (api_get_configuration_value('ticket_add_quiz_and_lp')) {
if (isset($_GET['exerciseId']) && !empty($_GET['exerciseId'])) {
$extraParams = '&exerciseId=' . $_GET['exerciseId'];
}
if (isset($_GET['lp_id']) && !empty($_GET['lp_id'])) {
$extraParams .= '&lpId=' . $_GET['lp_id'];
}
}
$url = api_get_path(WEB_CODE_PATH).'ticket/tickets.php?project_id='.$defaultProjectId.'&'.$courseParams.$extraParams;
$allow = TicketManager::userIsAllowInProject(api_get_user_info(), $defaultProjectId);

8
main/install/configuration.dist.php
Unescape View File

@ -569,6 +569,14 @@ $_configuration['send_all_emails_to'] = [
]
];*/
// Allow additional data (exercise and learningpath) in the ticket
// - Required DB change
// ALTER TABLE ticket_ticket ADD exercise_id INT DEFAULT NULL AFTER course_id;
// ALTER TABLE ticket_ticket ADD CONSTRAINT FK_EB5B2A0D6285C987 FOREIGN KEY (exercise_id) REFERENCES c_quiz (iid);
// ALTER TABLE ticket_ticket ADD lp_id INT DEFAULT NULL AFTER exercise_id;
// ALTER TABLE ticket_ticket ADD CONSTRAINT FK_EB5B2A0D6285C231 FOREIGN KEY (lp_id) REFERENCES c_lp (iid);
// $_configuration['ticket_lp_quiz_info_add'] = false;
// Exercises configuration settings
// Send only quiz answer notifications to course coaches and not general coach
//$_configuration['block_quiz_mail_notification_general_coach'] = false;

36
main/lp/learnpath.class.php
Unescape View File

@ -1830,6 +1830,23 @@ class learnpath
}
}
/**
* Get the learning path name by id
*
* @param int $lpId
*
* @return mixed
*/
public static function getLpNameById($lpId)
{
$em = Database::getManager();
return $em->createQuery('SELECT clp.name FROM ChamiloCourseBundle:CLp clp
WHERE clp.iid = :iid')
->setParameter('iid', $lpId)
->getSingleScalarResult();
}
/**
* Gets the navigation bar for the learnpath display screen.
*
@ -12161,12 +12178,25 @@ EOD;
}
}
public static function getLpList($courseId)
public static function getLpList($courseId, $onlyActiveLp = true)
{
$table = Database::get_course_table(TABLE_LP_MAIN);
$TABLE_LP = Database::get_course_table(TABLE_LP_MAIN);
$TABLE_ITEM_PROPERTY = Database::get_course_table(TABLE_ITEM_PROPERTY);
$courseId = (int) $courseId;
$sql = "SELECT * FROM $table WHERE c_id = $courseId";
$sql = "SELECT lp.id, lp.name
FROM $TABLE_LP lp
INNER JOIN $TABLE_ITEM_PROPERTY ip
ON lp.id = ip.ref
WHERE lp.c_id = $courseId ";
if ($onlyActiveLp) {
$sql .= "AND ip.tool = 'learnpath' ";
$sql .= "AND ip.visibility = 1 ";
}
$sql .= "GROUP BY lp.id";
$result = Database::query($sql);
return Database::store_result($result, 'ASSOC');

114
main/ticket/new_ticket.php
Unescape View File

@ -13,11 +13,14 @@ if (!api_is_platform_admin() && api_get_setting('ticket_allow_student_add') !==
api_block_anonymous_users();
$courseId = api_get_course_int_id();
$exerciseId = (isset($_GET['exerciseId']) && !empty($_GET['exerciseId'])) ? (int) $_GET['exerciseId'] : 0;
$lpId = (isset($_GET['lpId']) && !empty($_GET['lpId'])) ? (int) $_GET['lpId'] : 0;
$htmlHeadXtra[] = '<script>
function updateCourseList(sessionId) {
$selectCourse = $("select#course_id");
var $selectCourse = $("select#course_id");
$selectCourse.empty();
$.get("'.api_get_path(WEB_AJAX_PATH).'session.ajax.php", {
a: "get_courses_inside_session",
session_id : sessionId
@ -34,20 +37,96 @@ function updateCourseList(sessionId) {
text: course.name
}).appendTo($selectCourse);
});
$("select#course_id option[value=\''.$courseId.'\']").attr("selected",true);
$("select#course_id").selectpicker("refresh");
$selectCourse.find("option[value=\''.$courseId.'\']").attr("selected",true);
$selectCourse.selectpicker("refresh");
}
}, "json");
}
function updateExerciseList(courseId, sessionId) {
var $selectExercise = $("select#exercise_id");
$selectExercise.empty();
$.get("'.api_get_path(WEB_AJAX_PATH).'exercise.ajax.php", {
a: "get_exercise_by_course",
course_id: courseId,
session_id : sessionId
}, function (exerciseList) {
$("<option>", {
value: 0,
text: "' . get_lang('Select') . '"
}).appendTo($selectExercise);
if (exerciseList.length > 0) {
$.each(exerciseList, function (index, exercise) {
$("<option>", {
value: exercise.id,
text: exercise.text
}).appendTo($selectExercise);
});
$selectExercise.find("option[value=\'' . $exerciseId . '\']").attr("selected",true);
}
$selectExercise.selectpicker("refresh");
}, "json");
}
function updateLpList(courseId) {
var $selectLp = $("select#lp_id");
$selectLp.empty();
$.get("'.api_get_path(WEB_AJAX_PATH).'lp.ajax.php", {
a: "get_lp_list_by_course",
course_id: courseId
}, function (lpList) {
$("<option>", {
value: 0,
text: "' . get_lang('Select') . '"
}).appendTo($selectLp);
if (lpList.length > 0) {
$.each(lpList, function (index, lp) {
$("<option>", {
value: lp.id,
text: lp.text
}).appendTo($selectLp);
});
$selectLp.find("option[value=\'' . $lpId . '\']").attr("selected",true);
}
$selectLp.selectpicker("refresh");
}, "json");
}
$(function() {
$("select#session_id").on("change", function () {
$(document).ready(function() {
var $selectSession = $("select#session_id");
var $selectCourse = $("select#course_id");
$selectSession.on("change", function () {
var sessionId = parseInt(this.value, 10);
updateCourseList(sessionId);
updateExerciseList(0, sessionId);
updateLpList(0);
});
$selectCourse.on("change", function () {
var sessionId = $selectSession.val();
var courseId = parseInt(this.value, 10);
updateExerciseList(courseId, sessionId);
updateLpList(courseId);
});
var sessionId = $("select#session_id").val();
var sessionId = $selectSession.val();
var courseId = $selectCourse.val() ? $selectCourse.val() : '.$courseId.';
updateCourseList(sessionId);
updateExerciseList(courseId, sessionId);
updateLpList(courseId);
});
var counter_image = 1;
@ -139,6 +218,8 @@ function save_ticket()
$course_id = isset($_POST['course_id']) ? (int) $_POST['course_id'] : '';
$sessionId = isset($_POST['session_id']) ? (int) $_POST['session_id'] : '';
$category_id = isset($_POST['category_id']) ? (int) $_POST['category_id'] : '';
$exercise_id = isset($_POST['exercise_id']) ? (int) $_POST['exercise_id'] : null;
$lp_id = isset($_POST['lp_id']) ? (int) $_POST['lp_id'] : null;
$project_id = (int) $_POST['project_id'];
$subject = $_POST['subject'];
@ -163,7 +244,9 @@ function save_ticket()
$source,
$priority,
$status,
$user_id
$user_id,
$exercise_id,
$lp_id
)) {
header('Location:'.api_get_path(WEB_CODE_PATH).'ticket/tickets.php');
exit;
@ -371,6 +454,12 @@ if (api_is_platform_admin() || !empty($sessionList)) {
$form->addSelect('course_id', get_lang('Course'), [], ['id' => 'course_id']);
if (api_get_configuration_value('ticket_lp_quiz_info_add')) {
$form->addSelect('exercise_id', get_lang('Exercise'), [], ['id' => 'exercise_id']);
$form->addSelect('lp_id', get_lang('LearningPath'), [], ['id' => 'lp_id']);
}
$courseInfo = api_get_course_info();
$params = [];
@ -380,9 +469,20 @@ if (!empty($courseInfo)) {
];
$sessionInfo = api_get_session_info(api_get_session_id());
if (!empty($sessionInfo)) {
$params['session_id'] = $sessionInfo['id'];
}
if (api_get_configuration_value('ticket_lp_quiz_info_add')) {
if ($exerciseId !== '') {
$params['exercise_id'] = $exerciseId;
}
if ($lpId !== '') {
$params['lp_id'] = $lpId;
}
}
}
$form->setDefaults($params);

18
main/ticket/ticket_details.php
Unescape View File

@ -394,6 +394,24 @@ if ($ticket['ticket']['course_url'] != null) {
<td></td>
<td colspan="2"></td>
</tr>';
if (api_get_configuration_value('ticket_lp_quiz_info_add')) {
if (!empty($ticket['ticket']['exercise_url'])) {
echo '<tr>
<td><b>' . get_lang('Exercise') . ':</b> ' . $ticket['ticket']['exercise_url'] . ' </td>
<td></td>
<td colspan="2"></td>
</tr>';
}
if (!empty($ticket['ticket']['lp_id'])) {
echo '<tr>
<td><b>' . get_lang('LearningPath') . ':</b> ' . $ticket['ticket']['lp_url'] . ' </td>
<td></td>
<td colspan="2"></td>
</tr>';
}
}
}
echo '<tr>

12
main/ticket/tickets.php
Unescape View File

@ -228,6 +228,16 @@ if (!empty($projectId)) {
// Add link
if (api_get_setting('ticket_allow_student_add') == 'true' || api_is_platform_admin()) {
$extraParams = '';
if (isset($_GET['exerciseId']) && !empty($_GET['exerciseId'])) {
$extraParams .= '&exerciseId=' . (int) $_GET['exerciseId'];
}
if (isset($_GET['lpId']) && !empty($_GET['lpId'])) {
$extraParams .= '&lpId=' . (int) $_GET['lpId'];
}
$actionRight = Display::url(
Display::return_icon(
'add.png',
@ -235,7 +245,7 @@ if (!empty($projectId)) {
null,
ICON_SIZE_MEDIUM
),
api_get_path(WEB_CODE_PATH).'ticket/new_ticket.php?project_id='.$projectId.'&'.api_get_cidReq(),
api_get_path(WEB_CODE_PATH).'ticket/new_ticket.php?project_id='.$projectId.'&'.api_get_cidReq().$extraParams,
['title' => get_lang('Add')]
);
}

Write Preview
Loading…
Cancel
Save