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 fixes in the course home now in the vertical view + fixes in queries

Browse Source
skala
Julio Montoya 14 years ago
parent 773ff63a91
commit 4e407b8346
2 changed files with 63 additions and 115 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. 13
      main/course_home/activity.php
  2. 165
      main/course_home/vertical_activity.php

13
main/course_home/activity.php
Unescape View File

@ -80,7 +80,6 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
if (api_get_setting('show_session_data') == 'true' && $id_session > 0) {
$content .= '<div class="courseadminview">
<span class="viewcaption">'.get_lang('SessionData').'</span>
<table class="course_activity_home">'.CourseHome::show_session_data($id_session).'
@ -88,8 +87,7 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
</div>';
}
$content .= '<div class="courseadminview">
<span class="viewcaption">'.get_lang('Authoring').'</span>';
$content .= '<div class="courseadminview"><span class="viewcaption">'.get_lang('Authoring').'</span>';
$my_list = CourseHome::get_tools_category(TOOL_AUTHORING);
$content .= CourseHome::show_tools_category($my_list).'</div>';
@ -99,10 +97,9 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
$list2 = CourseHome::get_tools_category(TOOL_COURSE_PLUGIN);
$my_list = array_merge($my_list,$list2);
$content .= CourseHome::show_tools_category($my_list);
$content .= '</div>
<div class="courseadminview">
<span class="viewcaption">'.get_lang('Administration').'</span>';
<div class="courseadminview"><span class="viewcaption">'.get_lang('Administration').'</span>';
$theme = api_get_setting('homepage_view');
$rows = false;
if ($theme == 'activity_big') {
@ -124,8 +121,8 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
$content .= '<div class="Authoringview">';
$my_list = CourseHome::get_tools_category(TOOL_STUDENT_VIEW);
$content .= CourseHome::show_tools_category($my_list);
$content .= ' </div>';
// TOOLS AUTHORING
$content .= '</div>';
// TOOLS AUTHORING
} else {
$my_list = CourseHome::get_tools_category(TOOL_STUDENT_VIEW);

165
main/course_home/vertical_activity.php
Unescape View File

@ -13,38 +13,21 @@
* @package chamilo.course_home
*/
require_once api_get_path(LIBRARY_PATH).'course_home.lib.php';
// MAIN CODE
$course_id = api_get_course_int_id();
if (api_is_allowed_to_edit(null, true)) {
// HIDE
if (!empty($_GET['hide'])) { // visibility 1 -> 0
/* -- session condition for visibility
if (!empty($session_id)) {
$sql = "select session_id FROM $tool_table WHERE id='".intval($_GET["id"])."' AND session_id = '".intval($session_id)."'";
$rs = Database::query($sql);
if (Database::num_rows($rs) > 0) {
$sql="UPDATE $tool_table SET visibility=0 WHERE id='".intval($_GET["id"])."' AND session_id = '".intval($session_id)."'";
} else {
$sql_select = "select * FROM $tool_table WHERE id='".$_GET["id"]."'";
$res_select = Database::query($sql_select);
$row_select = Database::fetch_array($res_select);
$sql = "INSERT INTO $tool_table(name,link,image,visibility,admin,address,added_tool,target,category,session_id)
VALUES('{$row_select['name']}','{$row_select['link']}','{$row_select['image']}','0','{$row_select['admin']}','{$row_select['address']}','{$row_select['added_tool']}','{$row_select['target']}','{$row_select['category']}','$session_id')";
}
} else {
$sql="UPDATE $tool_table SET visibility=0 WHERE id='".intval($_GET["id"])."'";
}*/
$sql = "UPDATE $tool_table SET visibility=0 WHERE id='".intval($_GET["id"])."'";
$sql = "UPDATE $tool_table SET visibility=0 WHERE c_id = $course_id AND id='".intval($_GET["id"])."'";
Database::query($sql);
Display::display_confirmation_message(get_lang('ToolIsNowHidden'));
$show_message = Display::return_message(get_lang('ToolIsNowHidden'), 'confirmation');
} elseif (!empty($_GET['restore'])) {
// visibility 0,2 -> 1
// REACTIVATE
$sql = "UPDATE $tool_table SET visibility=1 WHERE id='".intval($_GET["id"])."'";
$sql = "UPDATE $tool_table SET visibility=1 WHERE c_id = $course_id AND id='".intval($_GET["id"])."'";
Database::query($sql);
Display::display_confirmation_message(get_lang('ToolIsNowVisible'));
$show_message = Display::return_message(get_lang('ToolIsNowVisible'), 'confirmation');
}
}
@ -53,20 +36,17 @@ if (api_is_platform_admin()) {
// Show message to confirm that a tool it to be hidden from available tools
// visibility 0,1->2
if (!empty($_GET['askDelete'])) {
?>
<div id="toolhide"><?php echo get_lang('DelLk'); ?><br />&nbsp;&nbsp;&nbsp;
<a href="<?php echo api_get_self(); ?>"><?php echo get_lang('No'); ?></a>&nbsp;|&nbsp;
<a href="<?php echo api_get_self(); ?>?delete=yes&id=<?php echo Security::remove_XSS($_GET['id']); ?>"><?php echo get_lang('Yes'); ?></a>
</div>
<?php
}
/*
* Process hiding a tools from available tools.
*/
elseif (isset($_GET['delete']) && $_GET['delete']) {
$content .='<div id="toolhide">'.get_lang('DelLk').'<br />&nbsp;&nbsp;&nbsp;
<a href="'.api_get_self().'">'.get_lang('No').'</a>&nbsp;|&nbsp;
<a href="'.api_get_self().'?delete=yes&id='.intval($_GET['id']).'">'.get_lang('Yes').'</a>
</div>';
} elseif (isset($_GET['delete']) && $_GET['delete']) {
/*
* Process hiding a tools from available tools.
*/
//where $id is set?
$id = intval($id);
Database::query("DELETE FROM $tool_table WHERE id='$id' AND added_tool=1");
Database::query("DELETE FROM $tool_table WHERE c_id = $course_id AND id='$id' AND added_tool=1");
}
}
@ -86,86 +66,58 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
} else {
$path_work = '';
}
$content .= '<div class="courseadminview" style="border:0px; margin-top: 0px;padding:5px;">
<div class="normal-message" id="id_normal_message" style="display:none">';
$content .= '<img src="'.$server_protocol.$current_host.'/'.$path_work.'main/inc/lib/javascript/indicator.gif"/>&nbsp;&nbsp;';
$content .= get_lang('PleaseStandBy');
?>
<div class="courseadminview" style="border:0px; margin-top: 0px;padding:5px 0px;">
<div class="normal-message" id="id_normal_message" style="display:none">
<?php
echo '<img src="'.$server_protocol.$current_host.'/'.$path_work.'main/inc/lib/javascript/indicator.gif"/>&nbsp;&nbsp;';
echo get_lang('PleaseStandBy');
?>
</div>
$content .= '</div>
<div class="confirmation-message" id="id_confirmation_message" style="display:none"></div>
</div>
</div>';
<div id="activity-3col">
$content .= '<div id="activity-3col">';
<?php
if (api_get_setting('show_session_data') == 'true' && $id_session > 0) {
?>
<div class="courseadminview-activity-3col">
<span class="viewcaption"><?php echo get_lang('SessionData'); ?></span>
<table width="100%">
<?php
echo show_session_data($id_session);
?>
</table>
</div>
<?php
}
?>
<div class="courseadminview-activity-3col">
<span class="viewcaption"><?php echo get_lang('Authoring'); ?></span>
<?php
$my_list = CourseHome::get_tools_category(TOOL_AUTHORING);
CourseHome::show_tools_category($my_list);
?>
</div>
<div class="courseadminview-activity-3col">
<span class="viewcaption"><?php echo get_lang('Interaction'); ?></span>
<?php
$my_list = CourseHome::get_tools_category(TOOL_INTERACTION);
CourseHome::show_tools_category($my_list);
?>
</div>
<div class="courseadminview-activity-3col">
<span class="viewcaption"><?php echo get_lang('Administration'); ?></span>
<?php
$my_list = CourseHome::get_tools_category(TOOL_ADMIN_PLATFORM);
CourseHome::show_tools_category($my_list);
?>
</div>
<?php
} elseif (api_is_coach()) {
if (api_get_setting('show_session_data') == 'true' && $id_session > 0) {
$content .= '<div class="courseadminview-activity-3col"><span class="viewcaption">'.get_lang('SessionData').'</span>
<table width="100%">'.CourseHome::show_session_data($id_session).'</table>
</div>';
}
$content .= '<div class="courseadminview-activity-3col"><span class="viewcaption">'.get_lang('Authoring').'</span>';
$my_list = CourseHome::get_tools_category(TOOL_AUTHORING);
$content .= CourseHome::show_tools_category($my_list);
$content .= '</div>';
$content .= '<div class="courseadminview-activity-3col"><span class="viewcaption">'.get_lang('Interaction').'</span>';
$my_list = CourseHome::get_tools_category(TOOL_INTERACTION);
$content .= CourseHome::show_tools_category($my_list);
$content .= '</div>';
$content .= '<div class="courseadminview-activity-3col"><span class="viewcaption">'.get_lang('Administration').'</span>';
$my_list = CourseHome::get_tools_category(TOOL_ADMIN_PLATFORM);
$content .= CourseHome::show_tools_category($my_list);
$content .= '</div>';
} elseif (api_is_coach()) {
if (api_get_setting('show_session_data') == 'true' && $id_session > 0) {
?>
<div class="courseadminview-activity-3col">
<span class="viewcaption"><?php echo get_lang('SessionData'); ?></span>
<table width="100%">
<?php
echo CourseHome::show_session_data($id_session);
?>
</table>
</div>
<?php
$content .= '<div class="courseadminview-activity-3col"><span class="viewcaption">'.get_lang('SessionData').'</span>
<table width="100%">';
$content .= CourseHome::show_session_data($id_session);
$content .= '</table></div>';
}
?>
<div class="Authoringview">
<?php
$my_list = CourseHome::get_tools_category(TOOL_STUDENT_VIEW);
CourseHome::show_tools_category($my_list);
?>
</div>
<?php
// TOOLS AUTHORING
$content .= '<div class="Authoringview">';
$my_list = CourseHome::get_tools_category(TOOL_STUDENT_VIEW);
$content .= CourseHome::show_tools_category($my_list);
$content .= '</div>';
// TOOLS AUTHORING
} else {
$my_list = CourseHome::get_tools_category(TOOL_STUDENT_VIEW);
if (count($my_list) > 0) {
echo '<div class="course-student-view-activity-3col">';
$content .= '<div class="course-student-view-activity-3col">';
//ordering by get_lang name
$order_tool_list = array();
foreach($my_list as $key=>$new_tool) {
@ -188,10 +140,9 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
}
$i++;
}
CourseHome::show_tools_category($my_list1);
CourseHome::show_tools_category($my_list2);
echo '</div>';
$content .=CourseHome::show_tools_category($my_list1);
$content .=CourseHome::show_tools_category($my_list2);
$content .= '</div>';
}
}
?>
</div>
$content .= '</div>';
Write Preview
Loading…
Cancel
Save