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

Fixing table headers

Browse Source
skala
Julio Montoya 14 years ago
parent 5c107ebfb1
commit 361916be08
3 changed files with 57 additions and 37 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. 70
      main/inc/ajax/course_home.ajax.php
  2. 12
      main/inc/ajax/model.ajax.php
  3. 10
      main/session/index.php

70
main/inc/ajax/course_home.ajax.php
Unescape View File

@ -140,17 +140,25 @@ switch ($action) {
if (strtotime($last_date) < strtotime($lp_date)) {
$icons = ' '.Display::return_icon($image, get_lang('_title_notification').': '.$label.' - '.$lp_date);
}
$temp[$count]['cell']=array(substr($lp_item['publicated_on'], 0,10), $item['title'], Display::url($lp_item['lp_name'].$icons,$lp_url, array('target'=>'_blank')));
if (!empty($lp_item['publicated_on'])) {
$date = substr($lp_item['publicated_on'], 0, 10);
} else {
$date = '-';
}
$temp[$count]['cell']=array($date, $item['title'], Display::url($lp_item['lp_name'].$icons,$lp_url, array('target'=>'_blank')));
$count++;
}
}
$i =0;
$response = new stdClass();
foreach($temp as $key=>$row) {
$row = $row['cell'];
if ($key >= $start && $key < ($start + $limit)) {
$responce->rows[$i]['id']= $key;
$responce->rows[$i]['cell']=array($row[0], $row[1], $row[2]);
$response->rows[$i]['id']= $key;
$response->rows[$i]['cell']=array($row[0], $row[1], $row[2]);
$i++;
}
}
@ -160,14 +168,14 @@ switch ($action) {
} else {
$total_pages = 0;
}
$responce->total = $total_pages;
$response->total = $total_pages;
if ($page > $total_pages) {
$responce->page= $total_pages;
$response->page= $total_pages;
} else {
$responce->page = $page;
$response->page = $page;
}
$responce->records = $count;
echo json_encode($responce);
$response->records = $count;
echo json_encode($response);
break;
case 'session_courses_lp_by_week':
@ -237,17 +245,22 @@ switch ($action) {
$icons = ' '.Display::return_icon($image, get_lang('_title_notification').': '.$label.' - '.$lp_date);
}
$temp[$count]['cell']=array(get_week_from_day($lp_item['publicated_on']), substr($lp_item['publicated_on'], 0,10), $item['title'], Display::url($lp_item['lp_name'].$icons, $lp_url, array('target'=>'_blank')));
if (!empty($lp_item['publicated_on'])) {
$date = substr($lp_item['publicated_on'], 0, 10);
} else {
$date = '-';
}
$temp[$count]['cell']=array(get_week_from_day($lp_item['publicated_on']), $date, $item['title'], Display::url($lp_item['lp_name'].$icons, $lp_url, array('target'=>'_blank')));
$count++;
}
}
$response = new stdClass();
$i =0;
foreach($temp as $key=>$row) {
$row = $row['cell'];
if ($key >= $start && $key < ($start + $limit)) {
$responce->rows[$i]['id']= $key;
$responce->rows[$i]['cell']=array($row[0], $row[1], $row[2],$row[3]);
$response->rows[$i]['id']= $key;
$response->rows[$i]['cell']=array($row[0], $row[1], $row[2],$row[3]);
$i++;
}
}
@ -257,14 +270,14 @@ switch ($action) {
} else {
$total_pages = 0;
}
$responce->total = $total_pages;
$response->total = $total_pages;
if ($page > $total_pages) {
$responce->page= $total_pages;
$response->page= $total_pages;
} else {
$responce->page = $page;
$response->page = $page;
}
$responce->records = $count;
echo json_encode($responce);
$response->records = $count;
echo json_encode($response);
break;
@ -331,17 +344,22 @@ switch ($action) {
if (strtotime($last_date) < strtotime($lp_date)) {
$icons = ' '.Display::return_icon($image, get_lang('_title_notification').': '.$label.' - '.$lp_date);
}
$temp[$count]['cell']=array(substr($lp_item['publicated_on'], 0,10), $item['title'], Display::url($lp_item['lp_name'].$icons, $lp_url, array('target'=>'_blank')));
if (!empty($lp_item['publicated_on'])) {
$date = substr($lp_item['publicated_on'], 0, 10);
} else {
$date = '-';
}
$temp[$count]['cell']=array($date, $item['title'], Display::url($lp_item['lp_name'].$icons, $lp_url, array('target'=>'_blank')));
$count++;
}
}
$response = new stdClass();
$i =0;
foreach($temp as $key=>$row) {
$row = $row['cell'];
if ($key >= $start && $key < ($start + $limit)) {
$responce->rows[$i]['id']= $key;
$responce->rows[$i]['cell']=array($row[0], $row[1], $row[2],$row[3]);
$response->rows[$i]['id']= $key;
$response->rows[$i]['cell']=array($row[0], $row[1], $row[2],$row[3]);
$i++;
}
}
@ -351,15 +369,15 @@ switch ($action) {
} else {
$total_pages = 0;
}
$responce->total = $total_pages;
$response->total = $total_pages;
if ($page > $total_pages) {
$responce->page= $total_pages;
$response->page= $total_pages;
} else {
$responce->page = $page;
$response->page = $page;
}
$responce->records = $count;
$response->records = $count;
echo json_encode($responce);
echo json_encode($response);
break;
default:
echo '';

