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

Feature #2099 - The action "Delete" in some pages has been revised.

Browse Source
skala
Ivan Tcholakov 15 years ago
parent e593fec0cf
commit d3ba22e3a7
5 changed files with 131 additions and 68 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. 56
      main/admin/course_request_accepted.php
  2. 61
      main/admin/course_request_rejected.php
  3. 76
      main/admin/course_request_review.php
  4. 3
      main/lang/bulgarian/create_course.inc.php
  5. 3
      main/lang/english/create_course.inc.php

56
main/admin/course_request_accepted.php
Unescape View File

@ -72,20 +72,20 @@ function get_request_data($from, $number_of_items, $column, $direction) {
$users_table = Database :: get_main_table(TABLE_MAIN_USER);
$course_users_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$sql = "SELECT code AS col0,
title AS col1,
category_code AS col2,
tutor_name AS col3,
request_date AS col4,
id AS col5
$sql = "SELECT id AS col0,
code AS col1,
title AS col2,
category_code AS col3,
tutor_name AS col4,
request_date AS col5,
id AS col6
FROM $course_table WHERE status = ".COURSE_REQUEST_ACCEPTED;
$sql .= " ORDER BY col$column $direction ";
$sql .= " LIMIT $from,$number_of_items";
$res = Database :: query($sql);
$courses = array();
$courses = array();
while ($course = Database :: fetch_row($res)) {
$courses[] = $course;
}
@ -103,6 +103,26 @@ function modify_filter($id) {
return $result;
}
/**
* Form actions: delete.
*/
if (isset($_POST['action'])) {
switch ($_POST['action']) {
// Delete selected courses
case 'delete_course_requests' :
$course_requests = $_POST['course_request'];
if (is_array($_POST['course_request']) && !empty($_POST['course_request'])) {
$success = true;
foreach ($_POST['course_request'] as $index => $course_request_id) {
$success &= CourseRequestManager::delete_course_request($course_request_id);
}
$message = $success ? get_lang('SelectedCourseRequestsDeleted') : get_lang('SomeCourseRequestsNotDeleted');
$is_error_message = !$success;
}
break;
}
}
$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
$tool_name = get_lang('AcceptedCourseRequests');
Display :: display_header($tool_name);
@ -126,17 +146,15 @@ echo '</div>';
// Create a sortable table with the course data
$table = new SortableTable('course_requests', 'get_number_of_requests', 'get_request_data', 2);
$table->set_additional_parameters($parameters);
//$table->set_header(0, '', false);
$table->set_header(0, get_lang('Code'));
$table->set_header(1, get_lang('Title'));
$table->set_header(2, get_lang('Category'));
//$table->set_header(3, get_lang('Teacher'), false);
//$table->set_header(4, get_lang('CourseRequestDate'), false);
$table->set_header(3, get_lang('Teacher'));
$table->set_header(4, get_lang('CourseRequestDate'));
$table->set_header(5, '', false);
$table->set_column_filter(5, 'modify_filter');
//$table->set_form_actions(array('delete_courses' => get_lang('DeleteCourse')), 'course');
$table->set_header(0, '', false);
$table->set_header(1, get_lang('Code'));
$table->set_header(2, get_lang('Title'));
$table->set_header(3, get_lang('Category'));
$table->set_header(4, get_lang('Teacher'));
$table->set_header(5, get_lang('CourseRequestDate'));
$table->set_header(6, '', false);
$table->set_column_filter(6, 'modify_filter');
$table->set_form_actions(array('delete_course_requests' => get_lang('DeleteCourseRequests')), 'course_request');
$table->display();
/* FOOTER */

61
main/admin/course_request_rejected.php
Unescape View File

@ -107,20 +107,20 @@ function get_request_data($from, $number_of_items, $column, $direction) {
$users_table = Database :: get_main_table(TABLE_MAIN_USER);
$course_users_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$sql = "SELECT code AS col0,
title AS col1,
category_code AS col2,
tutor_name AS col3,
request_date AS col4,
id AS col5
$sql = "SELECT id AS col0,
code AS col1,
title AS col2,
category_code AS col3,
tutor_name AS col4,
request_date AS col5,
id AS col6
FROM $course_table WHERE status = ".COURSE_REQUEST_REJECTED;
$sql .= " ORDER BY col$column $direction ";
$sql .= " LIMIT $from,$number_of_items";
$res = Database :: query($sql);
$courses = array();
$courses = array();
while ($course = Database :: fetch_row($res)) {
$courses[] = $course;
}
@ -134,14 +134,35 @@ function get_request_data($from, $number_of_items, $column, $direction) {
function modify_filter($id) {
$code = CourseRequestManager::get_course_request_code($id);
$result = '<a href="editar_curso.php?id='.$id.'">'.Display::return_icon('edit.gif', get_lang('Edit'), array('style' => 'vertical-align: middle;')).'</a>'.
'&nbsp;<a href="?accept_course_request='.$id.'">'.Display::return_icon('action_accept.gif', get_lang('AcceptThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ANewCourseWillBeCreated'), $code), ENT_QUOTES)).'\')) return false;')).'</a>'.
'&nbsp;<a href="?delete_course_request='.$id.'">'.Display::return_icon('delete.gif', get_lang('DeleteThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ACourseRequestWillBeDeleted'), $code), ENT_QUOTES)).'\')) return false;')).'</a>';
'&nbsp;<a href="?accept_course_request='.$id.'">'.Display::return_icon('action_accept.gif', get_lang('AcceptThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ANewCourseWillBeCreated'), $code), ENT_QUOTES)).'\')) return false;')).'</a>';
if (!CourseRequestManager::additional_info_asked($id)) {
$result .= '&nbsp;<a href="?request_info='.$id.'">'.Display::return_icon('request_info.gif', get_lang('AskAdditionalInfo'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('AdditionalInfoWillBeAsked'), $code), ENT_QUOTES)).'\')) return false;')).'</a>';
}
$result .= '&nbsp;<a href="?delete_course_request='.$id.'">'.Display::return_icon('delete.gif', get_lang('DeleteThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ACourseRequestWillBeDeleted'), $code), ENT_QUOTES)).'\')) return false;')).'</a>';
return $result;
}
/**
* Form actions: delete.
*/
if (isset($_POST['action'])) {
switch ($_POST['action']) {
// Delete selected courses
case 'delete_course_requests' :
$course_requests = $_POST['course_request'];
if (is_array($_POST['course_request']) && !empty($_POST['course_request'])) {
$success = true;
foreach ($_POST['course_request'] as $index => $course_request_id) {
$success &= CourseRequestManager::delete_course_request($course_request_id);
}
$message = $success ? get_lang('SelectedCourseRequestsDeleted') : get_lang('SomeCourseRequestsNotDeleted');
$is_error_message = !$success;
}
break;
}
}
$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
$tool_name = get_lang('RejectedCourseRequests');
Display :: display_header($tool_name);
@ -165,17 +186,15 @@ echo '</div>';
// Create a sortable table with the course data
$table = new SortableTable('course_requests', 'get_number_of_requests', 'get_request_data', 2);
$table->set_additional_parameters($parameters);
//$table->set_header(0, '', false);
$table->set_header(0, get_lang('Code'));
$table->set_header(1, get_lang('Title'));
$table->set_header(2, get_lang('Category'));
//$table->set_header(3, get_lang('Teacher'), false);
//$table->set_header(4, get_lang('CourseRequestDate'), false);
$table->set_header(3, get_lang('Teacher'));
$table->set_header(4, get_lang('CourseRequestDate'));
$table->set_header(5, '', false);
$table->set_column_filter(5, 'modify_filter');
//$table->set_form_actions(array('delete_courses' => get_lang('DeleteCourse')), 'course');
$table->set_header(0, '', false);
$table->set_header(1, get_lang('Code'));
$table->set_header(2, get_lang('Title'));
$table->set_header(3, get_lang('Category'));
$table->set_header(4, get_lang('Teacher'));
$table->set_header(5, get_lang('CourseRequestDate'));
$table->set_header(6, '', false);
$table->set_column_filter(6, 'modify_filter');
$table->set_form_actions(array('delete_course_requests' => get_lang('DeleteCourseRequests')), 'course_request');
$table->display();
/* FOOTER */

