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

More UI improvements in Resume session and Copy session features BT#1596

Browse Source
skala
Julio Montoya 14 years ago
parent 191bf31119
commit ef9e1d175d
5 changed files with 38 additions and 54 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. 14
      main/admin/add_courses_to_session.php
  2. 42
      main/admin/add_users_to_session.php
  3. 4
      main/admin/session_course_edit.php
  4. 11
      main/admin/session_edit.php
  5. 21
      main/coursecopy/copy_course_session.php

14
main/admin/add_courses_to_session.php
Unescape View File

@ -18,6 +18,7 @@ require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'add_courses_to_session_functions.lib.php';
$id_session = intval($_GET['id_session']);
$xajax = new xajax();
//$xajax->debugOn();
@ -32,6 +33,7 @@ api_protect_admin_script(true);
// setting breadcrumbs
$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
$interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id_session,"name" => get_lang('SessionOverview'));
// Database Table Definitions
$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
@ -42,7 +44,6 @@ $tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
// setting the name of the tool
$tool_name= get_lang('SubscribeCoursesToSession');
$id_session=intval($_GET['id_session']);
$add_type = 'multiple';
if(isset($_GET['add_type']) && $_GET['add_type']!=''){
@ -319,7 +320,7 @@ else
{
?>
<div id="ajax_list_courses_multiple">
<select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:320px;"> <?php
<select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:360px;"> <?php
foreach($nosessionCourses as $enreg)
{
?>
@ -350,17 +351,14 @@ unset($nosessionCourses);
?>
<br /><br /><br /><br /><br /><br />
<?php
if(isset($_GET['add']))
{
if(isset($_GET['add'])) {
echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('NextStep').'</button>';
}
else
{
} else {
echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeCoursesToSession').'</button>';
}
?>
</td>
<td width="45%" align="center"><select id='destination' name="SessionCoursesList[]" multiple="multiple" size="20" style="width:320px;">
<td width="45%" align="center"><select id='destination' name="SessionCoursesList[]" multiple="multiple" size="20" style="width:360px;">
<?php
foreach($sessionCourses as $enreg)

42
main/admin/add_users_to_session.php
Unescape View File

@ -1,4 +1,4 @@
<?php //$id: $
<?php
/* For licensing terms, see /license.txt */
/**
* @package chamilo.admin
@ -8,7 +8,7 @@
$language_file=array('admin','registration');
// resetting the course id
$cidReset=true;
$cidReset = true;
// including some necessary files
require_once '../inc/global.inc.php';
@ -24,9 +24,12 @@ $this_section = SECTION_PLATFORM_ADMIN;
// Access restrictions
api_protect_admin_script(true);
$id_session = intval($_GET['id_session']);
// setting breadcrumbs
$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
$interbreadcrumb[]=array('url' => 'session_list.php','name' => get_lang('SessionList'));
$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
$interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id_session,"name" => get_lang('SessionOverview'));
// Database Table Definitions
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
@ -42,8 +45,6 @@ $tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER);
// setting the name of the tool
$tool_name=get_lang('SubscribeUsersToSession');
$id_session=intval($_GET['id_session']);
$add_type = 'multiple';
if(isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){
$add_type = Security::remove_XSS($_REQUEST['add_type']);
@ -71,8 +72,7 @@ if (is_array($extra_field_list)) {
}
}
function search_users($needle,$type)
{
function search_users($needle, $type) {
global $tbl_user,$tbl_session_rel_user,$id_session;
$xajax_response = new XajaxResponse();
$return = '';
@ -194,8 +194,7 @@ function add_user_to_session (code, content) {
sortOptions(destination.options);
}
function remove_item(origin)
{
function remove_item(origin) {
for(var i = 0 ; i<origin.options.length ; i++) {
if(origin.options[i].selected) {
origin.options[i]=null;
@ -205,15 +204,10 @@ function remove_item(origin)
}
function validate_filter() {
document.formulaire.add_type.value = \''.$add_type.'\';
document.formulaire.form_sent.value=0;
document.formulaire.submit();
}
</script>';
@ -512,7 +506,7 @@ if(!empty($errorMsg)) {
} else {
?>
<div id="ajax_list_users_multiple">
<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">
<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:380px;">
<?php
foreach($nosessionUsersList as $enreg) {
?>
@ -545,16 +539,14 @@ if(!empty($errorMsg)) {
<br /><br /><br /><br /><br /><br />
</td>
<td align="center">
<select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" style="width:360px;">
<select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" style="width:380px;">
<?php
foreach($sessionUsersList as $enreg) {
?>
<option value="<?php echo $enreg['user_id']; ?>"><?php echo $enreg['firstname'].' '.$enreg['lastname'].' ('.$enreg['username'].')'; ?></option>
<option value="<?php echo $enreg['user_id']; ?>"><?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?></option>
<?php
}
unset($sessionUsersList);
?>
@ -666,13 +658,7 @@ function makepost(select){
}
-->
</script>
<?php
/*
==============================================================================
FOOTER
==============================================================================
*/
Display::display_footer();
?>
/* FOOTER */
Display::display_footer();

4
main/admin/session_course_edit.php
Unescape View File

@ -111,7 +111,7 @@ api_display_tool_title($tool_name);
<form method="post" action="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&page=<?php echo Security::remove_XSS($_GET['page']) ?>" style="margin:0px;">
<input type="hidden" name="formSent" value="1">
<table border="0" cellpadding="5" cellspacing="0" width="550">
<table border="0" cellpadding="5" cellspacing="0" width="600px">
<?php
if(!empty($errorMsg)) {
@ -129,7 +129,7 @@ if(!empty($errorMsg)) {
<tr>
<td width="25%" valign = "top"><?php echo get_lang("CoachName") ?>&nbsp;&nbsp;</td>
<td width="70%"><select name="id_coach[]" style="width:300px;" multiple="multiple" size="7">
<td width="70%"><select name="id_coach[]" style="width:450px;" multiple="multiple" size="7">
<option value="0">----- <?php echo get_lang("Choose") ?> -----</option>
<option value="0" <?php if(count($arr_infos) == 0) echo 'selected="selected"'; ?>><?php echo get_lang('None') ?></option>
<?php

11
main/admin/session_edit.php
Unescape View File

@ -20,15 +20,15 @@ $formSent=0;
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
$result=Database::query("SELECT name,date_start,date_end,id_coach, session_admin_id, nb_days_access_before_beginning, nb_days_access_after_end, session_category_id, visibility FROM $tbl_session WHERE id= $id");
$sql = "SELECT name,date_start,date_end,id_coach, session_admin_id, nb_days_access_before_beginning, nb_days_access_after_end, session_category_id, visibility FROM $tbl_session WHERE id = $id";
$result = Database::query($sql);
if (!$infos=Database::fetch_array($result)) {
header('Location: session_list.php');
exit();
}
if (!api_is_platform_admin() && $infos['session_admin_id']!=api_get_user_id()) {
if (!api_is_platform_admin() && $infos['session_admin_id'] != api_get_user_id()) {
api_not_allowed(true);
}
@ -36,6 +36,7 @@ $tool_name = get_lang('EditSession');
$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin'));
$interbreadcrumb[]=array('url' => "session_list.php","name" => get_lang('SessionList'));
$interbreadcrumb[]=array('url' => "resume_session.php?id_session=".$id,"name" => get_lang('SessionOverview'));
list($year_start,$month_start,$day_start) = explode('-',$infos['date_start']);
list($year_end,$month_end,$day_end) = explode('-',$infos['date_end']);
@ -114,7 +115,7 @@ if (!empty($return)) {
</tr>
<tr>
<td width="30%"><?php echo get_lang('CoachName') ?>&nbsp;&nbsp;</td>
<td width="70%"><select name="id_coach" style="width:250px;">
<td width="70%"><select name="id_coach" style="width:380px;">
<option value="">----- <?php echo get_lang('Choose') ?> -----</option>
<?php
foreach($Coaches as $enreg) {
@ -130,7 +131,7 @@ $Categories = SessionManager::get_all_session_category();
<tr>
<td width="30%"><?php echo get_lang('SessionCategory') ?></td>
<td width="70%">
<select name="session_category" value="true" style="width:250px;">
<select name="session_category" style="width:380px;">
<option value="0"><?php get_lang('None'); ?></option>
<?php
if (!empty($Categories)) {

21
main/coursecopy/copy_course_session.php
Unescape View File

@ -92,33 +92,33 @@ function display_form() {
$html .= '<a href="../admin/index.php">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'','32').'</a>';
$html .= '</div>';
//$html .= '<div class="row"><div class="form_header">'.get_lang('CopyCourse').'</div></div>';
$html .= Display::return_message(get_lang('CopyCourseFromSessionToSessionExplanation'));
$html .= '<form name="formulaire" method="post" action="'.api_get_self().'" >';
$html .= '<table border="0" cellpadding="5" cellspacing="0" width="100%" align="center">';
//left
$html .= '<tr><td width="30%" align="center"><b>'.get_lang('OriginCoursesFromSession').':</b></td>';
$html .= '<td >&nbsp;</td><td align="center" width="30%"><b>'.get_lang('DestinationCoursesFromSession').':</b></td></tr>';
$html .= '<tr><td width="30%" align="center">'.make_select_session_list('sessions_list_origin', $sessions, array('onchange' => 'javascript: xajax_search_courses(this.value,\'origin\');')).'</td>';
$html .= '<td>&nbsp;</td><td width="30%" align="center"><div id="ajax_sessions_list_destination">';
$html .= '<select name="sessions_list_destination" onchange = "javascript: xajax_search_courses(this.value,\'destination\');">';
$html .= '<option value = "0">'.get_lang('ThereIsNotStillASession').'</option></select ></div></td></tr>';
$html .= '<tr><td width="30%" align="center"><div id="ajax_list_courses_origin">';
$html .= '<select id="origin" name="SessionCoursesListOrigin[]" multiple="multiple" size="20" style="width:320px;"></select></div></td>';
// Options configuration
//$html .= '<td align="top"><div class="sectiontitle">'.get_lang('CopyCourse').'</div>';
$html .= '<td align="top">';
$introduction = get_lang('CopyCourseFromSessionToSessionExplanation');
$html .= '<div class="normal-message">'.$introduction.'</div>';
$html .= '<div style="height:150px;padding-top:10px;padding-bottom:50px"><h3>'.get_lang('TypeOfCopy').'</h3>';
// Center
$html .= '<td width="30%" align="center">';
$html .= '<div style="width:150px;"><h3>'.get_lang('TypeOfCopy').'</h3>';
$html .= '<input type="radio" class="checkbox" id="copy_option_1" name="copy_option" value="full_copy" checked="checked"/>';
$html .= '<label for="copy_option_1">'.get_lang('FullCopy').'</label><br/>';
$html .= '<input type="radio" class="checkbox" id="copy_option_2" name="copy_option" value="select_items" disabled="disabled"/>';
$html .= '<label for="copy_option_2"><span id="title_option2" style="color:#aaa">'.get_lang('LetMeSelectItems').'</span></label><br/><br/>';
$html .= '<button class="save" type="submit" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES))."'".')) return false;">'.get_lang('CopyCourse').'</button></div>';
//Right
$html .= '</td><td width="30%" align="center">';
$html .= '<div id="ajax_list_courses_destination">';
$html .= '<select id="destination" name="SessionCoursesListDestination[]" multiple="multiple" size="20" style="width:320px;" ></select></div></td>';
@ -400,7 +400,6 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (is
Display::display_error_message(get_lang('You must select a course from original session and select a destination session'));
display_form();
}
} else {
display_form();
}

Write Preview
Loading…
Cancel
Save