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

Minor - update from ofaj

Browse Source
pull/3085/head
Julio Montoya 6 years ago
parent 09c4244d65
commit c315b77f52
15 changed files with 294 additions and 67 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. 11
      main/admin/index.php
  2. 8
      main/exercise/exercise_report.php
  3. 135
      main/inc/ajax/statistics.ajax.php
  4. 4
      main/inc/lib/SortableTableFromArray.php
  5. 8
      main/inc/lib/api.lib.php
  6. 75
      main/inc/lib/sessionmanager.lib.php
  7. 33
      main/inc/lib/sortable_table.class.php
  8. 4
      main/mySpace/access_details.php
  9. 34
      main/mySpace/access_details_session.php
  10. 5
      main/session/resume_session.php
  11. 9
      main/session/session_add.php
  12. 10
      main/session/session_edit.php
  13. 20
      main/session/session_list.php
  14. 3
      main/social/home.php
  15. 2
      main/tracking/courseLog.php

11
main/admin/index.php
Unescape View File

@ -1,9 +1,9 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Index page of the admin tools.
*
* @package chamilo.admin
*/
// Resetting the course id.
$cidReset = true;
@ -600,6 +600,13 @@ if (api_is_platform_admin()) {
];
}
if (api_get_configuration_value('allow_session_status')) {
$items[] = [
'url' => api_get_path(WEB_CODE_PATH).'session/cron_status.php',
'label' => get_lang('UpdateSessionStatus'),
];
}
$blocks['settings']['items'] = $items;
$blocks['settings']['extra'] = null;
$blocks['settings']['search_form'] = null;

8
main/exercise/exercise_report.php
Unescape View File

