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 default pchart template - refs CT#7408

Browse Source
1.10.x
Daniel Barreto 11 years ago
parent ec817886be
commit 2336efaba0
7 changed files with 38 additions and 17 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. 17
      main/gradebook/lib/fe/flatviewtable.class.php
  2. 4
      main/inc/lib/tracking.lib.php
  3. 3
      main/mySpace/myspace.lib.php
  4. 9
      main/palettes/pchart/default.txt
  5. 4
      plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php
  6. 17
      plugin/dashboard/block_student_graph/block_student_graph.class.php
  7. 1
      plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php

17
main/gradebook/lib/fe/flatviewtable.class.php
Unescape View File

@ -167,14 +167,15 @@ class FlatViewTable extends SortableTable
$dataSet->setAbscissaName(get_lang('GradebookSkillsRanking'));
$dataSet->setAxisName(0, get_lang('Students'));
$palette = array(
'0' => array('R' => 188, 'G' => 224, 'B' => 46, 'Alpha' => 100),
'1' => array('R' => 224, 'G' => 100, 'B' => 46, 'Alpha' => 100),
'2' => array('R' => 224, 'G' => 214, 'B' => 46, 'Alpha' => 100),
'3' => array('R' => 46, 'G' => 151, 'B' => 224, 'Alpha' => 100),
'4' => array('R' => 176, 'G' => 46, 'B' => 224, 'Alpha' => 100),
'5' => array('R' => 224, 'G' => 46, 'B' => 117, 'Alpha' => 100),
'6' => array('R' => 92, 'G' => 224, 'B' => 46, 'Alpha' => 100),
'7' => array('R' => 224, 'G' => 176, 'B' => 46, 'Alpha' => 100)
'0' => array('R' => 186, 'G' => 206, 'B' => 151, 'Alpha' => 100),
'1' => array('R' => 210, 'G' => 148, 'B' => 147, 'Alpha' => 100),
'2' => array('R' => 148, 'G' => 170, 'B' => 208, 'Alpha' => 100),
'3' => array('R' => 221, 'G' => 133, 'B' => 61, 'Alpha' => 100),
'4' => array('R' => 65, 'G' => 153, 'B' => 176, 'Alpha' => 100),
'5' => array('R' => 114, 'G' => 88, 'B' => 144, 'Alpha' => 100),
'6' => array('R' => 138, 'G' => 166, 'B' => 78, 'Alpha' => 100),
'7' => array('R' => 171, 'G' => 70, 'B' => 67, 'Alpha' => 100),
'8' => array('R' => 69, 'G' => 115, 'B' => 168, 'Alpha' => 100),
);
// Cache definition
$cachePath = api_get_path(SYS_ARCHIVE_PATH);

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

@ -4595,6 +4595,7 @@ class Tracking
$myData->setSerieDescription('Serie1', get_lang('MyResults'));
$myData->setSerieDescription('Serie2', get_lang('AverageScore'));
$myData->setAxisUnit(0, '%');
$myData->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.txt');
// @TODO: Define a custom palette
// Cache definition
@ -4817,6 +4818,7 @@ class Tracking
$dataSet->addPoints($final_array, 'Serie1');
$dataSet->addPoints($my_final_array, 'Serie2');
$dataSet->normalize(100, "%");
$dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.txt');
// Cache definition
$cachePath = api_get_path(SYS_ARCHIVE_PATH);
@ -5001,6 +5003,8 @@ class Tracking
$dataSet->setXAxisName(get_lang('Score'));
$dataSet->normalize(100, "%");
$dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.txt');
// Cache definition
$cachePath = api_get_path(SYS_ARCHIVE_PATH);
$myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1)));

3
main/mySpace/myspace.lib.php
Unescape View File

@ -2842,7 +2842,8 @@ function grapher($sql_result, $start_date, $end_date, $type = "")
$myData->setSerieWeight('Serie1', 1);
$myData->setSerieDescription('Serie1', get_lang('MyResults'));
$myData->setAxisName(0, get_lang('Minutes'));
// @TODO: Define a custom palette
$myData->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.txt');
// Cache definition
$cachePath = api_get_path(SYS_ARCHIVE_PATH);

9
main/palettes/pchart/default.txt
Unescape View File

@ -0,0 +1,9 @@
186, 206, 151
210, 148, 147
148, 170, 208
221, 133, 61
65, 153, 176
114, 88, 144
138, 166, 78
171, 70, 67
69, 115, 168

4
plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php
Unescape View File

@ -163,6 +163,8 @@ class BlockEvaluationGraph extends Block
$dataSet->normalize(100, '%');
$dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.txt');
// Cache definition
$cachePath = api_get_path(SYS_ARCHIVE_PATH);
$myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1)));
@ -339,6 +341,8 @@ class BlockEvaluationGraph extends Block
$dataSet->normalize(100, '%');
$dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.txt');
// Cache definition
$cachePath = api_get_path(SYS_ARCHIVE_PATH);
$myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1)));

17
plugin/dashboard/block_student_graph/block_student_graph.class.php
Unescape View File

@ -149,14 +149,15 @@ class BlockStudentGraph extends Block
$dataSet->setAbscissaName(get_lang('User'));
$dataSet->setAxisName(0, get_lang('Attendance'));
$palette = array(
'0' => array('R' => 188, 'G' => 224, 'B' => 46, 'Alpha' => 100),
'1' => array('R' => 224, 'G' => 100, 'B' => 46, 'Alpha' => 100),
'2' => array('R' => 224, 'G' => 214, 'B' => 46, 'Alpha' => 100),
'3' => array('R' => 46, 'G' => 151, 'B' => 224, 'Alpha' => 100),
'4' => array('R' => 176, 'G' => 46, 'B' => 224, 'Alpha' => 100),
'5' => array('R' => 224, 'G' => 46, 'B' => 117, 'Alpha' => 100),
'6' => array('R' => 92, 'G' => 224, 'B' => 46, 'Alpha' => 100),
'7' => array('R' => 224, 'G' => 176, 'B' => 46, 'Alpha' => 100)
'0' => array('R' => 186, 'G' => 206, 'B' => 151, 'Alpha' => 100),
'1' => array('R' => 210, 'G' => 148, 'B' => 147, 'Alpha' => 100),
'2' => array('R' => 148, 'G' => 170, 'B' => 208, 'Alpha' => 100),
'3' => array('R' => 221, 'G' => 133, 'B' => 61, 'Alpha' => 100),
'4' => array('R' => 65, 'G' => 153, 'B' => 176, 'Alpha' => 100),
'5' => array('R' => 114, 'G' => 88, 'B' => 144, 'Alpha' => 100),
'6' => array('R' => 138, 'G' => 166, 'B' => 78, 'Alpha' => 100),
'7' => array('R' => 171, 'G' => 70, 'B' => 67, 'Alpha' => 100),
'8' => array('R' => 69, 'G' => 115, 'B' => 168, 'Alpha' => 100),
);
// Cache definition
$cachePath = api_get_path(SYS_ARCHIVE_PATH);

1
plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php
Unescape View File

@ -129,6 +129,7 @@ class BlockTeacherGraph extends Block
$dataSet->setAbscissaName($last_week);
$dataSet->setAxisName(0, get_lang('Minutes'));
$dataSet->setAbscissa('Days');
$dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.txt');
// Cache definition
$cachePath = api_get_path(SYS_ARCHIVE_PATH);

Write Preview
Loading…
Cancel
Save