12
main/inc/ajax/model.ajax.php
Unescape View File

@ -129,20 +129,20 @@ switch ($action) {
//5. Creating an obj to return a json
if (in_array($action, array('get_careers','get_promotions','get_usergroups'))) {
$responce = new stdClass();
$responce->page = $page;
$responce->total = $total_pages;
$responce->records = $count;
$response = new stdClass();
$response->page = $page;
$response->total = $total_pages;
$response->records = $count;
$i=0;
if (!empty($result)) {
foreach($result as $row) {
//print_r($row);
$responce->rows[$i]['id']=$row['id'];
$response->rows[$i]['id']=$row['id'];
$array = array();
foreach($columns as $col) {
$array[] = $row[$col];
}
$responce->rows[$i]['cell']=$array;
$response->rows[$i]['cell']=$array;
$i++;
}
}

10
main/session/index.php
Unescape View File

@ -185,14 +185,16 @@ foreach($final_array as $session_data) {
$html .=$table->toHtml();
}
}
echo Display::tag('h1', $session_info['name']);
//All Learnpaths grid settings (First tab, first subtab)
$url = api_get_path(WEB_AJAX_PATH).'course_home.ajax.php?a=session_courses_lp_default&session_id='.$session_id;
$columns = array(get_lang('Date'),get_lang('Course'), get_lang('LearningPath'));
$columns = array(get_lang('PublicationDate'),get_lang('Course'), get_lang('LearningPath'));
$column_model = array(array('name'=>'date', 'index'=>'date', 'width'=>'90', 'align'=>'left', 'sortable'=>'false'),
$column_model = array(array('name'=>'date', 'index'=>'date', 'width'=>'100', 'align'=>'left', 'sortable'=>'false'),
array('name'=>'course', 'index'=>'course', 'width'=>'500', 'align'=>'left', 'sortable'=>'false'),
array('name'=>'lp', 'index'=>'lp', 'width'=>'200', 'align'=>'center','sortable'=>'false'));
@ -210,10 +212,10 @@ $extra_params_course['autowidth'] = 'true'; //use the width of the parent
//Per Week grid
$url_week = api_get_path(WEB_AJAX_PATH).'course_home.ajax.php?a=session_courses_lp_by_week&session_id='.$session_id;
$column_week = array(get_lang('PeriodWeek'), get_lang('Date'), get_lang('Course'), get_lang('LearningPath'));
$column_week = array(get_lang('PeriodWeek'), get_lang('PublicationDate'), get_lang('Course'), get_lang('LearningPath'));
$column_week_model = array(
array('name'=>'week', 'index'=>'week', 'width'=>'80', 'align'=>'left', 'sortable'=>'false'),
array('name'=>'date', 'index'=>'date', 'width'=>'90', 'align'=>'right','sortable'=>'false'),
array('name'=>'date', 'index'=>'date', 'width'=>'100', 'align'=>'right','sortable'=>'false'),
array('name'=>'course', 'index'=>'course', 'width'=>'500','align'=>'left', 'sortable'=>'false'),
array('name'=>'lp', 'index'=>'lp', 'width'=>'200','align'=>'center','sortable'=>'false'));

Write Preview
Loading…
Cancel
Save