Merge branch '1.10.x' of github.com:chamilo/chamilo-lms into 1.10.x

1.10.x
Julio Montoya 9 years ago
commit 64b822c01a
  1. 38
      main/admin/career_dashboard.php

@ -70,7 +70,7 @@ $i = 0;
$grid_js = ''; $grid_js = '';
$career_array = array(); $career_array = array();
if (!empty($careers)) { if (!empty($careers)) {
foreach($careers as $career_item) { foreach ($careers as $career_item) {
$promotion = new Promotion(); $promotion = new Promotion();
// Getting all promotions // Getting all promotions
$promotions = $promotion->get_all_promotions_by_career_id( $promotions = $promotion->get_all_promotions_by_career_id(
@ -80,7 +80,7 @@ if (!empty($careers)) {
$career_content = ''; $career_content = '';
$promotion_array = array(); $promotion_array = array();
if (!empty($promotions)) { if (!empty($promotions)) {
foreach($promotions as $promotion_item) { foreach ($promotions as $promotion_item) {
if (!$promotion_item['status']) { if (!$promotion_item['status']) {
continue; //avoid status = 0 continue; //avoid status = 0
} }
@ -91,7 +91,7 @@ if (!empty($careers)) {
); );
$session_list = array(); $session_list = array();
foreach($sessions as $session_item) { foreach ($sessions as $session_item) {
$course_list = SessionManager::get_course_list_by_session_id( $course_list = SessionManager::get_course_list_by_session_id(
$session_item['id'] $session_item['id']
); );
@ -115,45 +115,49 @@ if (!empty($careers)) {
echo '<table class="data_table">'; echo '<table class="data_table">';
foreach($career_array as $career_id => $data) { if (!empty($career_arrayer)) {
foreach ($career_array as $career_id => $data) {
$career = $data['name']; $career = $data['name'];
$promotions = $data['promotions']; $promotions = $data['promotions'];
$career = Display::url($career,'careers.php?action=edit&id='.$career_id); $career = Display::url($career, 'careers.php?action=edit&id=' . $career_id);
$career = Display::tag('h4',$career); $career = Display::tag('h4', $career);
echo '<tr><td style="background-color:#ECF0F1" colspan="3">'.$career.'</td></tr>'; echo '<tr><td style="background-color:#ECF0F1" colspan="3">' . $career . '</td></tr>';
foreach($promotions as $promotion_id => $promotion) { if (!empty($promotions)) {
foreach ($promotions as $promotion_id => $promotion) {
$promotion_name = $promotion['name']; $promotion_name = $promotion['name'];
$promotion_url = Display::url($promotion_name,'promotions.php?action=edit&id='.$promotion_id); $promotion_url = Display::url($promotion_name, 'promotions.php?action=edit&id=' . $promotion_id);
$sessions = $promotion['sessions']; $sessions = $promotion['sessions'];
echo '<tr>'; echo '<tr>';
$count = count($sessions); $count = count($sessions);
$rowspan = ''; $rowspan = '';
if (!empty($count)) { if (!empty($count)) {
$count++; $count++;
$rowspan = 'rowspan="'.$count.'"'; $rowspan = 'rowspan="' . $count . '"';
} }
echo '<td '.$rowspan.'>'; echo '<td ' . $rowspan . '>';
echo Display::tag('h5',$promotion_url); echo Display::tag('h5', $promotion_url);
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
if (!empty($sessions)) if (!empty($sessions)) {
foreach ($sessions as $session) { foreach ($sessions as $session) {
$course_list = $session['courses']; $course_list = $session['courses'];
$url = Display::url($session['data']['name'], '../session/resume_session.php?id_session='.$session['data']['id']); $url = Display::url($session['data']['name'],
'../session/resume_session.php?id_session=' . $session['data']['id']);
echo '<tr>'; echo '<tr>';
//Session name //Session name
echo Display::tag('td', $url); echo Display::tag('td', $url);
echo '<td>'; echo '<td>';
//Courses //Courses
echo '<table>'; echo '<table>';
if (!empty($course_list)) {
foreach ($course_list as $course) { foreach ($course_list as $course) {
echo '<tr>'; echo '<tr>';
$url = Display::url( $url = Display::url(
$course['title'], $course['title'],
api_get_path(WEB_COURSE_PATH).$course['directory'].'/index.php?id_session='.$session['data']['id'] api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . $session['data']['id']
); );
echo Display::tag('td', $url); echo Display::tag('td', $url);
echo '</tr>'; echo '</tr>';
@ -163,6 +167,10 @@ foreach($career_array as $career_id => $data) {
echo '</tr>'; echo '</tr>';
} }
} }
}
}
}
}
} }
echo '</table>'; echo '</table>';
Display::display_footer(); Display::display_footer();

Loading…
Cancel
Save