76
main/admin/course_request_review.php
Unescape View File

@ -37,6 +37,10 @@ require_once api_get_path(CONFIGURATION_PATH).'add_course.conf.php';
// Including additional libraries.
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
// The delete action should be deactivated in this page.
// Better reject the target request, after that you can delete it.
define(DELETE_ACTION_ENABLED, false);
// Filltering passed to this page parameters.
$accept_course_request = intval($_GET['accept_course_request']);
$reject_course_request = intval($_GET['reject_course_request']);
@ -122,7 +126,8 @@ function get_request_data($from, $number_of_items, $column, $direction) {
$users_table = Database :: get_main_table(TABLE_MAIN_USER);
$course_users_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$sql = "SELECT code AS col0,
if (DELETE_ACTION_ENABLED) {
$sql = "SELECT id AS col0,
code AS col1,
title AS col2,
category_code AS col3,
@ -130,12 +135,22 @@ function get_request_data($from, $number_of_items, $column, $direction) {
request_date AS col5,
id AS col6
FROM $course_table WHERE status = ".COURSE_REQUEST_PENDING;
} else {
$sql = "SELECT
code AS col0,
title AS col1,
category_code AS col2,
tutor_name AS col3,
request_date AS col4,
id AS col5
FROM $course_table WHERE status = ".COURSE_REQUEST_PENDING;
}
$sql .= " ORDER BY col$column $direction ";
$sql .= " LIMIT $from,$number_of_items";
$res = Database::query($sql);
$courses = array();
$courses = array();
while ($course = Database::fetch_row($res)) {
$courses[] = $course;
}
@ -164,25 +179,27 @@ function modify_filter($id) {
if (!CourseRequestManager::additional_info_asked($id)) {
$result .= '&nbsp;<a href="?request_info='.$id.'">'.Display::return_icon('request_info.gif', get_lang('AskAdditionalInfo'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('AdditionalInfoWillBeAsked'), $code), ENT_QUOTES)).'\')) return false;')).'</a>';
}
// The delete action has been deactivated here. Better reject the target request, after that you can delete it.
//$result .= '&nbsp;<a href="?delete_course_request='.$id.'">'.Display::return_icon('delete.gif', get_lang('DeleteThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ACourseRequestWillBeDeleted'), $code), ENT_QUOTES)).'\')) return false;')).'</a>';
if (DELETE_ACTION_ENABLED) {
$result .= '&nbsp;<a href="?delete_course_request='.$id.'">'.Display::return_icon('delete.gif', get_lang('DeleteThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ACourseRequestWillBeDeleted'), $code), ENT_QUOTES)).'\')) return false;')).'</a>';
}
return $result;
}
if (isset ($_POST['action'])) {
/**
* Form actions: delete.
*/
if (DELETE_ACTION_ENABLED && isset($_POST['action'])) {
switch ($_POST['action']) {
// Delete selected courses
case 'delete_courses' :
$course_codes = $_POST['course'];
if (count($course_codes) > 0) {
foreach ($course_codes as $index => $course_code) {
//CourseManager :: delete_course($course_code);
$sql = "DELETE FROM ".Database :: get_main_table(TABLE_MAIN_COURSE_REQUEST)." WHERE code LIKE '".$course_code."'";
//echo $sql;
$result = Database::query($sql);
case 'delete_course_requests' :
$course_requests = $_POST['course_request'];
if (is_array($_POST['course_request']) && !empty($_POST['course_request'])) {
$success = true;
foreach ($_POST['course_request'] as $index => $course_request_id) {
$success &= CourseRequestManager::delete_course_request($course_request_id);
}
$message = $success ? get_lang('SelectedCourseRequestsDeleted') : get_lang('SomeCourseRequestsNotDeleted');
$is_error_message = !$success;
}
break;
}
@ -209,20 +226,23 @@ echo '<a href="course_request_rejected.php">'.Display::return_icon('course_reque
echo '</div>';
// Create a sortable table with the course data
$table = new SortableTable('course_requests', 'get_number_of_requests', 'get_request_data', 2);
$offet = DELETE_ACTION_ENABLED ? 1 : 0;
$table = new SortableTable('course_requests', 'get_number_of_requests', 'get_request_data', 1 + $offet);
$table->set_additional_parameters($parameters);
$table->set_header(0, '', false);
$table->set_header(1, get_lang('Code'));
$table->set_header(2, get_lang('Title'));
$table->set_header(3, get_lang('Category'));
//$table->set_header(4, get_lang('Teacher'), false);
//$table->set_header(5, get_lang('CourseRequestDate'), false);
$table->set_header(4, get_lang('Teacher'));
$table->set_header(5, get_lang('CourseRequestDate'));
$table->set_header(6, '', false);
$table->set_column_filter(4,'email_filter');
$table->set_column_filter(6,'modify_filter');
$table->set_form_actions(array('delete_courses' => get_lang('DeleteCourse')), 'course');
if (DELETE_ACTION_ENABLED) {
$table->set_header(0, '', false);
}
$table->set_header(0 + $offet, get_lang('Code'));
$table->set_header(1 + $offet, get_lang('Title'));
$table->set_header(2 + $offet, get_lang('Category'));
$table->set_header(3 + $offet, get_lang('Teacher'));
$table->set_header(4 + $offet, get_lang('CourseRequestDate'));
$table->set_header(5 + $offet, '', false);
$table->set_column_filter(3 + $offet, 'email_filter');
$table->set_column_filter(5 + $offet, 'modify_filter');
if (DELETE_ACTION_ENABLED) {
$table->set_form_actions(array('delete_course_requests' => get_lang('DeleteCourseRequests')), 'course_request');
}
$table->display();
/* FOOTER */

3
main/lang/bulgarian/create_course.inc.php
Unescape View File

@ -128,4 +128,7 @@ $CourseRequestInfoAsked = "Изпратено е искане за допълн
$CourseRequestInfoFailed = "Искане за допълнителна информация по заявката %s не беше изпратено поради появила се грешка.";
$CourseRequestDeleted = "Заявката %s е изтрита.";
$CourseRequestDeletionFailed = "Заявката %s не можа да бъде изтрита поради появила се грешка.";
$DeleteCourseRequests = "Изтриване на избраните заявки за курсове";
$SelectedCourseRequestsDeleted = "Избраните заявки за курсове са изтрити.";
$SomeCourseRequestsNotDeleted = "Някои от избраните заявки за курсове не са изтрити поради появила се грешка.";
?>

3
main/lang/english/create_course.inc.php
Unescape View File

@ -128,4 +128,7 @@ $CourseRequestInfoAsked = "Additional information about the training request %s
$CourseRequestInfoFailed = "Additional information about the training request %s has not been asked due to internal error.";
$CourseRequestDeleted = "The training request %s has been deleted.";
$CourseRequestDeletionFailed = "The training request %s has not been deleted due to internal error.";
$DeleteCourseRequests = "Delete selected training request(s)";
$SelectedCourseRequestsDeleted = "The selected course requests have been deleted.";
$SomeCourseRequestsNotDeleted = "Some of the selected course requests have not been deleted due to internal error.";
?>
Write Preview
Loading…
Cancel
Save