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

Add courses per session graph see BT#16340

Browse Source
pull/4101/head
Julio Montoya 6 years ago
parent 2d068844e1
commit fc05118f31
3 changed files with 120 additions and 2 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. 81
      main/admin/statistics/index.php
  2. 35
      main/inc/ajax/statistics.ajax.php
  3. 6
      main/palettes/pchart/default.color

81
main/admin/statistics/index.php
Unescape View File

@ -237,7 +237,6 @@ if (
);
$options = SessionManager::getStatusList();
$form->addSelect('status_id', get_lang('SessionStatus'), $options, ['placeholder' => get_lang('All')]);
$form->addHidden('report', 'session_by_date');
$form->addButtonSearch(get_lang('Search'));
@ -270,10 +269,13 @@ if (
$url1 = $urlBase.'a=session_by_date&filter=category'.$conditions;
$url2 = $urlBase.'a=session_by_date&filter=language'.$conditions;
$url3 = $urlBase.'a=session_by_date&filter=status'.$conditions;
$url4 = $urlBase.'a=session_by_date&filter=course_in_session'.$conditions;
//$url5 = $urlBase.'a=session_by_date&filter=status'.$conditions;
$reportName1 = get_lang('SessionsPerCategory');
$reportName2 = get_lang('SessionsPerLanguage');
$reportName3 = get_lang('SessionsPerStatus');
$reportName4 = get_lang('CourseInSession');
$reportType = 'pie';
$reportOptions = '
@ -308,6 +310,45 @@ if (
$reportOptions3,
'canvas3'
);
$reportOptions = '
legend: {
position: "left"
},
title: {
text: "'.$reportName4.'",
display: true
},
responsive: true,
animation: {
animateScale: true,
animateRotate: true
},
cutoutPercentage: 25,
tooltips: {
callbacks: {
label: function(tooltipItem, data) {
var dataset = data.datasets[tooltipItem.datasetIndex];
var total = dataset.data.reduce(function(previousValue, currentValue, currentIndex, array) {
return previousValue + currentValue;
});
var label = data.labels[tooltipItem.datasetIndex];
var currentValue = dataset.data[tooltipItem.index];
var percentage = Math.floor(((currentValue/total) * 100)+0.5);
return label + " " + percentage + "%";
}
}
}
';
$htmlHeadXtra[] = Statistics::getJSChartTemplate(
$url4,
$reportType,
$reportOptions,
'canvas4'
);
}
break;
}
@ -517,7 +558,16 @@ switch ($report) {
}
$row++;
$courseSessions = [];
foreach ($sessions as $session) {
$courseList = SessionManager::getCoursesInSession($session['id']);
foreach ($courseList as $courseId) {
if (!isset($courseSessions[$courseId])) {
$courseSessions[$courseId] = 0;
}
$courseSessions[$courseId]++;
}
$table->setCellContents($row, 0, $session['name']);
$table->setCellContents($row, 1, api_get_local_time($session['display_start_date']));
$table->setCellContents($row, 2, api_get_local_time($session['display_end_date']));
@ -541,6 +591,35 @@ switch ($report) {
$content .= $table->toHtml();
}
$tableCourse = new HTML_Table(['class' => 'table table-responsive']);
$headers = [
get_lang('Course'),
get_lang('CountOfSessions'),
];
$row = 0;
$column = 0;
foreach ($headers as $header) {
$tableCourse->setHeaderContents($row, $column, $header);
$column++;
}
$row++;
if (!empty($courseSessions)) {
arsort($courseSessions);
foreach ($courseSessions as $courseId => $count) {
$courseInfo = api_get_course_info_by_id($courseId);
$tableCourse->setCellContents($row, 0, $courseInfo['name']);
$tableCourse->setCellContents($row, 1, $count);
$row++;
}
}
$content .= '<div class="row">';
$content .= '<div class="col-md-12"><canvas id="canvas4" style="margin-bottom: 20px"></canvas></div>';
$content .= '</div>';
$content .= $tableCourse->toHtml();
if (isset($_REQUEST['action']) && $_REQUEST['action'] === 'export') {
$data = $table->toArray();
Export::arrayToXls($data);

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

@ -82,7 +82,7 @@ switch ($action) {
FROM $table
WHERE
relation_type = 0 AND
registered_at >= '$start' AND
registered_at >= '$start' AND
registered_at <= '$end' AND
session_id = '$sessionId' ";
$result = Database::query($sql);
@ -578,6 +578,39 @@ switch ($action) {
}
$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;
}

6
main/palettes/pchart/default.color
Unescape View File

@ -7,3 +7,9 @@
138,166,78,100
171,70,67,100
69,115,168,100
239,210,121,100
149,203,233,100
2,71,105,100
175,215,117,100
44,87,0,100
222,157,127,100
Write Preview
Loading…
Cancel
Save