@ -36,7 +36,6 @@ if ($limitTeacherAccess && !api_is_platform_admin()) {
api_not_allowed(true);
}
// including additional libraries
require_once 'hotpotatoes.lib.php';
$_course = api_get_course_info();
@ -305,7 +304,7 @@ if (isset($_REQUEST['comments']) &&
WHERE c_id = ".$course_id." AND id = ".$lp_item_view_id;
Database::query($sql);
if (empty($origin)) {
/*if (empty($origin)) {
header('Location: '.api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?exerciseId='.$exercise_id.'&'.api_get_cidreq());
exit;
}
@ -321,7 +320,9 @@ if (isset($_REQUEST['comments']) &&
).'&session_id='.$session_id
);
exit;
}
}*/
header('Location: '.api_get_path(WEB_CODE_PATH).'exercise/exercise_show.php?id='.$id.'&student='.$student_id.'&'.api_get_cidreq());
exit;
}
}
@ -724,7 +725,6 @@ $gridJs = Display::grid_js(
for (var i in data) {
colNames[ii++] = i;
}
// capture col names
var html = "";
for (i = 0; i < mya.length; i++) {
data = $("#results").getRowData(mya[i]); // get each row

135
main/inc/ajax/statistics.ajax.php
Unescape View File

@ -284,22 +284,42 @@ switch ($action) {
break;
case 'status':
$statusList = api_get_status_langvars();
unset($statusList[ANONYMOUS]);
$extraFieldValueUser = new ExtraField('user');
$extraField = $extraFieldValueUser->get_handler_field_info_by_field_variable('statusocial');
foreach ($statusList as $status => $name) {
$conditions = ['status' => $status];
$count = UserManager::getUserListExtraConditions(
$conditions,
$users = UserManager::getUserListExtraConditions(
[],
[],
false,
false,
null,
$extraConditions,
true
false
);
$all[$name] = $count;
$userIdList = array_column($users, 'user_id');
$userIdListToString = implode("', '", $userIdList);
$all = [];
$total = count($users);
$usersFound = 0;
foreach ($extraField['options'] as $item) {
$value = Database::escape_string($item['option_value']);
$count = 0;
$sql = "SELECT count(id) count
FROM $extraFieldValueUser->table_field_values
WHERE
value = '$value' AND
item_id IN ('$userIdListToString') AND
field_id = ".$extraField['id'];
$query = Database::query($sql);
$result = Database::fetch_array($query);
$count = $result['count'];
$usersFound += $count;
$all[$item['display_text']] = $count;
}
$all[get_lang('N/A')] = $total - $usersFound;
break;
case 'language':
$languages = api_get_languages();
@ -313,6 +333,7 @@ switch ($action) {
if (!isset($all[$key])) {
$all[$key] = 0;
}
$key = get_lang($key);
$all[$key] += UserManager::getUserListExtraConditions(
$conditions,
[],
@ -357,13 +378,74 @@ switch ($action) {
$query = Database::query($sql);
$result = Database::fetch_array($query);
$count = $result['count'];
//$item['display_text'] = str_replace('2', '', $item['display_text']);
$usersFound += $count;
$item['display_text'] = get_lang(str_replace('2', '', $item['display_text']));
$all[$item['display_text']] = $count;
}
$all[get_lang('N/A')] = $total - $usersFound;
break;
case 'age':
$extraFieldValueUser = new ExtraField('user');
$extraField = $extraFieldValueUser->get_handler_field_info_by_field_variable('terms_datedenaissance');
$users = UserManager::getUserListExtraConditions(
[],
[],
false,
false,
null,
$extraConditions,
false
);
$userIdList = array_column($users, 'user_id');
$userIdListToString = implode("', '", $userIdList);
$all = [];
$total = count($users);
$sql = "SELECT value
FROM $extraFieldValueUser->table_field_values
WHERE
item_id IN ('$userIdListToString') AND
field_id = ".$extraField['id'];
$query = Database::query($sql);
$usersFound = 0;
$now = new DateTime();
$all = [
//get_lang('N/A') => 0,
'16-17' => 0,
'18-25' => 0,
'26-30' => 0,
];
while ($row = Database::fetch_array($query)) {
$usersFound++;
if (!empty($row['value'])) {
$date1 = new DateTime($row['value']);
$interval = $now->diff($date1);
$years = (int) $interval->y;
if ($years >= 16 && $years <= 17) {
$all['16-17'] += 1;
}
if ($years >= 18 && $years <= 25) {
$all['18-25'] += 1;
}
if ($years >= 26 && $years <= 30) {
$all['26-30'] += 1;
}
/*if ($years >= 31) {
$all[get_lang('N/A')] += 1;
}*/
} else {
//$all[get_lang('N/A')] += 1;
}
}
break;
case 'career':
$extraFieldValueUser = new ExtraField('user');
$extraField = $extraFieldValueUser->get_handler_field_info_by_field_variable('filiere_user');
@ -576,8 +658,41 @@ switch ($action) {
if (!isset($all[$language])) {
$all[$language] = 0;
}
$all[$language]++;
$all[$language] += 1;
}
break;
case 'course_in_session':
$sql = "SELECT id FROM $table
WHERE
(display_start_date BETWEEN '$startDate' AND '$endDate' OR
display_end_date BETWEEN '$startDate' AND '$endDate')
$statusCondition
";
$result = Database::query($sql);
$all = [];
$courseSessions = [];
$total = 0;
while ($row = Database::fetch_array($result)) {
$courseList = SessionManager::getCoursesInSession($row['id']);
foreach ($courseList as $courseId) {
if (!isset($courseSessions[$courseId])) {
$courseSessions[$courseId] = 0;
}
$courseSessions[$courseId]++;
$total++;
}
}
if (!empty($courseSessions)) {
arsort($courseSessions);
foreach ($courseSessions as $courseId => $count) {
$courseInfo = api_get_course_info_by_id($courseId);
$all[$courseInfo['name']] = $count;
}
}
break;
}

4
main/inc/lib/SortableTableFromArray.php
Unescape View File

@ -3,8 +3,6 @@
/**
* Sortable table which can be used for data available in an array.
*
* @package chamilo.library
*/
class SortableTableFromArray extends SortableTable
{
@ -12,6 +10,7 @@ class SortableTableFromArray extends SortableTable
* The array containing all data for this table.
*/
public $table_data;
public $handlePagination;
/**
* Constructor.
@ -41,6 +40,7 @@ class SortableTableFromArray extends SortableTable
$tableId
);
$this->table_data = $table_data;
$this->handlePagination = false;
}
/**

8
main/inc/lib/api.lib.php
Unescape View File

@ -1594,24 +1594,29 @@ function _api_format_user($user, $add_password = false, $loadAvatars = true)
$urlImg = api_get_path(WEB_IMG_PATH);
$iconStatus = '';
$iconStatusMedium = '';
$label = '';
switch ($result['status']) {
case STUDENT:
if ($result['has_certificates']) {
$iconStatus = $urlImg.'icons/svg/identifier_graduated.svg';
$label = get_lang('Graduated');
} else {
$iconStatus = $urlImg.'icons/svg/identifier_student.svg';
$label = get_lang('Student');
}
break;
case COURSEMANAGER:
if ($result['is_admin']) {
$iconStatus = $urlImg.'icons/svg/identifier_admin.svg';
$label = get_lang('Admin');
} else {
$iconStatus = $urlImg.'icons/svg/identifier_teacher.svg';
$label = get_lang('Teacher');
}
break;
case STUDENT_BOSS:
$iconStatus = $urlImg.'icons/svg/identifier_teacher.svg';
$label = get_lang('StudentBoss');
break;
}
@ -1621,6 +1626,7 @@ function _api_format_user($user, $add_password = false, $loadAvatars = true)
}
$result['icon_status'] = $iconStatus;
$result['icon_status_label'] = $label;
$result['icon_status_medium'] = $iconStatusMedium;
}

75
main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -21,11 +21,14 @@ use Monolog\Logger;
* All main sessions functions should be placed here.
* This class provides methods for sessions management.
* Include/require it in your code to use its features.
*
* @package chamilo.library
*/
class SessionManager
{
const STATUS_PLANNED = 1;
const STATUS_PROGRESS = 2;
const STATUS_FINISHED = 3;
const STATUS_CANCELLED = 4;
public static $_debug = false;
/**
@ -92,6 +95,15 @@ class SessionManager
'send_subscription_notification' => $session->getSendSubscriptionNotification(),
];
if (api_get_configuration_value('allow_session_status')) {
$table = Database::get_main_table(TABLE_MAIN_SESSION);
$sql = "SELECT status FROM $table WHERE id = $id";
$resultQuery = Database::query($sql);
$row = Database::fetch_array($resultQuery);
$result['status'] = $row['status'];
$result['status_label'] = self::getStatusLabel($row['status']);
}
// Converted to local values
$variables = [
'display_start_date',
@ -136,7 +148,8 @@ class SessionManager
* @param int $sessionAdminId Optional. If this sessions was created by a session admin, assign it to him
* @param bool $sendSubscriptionNotification Optional.
* Whether send a mail notification to users being subscribed
* @param int|null $accessUrlId Optional.
* @param int $accessUrlId Optional.
* @param int $status
*
* @return mixed Session ID on success, error message otherwise
*
@ -160,7 +173,8 @@ class SessionManager
$extraFields = [],
$sessionAdminId = 0,
$sendSubscriptionNotification = false,
$accessUrlId = null
$accessUrlId = 0,
$status = 0
) {
global $_configuration;
@ -270,6 +284,10 @@ class SessionManager
$values['session_category_id'] = $sessionCategoryId;
}
if (api_get_configuration_value('allow_session_status')) {
$values['status'] = $status;
}
$session_id = Database::insert($tbl_session, $values);
$duration = (int) $duration;
@ -1526,8 +1544,8 @@ class SessionManager
* @param int $duration
* @param array $extraFields
* @param int $sessionAdminId
* @param bool $sendSubscriptionNotification Optional.
* Whether send a mail notification to users being subscribed
* @param bool $sendSubscriptionNotification Optional. Whether send a mail notification to users being subscribed
* @param int $status
*
* @return mixed
*/
@ -1548,8 +1566,10 @@ class SessionManager
$duration = null,
$extraFields = [],
$sessionAdminId = 0,
$sendSubscriptionNotification = false
$sendSubscriptionNotification = false,
$status = 0
) {
$status = (int) $status;
$coachId = (int) $coachId;
$sessionCategoryId = (int) $sessionCategoryId;
$visibility = (int) $visibility;
@ -1651,10 +1671,13 @@ class SessionManager
$values['coach_access_end_date'] = api_get_utc_datetime($coachEndDate);
}
$values['session_category_id'] = null;
if (!empty($sessionCategoryId)) {
$values['session_category_id'] = $sessionCategoryId;
} else {
$values['session_category_id'] = null;
}
if (api_get_configuration_value('allow_session_status')) {
$values['status'] = $status;
}
Database::update(
@ -7836,6 +7859,18 @@ class SessionManager
]
);
if (api_get_configuration_value('allow_session_status')) {
$statusList = self::getStatusList();
$form->addSelect(
'status',
get_lang('SessionStatus'),
$statusList,
[
'id' => 'status',
]
);
}
$form->addHtmlEditor(
'description',
get_lang('Description'),
@ -9252,4 +9287,26 @@ class SessionManager
return -1;
}
}
public static function getStatusList()
{
return [
self::STATUS_PLANNED => get_lang('Planned'),
self::STATUS_PROGRESS => get_lang('InProgress'),
self::STATUS_FINISHED => get_lang('Finished'),
self::STATUS_CANCELLED => get_lang('Cancelled'),
];
}
public static function getStatusLabel($status)
{
$list = self::getStatusList();
if (!isset($list[$status])) {
return get_lang('NoStatus');
}
return $list[$status];
}
}

33
main/inc/lib/sortable_table.class.php
Unescape View File

@ -13,8 +13,6 @@ use ChamiloSession as Session;
* - click on the table header to sort the data
* - choose how many items you see per page
* - navigate through all data-pages.
*
* @package chamilo.library
*/
class SortableTable extends HTML_Table
{
@ -95,6 +93,7 @@ class SortableTable extends HTML_Table
public $use_jqgrid = false;
public $table_id = null;
public $headers = [];
public $actionButtons = [];
/**
* The array containing all data for this table.
@ -370,12 +369,13 @@ class SortableTable extends HTML_Table
$empty_table = true;
}
$html = '';
$params = $this->get_sortable_table_param_string().'&amp;'.$this->get_additional_url_paramstring();
if (!$empty_table) {
$table_id = 'form_'.$this->table_name.'_id';
$form = $this->get_page_select_form();
$nav = $this->get_navigation_html();
// Only show pagination info when there are items to paginate
if ($this->get_total_number_of_items() > $this->default_items_per_page) {
$html = '<div class="table-well">';
$html .= '<table class="data_table_pagination">';
@ -395,8 +395,7 @@ class SortableTable extends HTML_Table
}
if (count($this->form_actions) > 0) {
$params = $this->get_sortable_table_param_string().'&amp;'.$this->get_additional_url_paramstring();
$html .= '<form id ="'.$table_id.'" class="form-search" method="post" action="'.api_get_self().'?'.$params.'" name="form_'.$this->table_name.'">';
$html .= '<form id ="'.$table_id.'" name="form_'.$this->table_name.'" class="form-search" method="post" action="'.api_get_self().'?'.$params.'" >';
}
}
@ -409,10 +408,24 @@ class SortableTable extends HTML_Table
}
}
$html .= '<input type="hidden" name="action">';
$html .= '<table style="width:100%;">';
$html .= '<div class="table-well">';
$html .= '<table class="data_table_pagination">';
$html .= '<tr>';
$html .= '<td>';
if (count($this->actionButtons) > 0) {
$html .= '<div class="btn-toolbar">';
$html .= '<div class="btn-group">';
foreach ($this->actionButtons as $action => $data) {
$label = $data['label'];
$icon = $data['icon'];
$html .= '<a class="btn btn-default" href="?'.$params.'&action_table='.$action.'" >'.$icon.'&nbsp;'.$label.'</a>';
}
$html .= '</div>'; //btn-group
$html .= '</div>'; //toolbar
}
if (count($this->form_actions) > 0) {
$html .= '<div class="btn-toolbar">';
$html .= '<div class="btn-group">';
@ -432,7 +445,7 @@ class SortableTable extends HTML_Table
$html .= '</div>'; //btn-group
$html .= '</div>'; //toolbar
} else {
$html .= $form;
//$html .= $form;
}
$html .= '</td>';
@ -448,6 +461,8 @@ class SortableTable extends HTML_Table
$html .= '</tr>';
$html .= '</table>';
$html .= '</div>'; //toolbar
if (count($this->form_actions) > 0) {
$html .= '</form>';
}
@ -666,9 +681,8 @@ class SortableTable extends HTML_Table
$pager = $this->get_pager();
$offset = $pager->getOffsetByPageId();
$from = $offset[0] - 1;
$table_data = $this->get_table_data($from);
$table_data = $this->get_table_data($from, $this->per_page, $this->column);
$this->processHeaders();
if (is_array($table_data)) {
$count = 1;
foreach ($table_data as &$row) {
@ -754,6 +768,7 @@ class SortableTable extends HTML_Table
if ($this->hideItemSelector === true) {
return '';
}
$result[] = '<form method="GET" action="'.api_get_self().'" style="display:inline;">';
$param[$this->param_prefix.'direction'] = $this->direction;
$param[$this->param_prefix.'page_nr'] = $this->page_nr;

4
main/mySpace/access_details.php
Unescape View File

@ -100,7 +100,6 @@ function loadGraph() {
if (!db.is_empty) {
// Display confirmation message to the user
$('#messages').html(db.result).stop().css('opacity', 1).fadeIn(30);
console.log(url);
var exportLink = $('<a></a>').
attr(\"href\", url+'&export=excel')
@ -138,6 +137,9 @@ $interbreadcrumb[] = ['url' => '#', 'name' => get_lang('AccessDetails')];
Display::display_header('');
$userInfo = api_get_user_info($user_id);
$result_to_print = '';
$sql_result = MySpace::get_connections_to_course($user_id, $courseInfo);
$result_to_print = convert_to_string($sql_result);
echo Display::page_header(get_lang('DetailsStudentInCourse'));
echo Display::page_subheader(

34
main/mySpace/access_details_session.php
Unescape View File

@ -130,7 +130,10 @@ if ($form->validate()) {
$to
);
$partialMinLogin = 0;
$partialMaxLogin = 0;
$partialDuration = 0;
foreach ($result as $item) {
$record = [
customDate($item['login'], true),
@ -152,14 +155,24 @@ if ($form->validate()) {
// Partials
$partialDuration += $item['duration'];
if (empty($partialMinLogin)) {
$partialMinLogin = api_strtotime($item['login'], 'UTC');
}
if ($partialMinLogin > api_strtotime($item['login'], 'UTC')) {
$partialMinLogin = api_strtotime($item['login'], 'UTC');
}
if (api_strtotime($item['logout'], 'UTC') > $partialMaxLogin) {
$partialMaxLogin = api_strtotime($item['logout'], 'UTC');
}
$report[$sessionId]['courses'][$course['real_id']][] = $record;
$report[$sessionId]['name'][$course['real_id']] = $courseInfo['title'].'&nbsp; ('.$session['session_name'].')';
}
if (!empty($result)) {
$record = [
'',
'',
customDate($partialMinLogin, true),
customDate($partialMaxLogin, true),
api_format_time($partialDuration, 'js'),
];
$report[$sessionId]['courses'][$course['real_id']][] = $record;
@ -181,6 +194,8 @@ if ($form->validate()) {
$to
);
$partialMinLogin = 0;
$partialMaxLogin = 0;
$partialDuration = 0;
foreach ($result as $item) {
@ -206,12 +221,21 @@ if ($form->validate()) {
// Partials
$partialDuration += $item['duration'];
if (empty($partialMinLogin)) {
$partialMinLogin = api_strtotime($item['login'], 'UTC');
}
if ($partialMinLogin > api_strtotime($item['login'], 'UTC')) {
$partialMinLogin = api_strtotime($item['login'], 'UTC');
}
if (api_strtotime($item['logout'], 'UTC') > $partialMaxLogin) {
$partialMaxLogin = api_strtotime($item['logout'], 'UTC');
}
}
if (!empty($result)) {
$record = [
'',
'',
customDate($partialMinLogin, true),
customDate($partialMaxLogin, true),
api_format_time($partialDuration, 'js'),
];
@ -220,7 +244,7 @@ if ($form->validate()) {
}
}
$table = new HTML_Table(['class' => 'data_table']);
$table = new HTML_Table(['class' => 'data_table_pdf']);
$headers = [
get_lang('MinStartDate'),
get_lang('MaxEndDate'),

5
main/session/resume_session.php
Unescape View File

@ -1,4 +1,5 @@
<?php
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\Course;
@ -10,9 +11,8 @@ use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;
/**
* @author Bart Mollet, Julio Montoya lot of fixes
*
* @package chamilo.admin
*/
$cidReset = true;
require_once __DIR__.'/../inc/global.inc.php';
@ -26,7 +26,6 @@ if (empty($sessionId)) {
}
SessionManager::protectSession($sessionId);
$codePath = api_get_path(WEB_CODE_PATH);
$tool_name = get_lang('SessionOverview');

9
main/session/session_add.php
Unescape View File

@ -1,9 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
/**
* @package chamilo.admin
*/
$cidReset = true;
require_once __DIR__.'/../inc/global.inc.php';
@ -386,6 +384,7 @@ if ($form->validate()) {
$showDescription = isset($params['show_description']) ? 1 : 0;
$sendSubscriptionNotification = isset($params['send_subscription_notification']);
$isThisImageCropped = isset($params['picture_crop_result']);
$status = isset($params['status']) ? $params['status'] : 0;
$extraFields = [];
foreach ($params as $key => $value) {
@ -438,7 +437,9 @@ if ($form->validate()) {
$showDescription,
$extraFields,
null,
$sendSubscriptionNotification
$sendSubscriptionNotification,
api_get_current_access_url_id(),
$status
);
if ($return == strval(intval($return))) {

10
main/session/session_edit.php
Unescape View File

@ -1,10 +1,9 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Sessions edition script.
*
* @package chamilo.admin
*/
$cidReset = true;
require_once __DIR__.'/../inc/global.inc.php';
@ -81,6 +80,8 @@ if (api_is_multiple_url_enabled()) {
$result = Database::query($sql);
$coaches = Database::store_result($result);
$thisYear = date('Y');
$coachesOption = [
'' => '----- '.get_lang('None').' -----',
];
@ -169,6 +170,8 @@ if ($form->validate()) {
$extraFields['extra_image']['crop_parameters'] = $params['picture_crop_result'];
}
$status = isset($params['status']) ? $params['status'] : 0;
$return = SessionManager::edit_session(
$id,
$name,
@ -186,7 +189,8 @@ if ($form->validate()) {
$duration,
$extraFields,
null,
$sendSubscriptionNotification
$sendSubscriptionNotification,
$status
);
if ($return) {

20
main/session/session_list.php
Unescape View File

@ -1,10 +1,9 @@
<?php
/* For licensing terms, see /license.txt */
/**
* List sessions in an efficient and usable way.
*
* @package chamilo.admin
*/
$cidReset = true;
@ -67,7 +66,6 @@ $courseSelect = $sessionFilter->addElement(
if (!empty($courseId)) {
$courseInfo = api_get_course_info_by_id($courseId);
$parents = CourseCategory::getParentsToString($courseInfo['categoryCode']);
$courseSelect->addOption($parents.$courseInfo['title'], $courseInfo['code'], ['selected' => 'selected']);
}
@ -77,11 +75,9 @@ $actions = '
$(function() {
$("#course_name").on("change", function() {
var courseId = $(this).val();
if (!courseId) {
return;
}
window.location = "'.$url.'?course_id="+courseId;
});
});
@ -130,6 +126,10 @@ $extra_params['autowidth'] = 'true';
// height auto
$extra_params['height'] = 'auto';
// Custom params
$extra_params['sortname'] = 'display_end_date';
$extra_params['sortorder'] = 'desc';
if (!isset($_GET['keyword'])) {
$extra_params['postData'] = [
'filters' => [
@ -158,8 +158,7 @@ $orderUrl = api_get_path(WEB_AJAX_PATH).'session.ajax.php?a=order';
?>
<script>
function setSearchSelect(columnName) {
$("#sessions").jqGrid('setColProp', columnName, {
});
$("#sessions").jqGrid('setColProp', columnName, {});
}
var added_cols = [];
var original_cols = [];
@ -168,7 +167,7 @@ $orderUrl = api_get_path(WEB_AJAX_PATH).'session.ajax.php?a=order';
// Cleaning
for (key in added_cols) {
grid.hideCol(key);
};
}
grid.showCol('name');
grid.showCol('display_start_date');
grid.showCol('display_end_date');
@ -294,8 +293,7 @@ $orderUrl = api_get_path(WEB_AJAX_PATH).'session.ajax.php?a=order';
// Sortable rows
grid.jqGrid('sortableRows', options);
<?php
} ?>
<?php } ?>
grid.jqGrid('navGrid','#sessions_pager',
{edit:false,add:false,del:false},
@ -317,7 +315,7 @@ $orderUrl = api_get_path(WEB_AJAX_PATH).'session.ajax.php?a=order';
searchDialogAll.addClass("table");
var searchDialog = $("#searchmodfbox_"+grid[0].id);
searchDialog.addClass("ui-jqgrid ui-widget ui-widget-content ui-corner-all");
searchDialog.css({position:"adsolute", "z-index":"100", "float":"left", "top":"55%", "left" : "25%", "padding" : "5px", "border": "1px solid #CCC"})
searchDialog.css({position:"absolute", "z-index":"100", "float":"left", "top":"55%", "left" : "25%", "padding" : "5px", "border": "1px solid #CCC"})
var gbox = $("#gbox_"+grid[0].id);
gbox.before(searchDialog);
gbox.css({clear:"left"});

3
main/social/home.php
Unescape View File

@ -1,11 +1,10 @@
<?php
/* For licensing terms, see /license.txt */
use ChamiloSession as Session;
/**
* @package chamilo.social
*
* @author Julio Montoya <gugli100@gmail.com>
* @autor Alex Aragon <alex.aragon@beeznest.com> CSS Design and Template
*/

2
main/tracking/courseLog.php
Unescape View File

@ -437,7 +437,7 @@ if ($nbStudents > 0) {
'since',
Display::returnFontAwesomeIcon('warning').get_lang('RemindInactivesLearnersSince'),
$options,
['disable_js' => true]
['disable_js' => true, 'class' => 'col-sm-3']
);
$el->setSelected(7);

Write Preview
Loading…
Cancel
Save